Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 29817: Code refactoring to be able to handle installation of network protocols/services/clients
by hpoussin＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: hpoussin Date: Tue Oct 23 12:25:53 2007 New Revision: 29817 URL: http://svn.reactos.org/svn/reactos?rev=29817&view=rev Log: Code refactoring to be able to handle installation of network protocols/services/clients Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/netcfgx/netcfgx.h Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c Tue Oct 23 12:25:53 2007 @@ -1,16 +1,17 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Configuration of networkd devices - * FILE: lib/netcfgx/netcfgx.c + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/win32/netcfgx/netcfgx.c * PURPOSE: Network devices installer * * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#define INITGUID +#include "netcfgx.h" + #define NDEBUG #include <debug.h> - -#include "netcfgx.h" /* Append a REG_SZ to an existing REG_MULTI_SZ string in the registry. * If the value doesn't exist, create it. @@ -169,6 +170,311 @@ return ERROR_SUCCESS; } +static DWORD +InstallNetDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + LPCWSTR UuidString, + DWORD Characteristics, + LPCWSTR BusType) +{ + LPWSTR InstanceId = NULL; + LPWSTR DeviceName = NULL; + LPWSTR ExportName = NULL; + LONG rc; + HKEY hKey = NULL; + HKEY hNetworkKey = NULL; + HKEY hLinkageKey = NULL; + HKEY hConnectionKey = NULL; + DWORD dwShowIcon, dwLength; + SP_DEVINSTALL_PARAMS_W installParams; + + /* Get Instance ID */ + if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) + { + DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); + rc = ERROR_GEN_FAILURE; + goto cleanup; + } + InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); + if (!InstanceId) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength, NULL)) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Create device name */ + DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!DeviceName) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + wcscpy(DeviceName, L"\\Device\\"); + wcscat(DeviceName, UuidString); + + /* Create export name */ + ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!ExportName) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + wcscpy(ExportName, L"\\Device\\Tcpip_"); + wcscat(ExportName, UuidString); + + /* Write Tcpip parameters in new service Key */ + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = NULL; + rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hNetworkKey); + hNetworkKey = NULL; + rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = NULL; + + /* Write 'Linkage' key in hardware key */ +#if _WIN32_WINNT >= 0x502 + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); +#else + hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); +#endif + if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + if (hKey == INVALID_HANDLE_VALUE) + { + hKey = NULL; + rc = GetLastError(); + DPRINT("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + if (BusType) + rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + RegCloseKey(hKey); + hKey = NULL; + + /* Write connection information in network subkey */ + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegCreateKeyExW(hKey, L"Connection", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hConnectionKey, NULL); + RegCloseKey(hKey); + hKey = NULL; + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)L"Network connection", (wcslen(L"Network connection") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + dwShowIcon = 1; + rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const BYTE*)&dwShowIcon, sizeof(dwShowIcon)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Write linkage information in Tcpip service */ + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); + if (rc != ERROR_SUCCESS) + { + DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); + if (rc != ERROR_SUCCESS) + { + DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); + if (rc != ERROR_SUCCESS) + { + DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* Install additionnal services */ + rc = InstallAdditionalServices(NULL); + if (rc != ERROR_SUCCESS) + { + DPRINT("InstallAdditionalServices() failed with error 0x%lx\n", rc); + goto cleanup; + } + + /* HACK: hpoussin, Dec 2005. TCP/IP driver is not able to manage devices + * which are installed after its startup. So, we have to reboot to take + * this new netcard into account. + */ + /* Should we reboot? */ + installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (!SetupDiGetDeviceInstallParamsW( + DeviceInfoSet, + DeviceInfoData, + &installParams)) + { + rc = GetLastError(); + DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + installParams.Flags |= DI_NEEDRESTART; + if (!SetupDiSetDeviceInstallParamsW( + DeviceInfoSet, + DeviceInfoData, + &installParams)) + { + rc = GetLastError(); + DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = ERROR_SUCCESS; + +cleanup: + HeapFree(GetProcessHeap(), 0, InstanceId); + HeapFree(GetProcessHeap(), 0, DeviceName); + HeapFree(GetProcessHeap(), 0, ExportName); + if (hKey != NULL) + RegCloseKey(hKey); + if (hNetworkKey != NULL) + RegCloseKey(hNetworkKey); + if (hLinkageKey != NULL) + RegCloseKey(hLinkageKey); + if (hConnectionKey != NULL) + RegCloseKey(hConnectionKey); + return rc; +} + +static DWORD +InstallNetClient(VOID) +{ + DPRINT1("Installation of network clients is not yet supported\n"); + return ERROR_GEN_FAILURE; +} + +static DWORD +InstallNetService(VOID) +{ + DPRINT1("Installation of network services is not yet supported\n"); + return ERROR_GEN_FAILURE; +} + +static DWORD +InstallNetTransport(VOID) +{ + DPRINT1("Installation of network protocols is not yet supported\n"); + return ERROR_GEN_FAILURE; +} + DWORD WINAPI NetClassInstaller( IN DI_FUNCTION InstallFunction, @@ -186,18 +492,10 @@ LPWSTR BusType = NULL; RPC_STATUS RpcStatus; UUID Uuid; - LPWSTR InstanceId = NULL; LPWSTR UuidRpcString = NULL; LPWSTR UuidString = NULL; - LPWSTR DeviceName = NULL; - LPWSTR ExportName = NULL; LONG rc; - DWORD dwShowIcon, dwLength; - HKEY hKey = NULL; - HKEY hLinkageKey = NULL; - HKEY hNetworkKey = NULL; - HKEY hConnectionKey = NULL; - SP_DEVINSTALL_PARAMS_W installParams; + DWORD dwLength; if (InstallFunction != DIF_INSTALLDEVICE) return ERROR_DI_DO_DEFAULT; @@ -234,27 +532,6 @@ goto cleanup; } - /* Get Instance ID */ - if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) - { - DPRINT("SetupDiGetDeviceInstanceIdW() returned TRUE. FALSE expected\n"); - rc = ERROR_GEN_FAILURE; - goto cleanup; - } - InstanceId = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); - if (!InstanceId) - { - DPRINT("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - if (!SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, InstanceId, dwLength, NULL)) - { - rc = GetLastError(); - DPRINT("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", rc); - goto cleanup; - } - /* Get Characteristics and BusType (optional) from .inf file */ if (!SetupFindFirstLineW(hInf, SectionName, L"Characteristics", &InfContext)) { @@ -270,30 +547,31 @@ goto cleanup; } Characteristics = (DWORD)CharacteristicsInt; - if (SetupFindFirstLineW(hInf, SectionName, L"BusType", &InfContext)) - { - if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) + if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET)) + { + if (SetupFindFirstLineW(hInf, SectionName, L"BusType", &InfContext)) { - rc = GetLastError(); - DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); - goto cleanup; + if (!SetupGetStringFieldW(&InfContext, 1, NULL, 0, &dwLength)) + { + rc = GetLastError(); + DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + goto cleanup; + } + BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); + if (!BusType) + { + DPRINT("HeapAlloc() failed\n"); + rc = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) + { + rc = GetLastError(); + DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); + goto cleanup; + } } - BusType = HeapAlloc(GetProcessHeap(), 0, dwLength * sizeof(WCHAR)); - if (!BusType) - { - DPRINT("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - if (!SetupGetStringFieldW(&InfContext, 1, BusType, dwLength, NULL)) - { - rc = GetLastError(); - DPRINT("SetupGetStringFieldW() failed with error 0x%lx\n", rc); - goto cleanup; - } - } - else - BusType = NULL; + } /* Create a new UUID */ RpcStatus = UuidCreate(&Uuid); @@ -323,235 +601,19 @@ wcscat(UuidString, UuidRpcString); wcscat(UuidString, L"}"); - /* Create device name */ - DeviceName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!DeviceName) - { - DPRINT("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - wcscpy(DeviceName, L"\\Device\\"); - wcscat(DeviceName, UuidString); - - /* Create export name */ - ExportName = HeapAlloc(GetProcessHeap(), 0, (wcslen(L"\\Device\\Tcpip_") + wcslen(UuidString)) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); - if (!ExportName) - { - DPRINT("HeapAlloc() failed\n"); - rc = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - wcscpy(ExportName, L"\\Device\\Tcpip_"); - wcscat(ExportName, UuidString); - - /* Write Tcpip parameters in new service Key */ - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services", 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegCreateKeyExW(hKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - rc = RegCreateKeyExW(hNetworkKey, L"Parameters\\Tcpip", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hNetworkKey); - hNetworkKey = NULL; - rc = RegSetValueExW(hKey, L"DefaultGateway", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hKey, L"IPAddress", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - - /* Write 'Linkage' key in hardware key */ -#if _WIN32_WINNT >= 0x502 - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ | KEY_WRITE); -#else - hKey = SetupDiOpenDevRegKey(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); -#endif - if (hKey == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND) - hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); - if (hKey == INVALID_HANDLE_VALUE) - { - hKey = NULL; - rc = GetLastError(); - DPRINT("SetupDiCreateDevRegKeyW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hKey, L"NetCfgInstanceId", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hKey, L"Characteristics", 0, REG_DWORD, (const BYTE*)&Characteristics, sizeof(DWORD)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - if (BusType) - rc = RegSetValueExW(hKey, L"BusType", 0, REG_SZ, (const BYTE*)BusType, (wcslen(BusType) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegCreateKeyExW(hKey, L"Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hLinkageKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hLinkageKey, L"Export", 0, REG_SZ, (const BYTE*)DeviceName, (wcslen(DeviceName) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hLinkageKey, L"RootDevice", 0, REG_SZ, (const BYTE*)UuidString, (wcslen(UuidString) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hLinkageKey, L"UpperBind", 0, REG_SZ, (const BYTE*)L"Tcpip", (wcslen(L"Tcpip") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - RegCloseKey(hKey); - hKey = NULL; - - /* Write connection information in network subkey */ - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}", 0, NULL, REG_OPTION_NON_VOLATILE, 0, NULL, &hNetworkKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegCreateKeyExW(hNetworkKey, UuidString, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_CREATE_SUB_KEY, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegCreateKeyExW(hKey, L"Connection", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hConnectionKey, NULL); - RegCloseKey(hKey); - hKey = NULL; - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hConnectionKey, L"Name", 0, REG_SZ, (const BYTE*)L"Network connection", (wcslen(L"Network connection") + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = RegSetValueExW(hConnectionKey, L"PnpInstanceId", 0, REG_SZ, (const BYTE*)InstanceId, (wcslen(InstanceId) + 1) * sizeof(WCHAR)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - dwShowIcon = 1; - rc = RegSetValueExW(hConnectionKey, L"ShowIcon", 0, REG_DWORD, (const BYTE*)&dwShowIcon, sizeof(dwShowIcon)); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* Write linkage information in Tcpip service */ - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Linkage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE, NULL, &hKey, NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyExW() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = AppendStringToMultiSZ(hKey, L"Bind", DeviceName); - if (rc != ERROR_SUCCESS) - { - DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = AppendStringToMultiSZ(hKey, L"Export", ExportName); - if (rc != ERROR_SUCCESS) - { - DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = AppendStringToMultiSZ(hKey, L"Route", UuidString); - if (rc != ERROR_SUCCESS) - { - DPRINT("AppendStringToMultiSZ() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* Install additionnal services */ - /* FIXME: do it only if it is a network adapter! */ - rc = InstallAdditionalServices(NULL); - if (rc != ERROR_SUCCESS) - { - DPRINT("InstallAdditionalServices() failed with error 0x%lx\n", rc); - goto cleanup; - } - - /* HACK: hpoussin, Dec 2005. TCP/IP driver is not able to manage devices - * which are installed after its startup. So, we have to reboot to take - * this new netcard into account. - */ - /* Should we reboot? */ - installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); - if (!SetupDiGetDeviceInstallParamsW( - DeviceInfoSet, - DeviceInfoData, - &installParams)) - { - rc = GetLastError(); - DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc); - goto cleanup; - } - installParams.Flags |= DI_NEEDRESTART; - if (!SetupDiSetDeviceInstallParamsW( - DeviceInfoSet, - DeviceInfoData, - &installParams)) - { - rc = GetLastError(); - DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc); - goto cleanup; - } - rc = ERROR_SUCCESS; + if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NET)) + rc = InstallNetDevice(DeviceInfoSet, DeviceInfoData, UuidString, Characteristics, BusType); + else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETCLIENT)) + rc = InstallNetClient(); + else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETSERVICE)) + rc = InstallNetService(); + else if (IsEqualIID(&DeviceInfoData->ClassGuid, &GUID_DEVCLASS_NETTRANS)) + rc = InstallNetTransport(); + else + { + DPRINT("Invalid class guid\n"); + rc = ERROR_GEN_FAILURE; + } cleanup: if (hInf != INVALID_HANDLE_VALUE) @@ -559,18 +621,7 @@ if (UuidRpcString != NULL) RpcStringFreeW(&UuidRpcString); HeapFree(GetProcessHeap(), 0, BusType); - HeapFree(GetProcessHeap(), 0, InstanceId); HeapFree(GetProcessHeap(), 0, UuidString); - HeapFree(GetProcessHeap(), 0, DeviceName); - HeapFree(GetProcessHeap(), 0, ExportName); - if (hKey != NULL) - RegCloseKey(hKey); - if (hLinkageKey != NULL) - RegCloseKey(hLinkageKey); - if (hNetworkKey != NULL) - RegCloseKey(hNetworkKey); - if (hConnectionKey != NULL) - RegCloseKey(hConnectionKey); if (rc == ERROR_SUCCESS) rc = ERROR_DI_DO_DEFAULT; Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.h (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.h Tue Oct 23 12:25:53 2007 @@ -1,5 +1,8 @@ +#ifndef _NETCFGX_H_ +#define _NETCFGX_H_ + #include <windows.h> #include <setupapi.h> +#include <devguid.h> -ULONG DbgPrint(PCH Format,...); - +#endif /* _NETCFGX_H_ */

1 0

[hpoussin] 29816: No need to define __USE_W32API
by hpoussin＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: hpoussin Date: Tue Oct 23 12:22:02 2007 New Revision: 29816 URL: http://svn.reactos.org/svn/reactos?rev=29816&view=rev Log: No need to define __USE_W32API Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/cpl/access/access.rbuild trunk/reactos/dll/cpl/appwiz/appwiz.rbuild trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/cpl/intl/intl.rbuild trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/ncpa/ncpa.rbuild trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/cpl/sysdm/sysdm.rbuild trunk/reactos/dll/cpl/timedate/timedate.rbuild trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/devenum/devenum.rbuild trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dinput8/dinput8.rbuild trunk/reactos/dll/directx/dplay/dplay.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/dsound/dsound.rbuild trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/aclui/aclui.rbuild trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/authz/authz.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/console/console.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/devmgr/devmgr.rbuild trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild trunk/reactos/dll/win32/fmifs/fmifs.rbuild trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/hid/hid.rbuild trunk/reactos/dll/win32/icmp/icmp.rbuild trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild trunk/reactos/dll/win32/msacm32/msacm32.rbuild trunk/reactos/dll/win32/msafd/msafd.rbuild trunk/reactos/dll/win32/msgina/msgina.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild trunk/reactos/dll/win32/mswsock/mswsock.rbuild trunk/reactos/dll/win32/netid/netid.rbuild trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/psapi/psapi.rbuild trunk/reactos/dll/win32/samlib/samlib.rbuild trunk/reactos/dll/win32/samsrv/samsrv.rbuild trunk/reactos/dll/win32/secur32/secur32.rbuild trunk/reactos/dll/win32/security/security.rbuild trunk/reactos/dll/win32/serialui/serialui.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild trunk/reactos/dll/win32/shellext/slayer/slayer.rbuild trunk/reactos/dll/win32/smdll/smdll.rbuild trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild trunk/reactos/dll/win32/syssetup/syssetup.rbuild trunk/reactos/dll/win32/twain_32/twain_32.rbuild trunk/reactos/dll/win32/ufat/ufat.rbuild trunk/reactos/dll/win32/ufatx/ufatx.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/userenv/userenv.rbuild trunk/reactos/dll/win32/usp10/usp10.rbuild trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/dll/win32/winspool/winspool.rbuild trunk/reactos/dll/win32/winsta/winsta.rbuild trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/dll/win32/wldap32/wldap32.rbuild trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild trunk/reactos/dll/win32/ws2help/ws2help.rbuild trunk/reactos/dll/win32/wshirda/wshirda.rbuild trunk/reactos/dll/win32/wsock32/wsock32.rbuild Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild (original) +++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild Tue Oct 23 12:22:02 2007 @@ -6,7 +6,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> - <define name="__USE_W32API" /> <define name="FT2_BUILD_LIBRARY" /> <if property="NSWPAT" value="0"> <define name="TT_CONFIG_OPTION_UNPATENTED_HINTING" /> Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <library>kernel32</library> <library>msvcrt</library> <library>user32</library> - <define name="__USE_W32API" /> <define name="USE_EXTERNAL_DXTN_LIB" />  <library>gdi32</library> Modified: trunk/reactos/dll/cpl/access/access.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rbui… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rbuild (original) +++ trunk/reactos/dll/cpl/access/access.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}" installbase="system32" installname="access.cpl" unicode="yes"> <importlibrary definition="access.def" /> <include base="access">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x609</define> Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="appwiz.cpl" unicode="yes"> <importlibrary definition="appwiz.def" /> <include base="appwiz">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes"> <importlibrary definition="desk.def" /> <include base="desk">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="hdwwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32" installname="hdwwiz.cpl" unicode="yes"> <importlibrary definition="hdwwiz.def" /> <include base="hdwwiz">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>setupapi</library> Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (original) +++ trunk/reactos/dll/cpl/input/input.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_INPUT}" installbase="system32" installname="input.dll" unicode="yes"> <importlibrary definition="input.def" /> <include base="input">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/intl/intl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rbuild (original) +++ trunk/reactos/dll/cpl/intl/intl.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes"> <importlibrary definition="intl.def" /> <include base="intl">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x609</define> Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rbuild (original) +++ trunk/reactos/dll/cpl/main/main.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes"> <importlibrary definition="main.def" /> <include base="main">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes"> <importlibrary definition="mmsys.def" /> <include base="mmsys">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rbuild (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}" installbase="system32" installname="ncpa.cpl" unicode="yes"> <importlibrary definition="ncpa.def" /> <include base="ncpa">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="odbccp32i" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.cpl" unicode="yes"> <importlibrary definition="odbccp32.def" /> <include base="odbccp32">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="powercfg.def" /> <include base="powercfg">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes"> <importlibrary definition="sysdm.def" /> <include base="sysdm">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rbuild (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes"> <importlibrary definition="timedate.def" /> <include base="timedate">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes"> <importlibrary definition="usrmgr.def" /> <include base="usrmgr">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="ddraw.def" /> <include base="ddraw">.</include> <define name="UNICODE" /> - <define name="__USE_W32API" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum.rbuild (original) +++ trunk/reactos/dll/directx/devenum/devenum.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput.rbuild (original) +++ trunk/reactos/dll/directx/dinput/dinput.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dinput8/dinput8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/dinput… ============================================================================== --- trunk/reactos/dll/directx/dinput8/dinput8.rbuild (original) +++ trunk/reactos/dll/directx/dinput8/dinput8.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dplay/dplay.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/dplay.rb… ============================================================================== --- trunk/reactos/dll/directx/dplay/dplay.rbuild (original) +++ trunk/reactos/dll/directx/dplay/dplay.rbuild Tue Oct 23 12:22:02 2007 @@ -6,7 +6,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <importlibrary definition="dsound.spec.def" /> <include base="dsound">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/dxdiag… ============================================================================== --- trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild (original) +++ trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild Tue Oct 23 12:22:02 2007 @@ -6,7 +6,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="wined3d.def" /> <include base="wined3d">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdbe.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdbe.c</file> <file>kbdbe.rc</file> Modified: trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdbur/kbdbur.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdbur.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdbur.c</file> <file>kbdbur.rc</file> Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="kbdcz1.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdcz1.c</file> <file>kbdcz1.rc</file> Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdda.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdda.c</file> <file>kbdda.rc</file> Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbddv.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbddv.c</file> <file>kbddv.rc</file> Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdes.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdes.c</file> <file>kbdes.rc</file> Modified: trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfi/kbdfi.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdfi/kbdfi.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdfi.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdfi.c</file> <file>kbdfi.rc</file> Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdfr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdfr.c</file> <file>kbdfr.rc</file> Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdgr.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdgr.c</file> <file>kbdgr.rc</file> Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdhe.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdhe.c</file> <file>kbdhe.rc</file> Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdheb.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdheb.c</file> <file>kbdheb.rc</file> Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdhu.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdhu.c</file> <file>kbdhu.rc</file> Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdit/kbdit.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdit.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdit.c</file> <file>kbdit.rc</file> Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdja/kbdja.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdja.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdja.c</file> <file>kbdja.rc</file> Modified: trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlt/kbdlt.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdlt/kbdlt.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="kbdlt.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdlt.c</file> <file>kbdlt.rc</file> Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdno.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdno.c</file> <file>kbdno.rc</file> Modified: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdpl1.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdpl1.c</file> <file>kbdpl1.rc</file> Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdpo.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdpo.c</file> <file>kbdpo.rc</file> Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdru.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdru.c</file> <file>kbdru.rc</file> Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdsg/kbdsg.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdsg.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdsg.c</file> <file>kbdsg.rc</file> Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdsk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdsk.c</file> <file>kbdsk.rc</file> Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdsw/kbdsw.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdsw.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdsw.c</file> <file>kbdsw.rc</file> Modified: trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth/kbdth.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdth/kbdth.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdth.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdth.c</file> <file>kbdth.rc</file> Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbduk.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbduk.c</file> <file>kbduk.rc</file> Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdur.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdur.c</file> <file>kbdur.rc</file> Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <importlibrary definition="kbdus.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <file>kbdus.c</file> <file>kbdus.rc</file> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0502</define> <define name="_NTOSKRNL_" /> <define name="__NO_CTYPE_INLINES" /> Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="acledit">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <metadata description = "Access Control List Editor" /> Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rbui… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rbuild (original) +++ trunk/reactos/dll/win32/aclui/aclui.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="aclui">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="scm_client">.</include> <include base="lsa_client">.</include> <include base="eventlog_client">.</include> - <define name="__USE_W32API" /> <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> Modified: trunk/reactos/dll/win32/authz/authz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.rbui… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.rbuild (original) +++ trunk/reactos/dll/win32/authz/authz.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="authz">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="beepmidi" type="win32dll" installbase="system32" installname="beepmidi.dll"> <importlibrary definition="beepmidi.def" /> <include base="beepmidi">.</include> - <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" /> <library>ntdll</library> Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rbuild (original) +++ trunk/reactos/dll/win32/cards/cards.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="cards">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" />  <define name="CARDSTYLE_DEFAULT" /> Modified: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (original) +++ trunk/reactos/dll/win32/console/console.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="console">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.rbuild (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="crtdll">.</include> <include base="crt">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="USE_MSVCRT_PREFIX" /> Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true"> <importlibrary definition="cryptui.def" /> <include base="cryptui">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/devmgr/devmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rb… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rbuild (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <importlibrary definition="devmgr.spec.def" /> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="dhcpcsvc.spec.def" /> <include base="dhcpcsvc">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT=0x0500" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="adns">adns_win32</include> <define name="_DISABLE_TIDENTS" /> <define name="ADNS_JGAA_WIN32" /> - <define name="__USE_W32API" /> <library>adns</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/fmifs/fmifs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/fmifs.rbui… ============================================================================== --- trunk/reactos/dll/win32/fmifs/fmifs.rbuild (original) +++ trunk/reactos/dll/win32/fmifs/fmifs.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="fmifs.def" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> - <define name="__USE_W32API" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library> Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild Tue Oct 23 12:22:02 2007 @@ -6,7 +6,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui… ============================================================================== --- trunk/reactos/dll/win32/glu32/glu32.rbuild (original) +++ trunk/reactos/dll/win32/glu32/glu32.rbuild Tue Oct 23 12:22:02 2007 @@ -6,7 +6,6 @@ <include base="glu32">libnurbs/nurbtess</include> <include base="glu32">libtess</include> <include base="glu32">libutil</include> - <define name="__USE_W32API" /> <define name="RESOLVE_3D_TEXTURE_SUPPORT" /> <define name="BUILD_GL32" /> <define name="LIBRARYBUILD" /> Modified: trunk/reactos/dll/win32/hid/hid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.rbuild (original) +++ trunk/reactos/dll/win32/hid/hid.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="hid">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/icmp/icmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp.rbuild… ============================================================================== --- trunk/reactos/dll/win32/icmp/icmp.rbuild (original) +++ trunk/reactos/dll/win32/icmp/icmp.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="icmp.spec.def" /> <include base="icmp">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x501</define> <library>wine</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" allowwarnings="true"> <importlibrary definition="imagehlp.def" /> <include base="imagehlp">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x0600</define> <define name="_IMAGEHLP_SOURCE_"></define> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <library>wine</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Tue Oct 23 12:22:02 2007 @@ -6,7 +6,6 @@ <include base="kernel32_base">include</include> <include base="ReactOS">include/reactos/subsys</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="__NO_CTYPE_INLINES" /> <define name="WINVER">0x609</define> @@ -125,7 +124,6 @@ <include base="kernel32" root="intermediate">.</include> <include base="kernel32">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="WINVER">0x0500</define> <library>kernel32_base</library> <library>pseh</library> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="lsa_server">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x0600</define> <linkerflag>-nostartfiles</linkerflag> Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.rbui… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll"> <importlibrary definition="mmdrv.def" /> <include base="mmdrv">.</include> - <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="NDEBUG" /> Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.rbuild (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__REACTOS__" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.rbui… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.rbuild (original) +++ trunk/reactos/dll/win32/msafd/msafd.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="ReactOS">include/reactos/drivers</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <pch>msafd.h</pch> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/msgina/msgina.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rb… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rbuild (original) +++ trunk/reactos/dll/win32/msgina/msgina.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="msgina.def" /> <include base="msgina">.</include> <include base="msgina">include</include> - <define name="__USE_W32API" /> <library>ntdll</library> <library>wine</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="msvcrt">.</include> <include base="crt">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="USE_MSVCRT_PREFIX" /> Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="msvcrt20.def" /> <include base="msvcrt20">.</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/mswsock/mswsock.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswsock.rbuild (original) +++ trunk/reactos/dll/win32/mswsock/mswsock.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="mswsock.def" /> <define name="UNICODE" /> <define name="LE" /> - <define name="__USE_W32API" /> <library>kernel32</library> <library>ws2_32</library> <file>extensions.c</file> Modified: trunk/reactos/dll/win32/netid/netid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rbui… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rbuild (original) +++ trunk/reactos/dll/win32/netid/netid.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="netid" type="win32dll" baseaddress="${BASEADDRESS_NETID}" installbase="system32" installname="netid.dll" unicode="true"> <importlibrary definition="netid.spec.def" /> <include base="netid">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="ntmarta">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.rbuild (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="opengl32.def" /> <include base="wsock32">.</include> <define name="UNICODE" /> - <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.rbui… ============================================================================== --- trunk/reactos/dll/win32/psapi/psapi.rbuild (original) +++ trunk/reactos/dll/win32/psapi/psapi.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="psapi">.</include> <include base="psapi">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <library>epsapi</library> <library>pseh</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/samlib/samlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.rb… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.rbuild (original) +++ trunk/reactos/dll/win32/samlib/samlib.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="samlib.def" /> <include base="samlib">.</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> Modified: trunk/reactos/dll/win32/samsrv/samsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rb… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rbuild (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="samsrv">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> <library>ntdll</library> Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.rbuild (original) +++ trunk/reactos/dll/win32/secur32/secur32.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="secur32">.</include> <include base="ReactOS">include/reactos/subsys</include> <define name="__SECUR32__" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x501</define> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/security/security.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.rbuild (original) +++ trunk/reactos/dll/win32/security/security.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="security.def" /> <include base="security">.</include> <define name="__SECURITY__" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x501</define> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/serialui/serialui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rbuild (original) +++ trunk/reactos/dll/win32/serialui/serialui.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll"> <importlibrary definition="serialui.def" /> <include base="serialui">.</include> - <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" /> <library>kernel32</library> Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild Tue Oct 23 12:22:02 2007 @@ -7,7 +7,6 @@ <include base="pnp_client">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="shdocvw">.</include> <include base="ReactOS">include/reactos/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> @@ -29,7 +28,7 @@ <file>persist.c</file> <file>regsvr.c</file> <file>shdocvw_main.c</file> - <file>shlinstobj.c</file> + <file>shlinstobj.c</file> <file>view.c</file> <file>webbrowser.c</file> <file>shdocvw.rc</file> Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="deskadp" type="win32dll" baseaddress="${BASEADDRESS_DESKADP}" installbase="system32" installname="deskadp.dll" unicode="yes"> <importlibrary definition="deskadp.spec.def" /> <include base="deskadp">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="deskmon" type="win32dll" baseaddress="${BASEADDRESS_DESKMON}" installbase="system32" installname="deskmon.dll" unicode="yes"> <importlibrary definition="deskmon.spec.def" /> <include base="deskmon">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild (original) +++ trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/shellext/slayer/slayer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/slayer.rbuild (original) +++ trunk/reactos/dll/win32/shellext/slayer/slayer.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="slayer">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x601</define> <library>kernel32</library> Modified: trunk/reactos/dll/win32/smdll/smdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/smdll.rbui… ============================================================================== --- trunk/reactos/dll/win32/smdll/smdll.rbuild (original) +++ trunk/reactos/dll/win32/smdll/smdll.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="smdll.def" /> <include base="smdll">.</include> <include base="ReactOS">include/reactos/subsys</include> - <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>smlib</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll"> <importlibrary definition="snmpapi.def" /> <include base="snmpapi">.</include> - <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (original) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="std_ole_v2">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> @@ -15,7 +14,6 @@ <include base="ReactOS">include/reactos/wine</include> <dependency>std_ole_v2</dependency> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rbuild (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll" unicode="yes" allowwarnings="true"> <importlibrary definition="syssetup.def" /> <include base="syssetup">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="_SETUPAPI_VER">0x0501</define> Modified: trunk/reactos/dll/win32/twain_32/twain_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_3… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain_32.rbuild (original) +++ trunk/reactos/dll/win32/twain_32/twain_32.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" allowwarnings="true"> <importlibrary definition="twain_32.def" /> <include base="twain_32">.</include> - <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/ufat/ufat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.rbuild… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.rbuild (original) +++ trunk/reactos/dll/win32/ufat/ufat.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="ufat.def" /> <include base="ufat">.</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <library>vfatlib</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/ufatx/ufatx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.rbui… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.rbuild (original) +++ trunk/reactos/dll/win32/ufatx/ufatx.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="ufatx.def" /> <include base="ufatx">.</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <library>vfatxlib</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> - <define name="__USE_W32API" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>wine</library> Modified: trunk/reactos/dll/win32/userenv/userenv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rbuild (original) +++ trunk/reactos/dll/win32/userenv/userenv.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="userenv" type="win32dll" baseaddress="${BASEADDRESS_USERENV}" installbase="system32" installname="userenv.dll"> <importlibrary definition="userenv.def" /> <include base="userenv">.</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbui… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.rbuild (original) +++ trunk/reactos/dll/win32/usp10/usp10.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vdmdbg/vdmdbg.rb… ============================================================================== --- trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild (original) +++ trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild Tue Oct 23 12:22:02 2007 @@ -3,7 +3,6 @@ <include base="vdmdbg">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> - <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <file>vdmdbg.c</file> Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="wininet">.</include> <include base="ReactOS">include/reactos/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> Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild (original) +++ trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__REACTOS__" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wa… ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild Tue Oct 23 12:22:02 2007 @@ -5,12 +5,11 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <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>msacm32</library> + <library>msacm32</library> <library>uuid</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild Tue Oct 23 12:22:02 2007 @@ -12,7 +12,6 @@ <include base="winmm">.</include> <include base="ReactOS">include/reactos/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> Modified: trunk/reactos/dll/win32/winspool/winspool.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.rbuild (original) +++ trunk/reactos/dll/win32/winspool/winspool.rbuild Tue Oct 23 12:22:02 2007 @@ -1,7 +1,6 @@ <module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true"> <importlibrary definition="winspool.def" /> <include base="winspool">.</include> - <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/dll/win32/winsta/winsta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/winsta.rb… ============================================================================== --- trunk/reactos/dll/win32/winsta/winsta.rbuild (original) +++ trunk/reactos/dll/win32/winsta/winsta.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="winsta.def" /> <include base="winsta">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <library>ntdll</library> <pch>winsta.h</pch> Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/wldap32/wldap32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.rbuild (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.rbuild Tue Oct 23 12:22:02 2007 @@ -4,7 +4,6 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.rb… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild Tue Oct 23 12:22:02 2007 @@ -5,7 +5,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> <define name="LE" /> - <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0500</define> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="ws2help.def" /> <include base="ws2help">.</include> <define name="UNICODE" /> - <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/wshirda/wshirda.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.… ============================================================================== --- trunk/reactos/dll/win32/wshirda/wshirda.rbuild (original) +++ trunk/reactos/dll/win32/wshirda/wshirda.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="wshirda.def" /> <include base="wshirda">.</include> <define name="UNICODE" /> - <define name="__USE_W32API" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/wsock32/wsock32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.rbuild (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.rbuild Tue Oct 23 12:22:02 2007 @@ -2,7 +2,6 @@ <importlibrary definition="wsock32.def" /> <include base="wsock32">.</include> <define name="UNICODE" /> - <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library>

1 0

[hpoussin] 29815: No need to define __USE_W32API
by hpoussin＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: hpoussin Date: Tue Oct 23 12:12:28 2007 New Revision: 29815 URL: http://svn.reactos.org/svn/reactos?rev=29815&view=rev Log: No need to define __USE_W32API Modified: trunk/reactos/base/applications/cacls/cacls.rbuild trunk/reactos/base/applications/calc/calc.rbuild trunk/reactos/base/applications/charmap/charmap.rbuild trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild trunk/reactos/base/applications/cmdutils/find/find.rbuild trunk/reactos/base/applications/cmdutils/more/more.rbuild trunk/reactos/base/applications/control/control.rbuild trunk/reactos/base/applications/games/solitaire/solitaire.rbuild trunk/reactos/base/applications/games/winemine/winemine.rbuild trunk/reactos/base/applications/hh/hh.rbuild trunk/reactos/base/applications/hostname/hostname.rbuild trunk/reactos/base/applications/logoff/logoff.rbuild trunk/reactos/base/applications/mmc/mmc.rbuild trunk/reactos/base/applications/msconfig/msconfig.rbuild trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild trunk/reactos/base/applications/mscutils/servman/servman.rbuild trunk/reactos/base/applications/network/arp/arp.rbuild trunk/reactos/base/applications/network/dwnl/dwnl.rbuild trunk/reactos/base/applications/network/finger/finger.rbuild trunk/reactos/base/applications/network/ftp/ftp.rbuild trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild trunk/reactos/base/applications/network/net/net.rbuild trunk/reactos/base/applications/network/netstat/netstat.rbuild trunk/reactos/base/applications/network/ping/ping.rbuild trunk/reactos/base/applications/network/route/route.rbuild trunk/reactos/base/applications/network/telnet/telnet.rbuild trunk/reactos/base/applications/network/tracert/tracert.rbuild trunk/reactos/base/applications/network/whois/whois.rbuild trunk/reactos/base/applications/notepad/notepad.rbuild trunk/reactos/base/applications/regedit/clb/clb.rbuild trunk/reactos/base/applications/regedit/regedit.rbuild trunk/reactos/base/applications/sc/sc.rbuild trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild trunk/reactos/base/applications/shutdown/shutdown.rbuild trunk/reactos/base/applications/sndvol32/sndvol32.rbuild trunk/reactos/base/applications/taskmgr/taskmgr.rbuild trunk/reactos/base/applications/winhelp/winhelp.rbuild trunk/reactos/base/applications/wordpad/wordpad.rbuild trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/base/services/dhcp/dhcp.rbuild trunk/reactos/base/services/eventlog/eventlog.rbuild trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/setup/setup.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/setup/vmwinst/vmwinst.rbuild trunk/reactos/base/setup/welcome/welcome.rbuild trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild trunk/reactos/base/system/autochk/autochk.rbuild trunk/reactos/base/system/expand/expand.rbuild trunk/reactos/base/system/format/format.rbuild trunk/reactos/base/system/lsass/lsass.rbuild trunk/reactos/base/system/msiexec/msiexec.rbuild trunk/reactos/base/system/regsvr32/regsvr32.rbuild trunk/reactos/base/system/rundll32/rundll32.rbuild trunk/reactos/base/system/services/services.rbuild trunk/reactos/base/system/smss/smss.rbuild trunk/reactos/base/system/userinit/userinit.rbuild trunk/reactos/base/system/winlogon/winlogon.rbuild trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/boot/freeldr/install/installfreeldr.rbuild trunk/reactos/drivers/base/beep/beep.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild (contents, props changed) trunk/reactos/drivers/base/null/null.rbuild trunk/reactos/drivers/bus/acpi/acpi.rbuild trunk/reactos/drivers/bus/isapnp/isapnp.rbuild trunk/reactos/drivers/bus/pci/pci.rbuild trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rbuild trunk/reactos/drivers/filesystems/msfs/msfs.rbuild trunk/reactos/drivers/filesystems/mup/mup.rbuild trunk/reactos/drivers/filesystems/npfs/npfs.rbuild trunk/reactos/drivers/filesystems/npfs_new/npfs.rbuild trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/input/mouclass/mouclass.rbuild trunk/reactos/drivers/input/sermouse/sermouse.rbuild trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild trunk/reactos/drivers/multimedia/audio/sndblst/sndblst.rbuild trunk/reactos/drivers/multimedia/audio/sound/sound.rbuild trunk/reactos/drivers/network/afd/afd.rbuild trunk/reactos/drivers/network/dd/ne2000/ne2000.rbuild trunk/reactos/drivers/network/dd/pcnet/pcnet.rbuild trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/network/tdi/tdi.rbuild trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild trunk/reactos/drivers/parallel/parallel/parallel.rbuild trunk/reactos/drivers/serial/serenum/serenum.rbuild trunk/reactos/drivers/serial/serial/serial.rbuild trunk/reactos/drivers/setup/blue/blue.rbuild trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/disk/disk.rbuild trunk/reactos/drivers/storage/floppy/floppy.rbuild trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (contents, props changed) trunk/reactos/drivers/usb/usbd/usbd.rbuild trunk/reactos/drivers/usb/usbhub/usbhub.rbuild trunk/reactos/drivers/usb/usbstor/usbstor.rbuild trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild trunk/reactos/drivers/video/miniport/vbe/vbemp.rbuild trunk/reactos/drivers/video/miniport/vga/vgamp.rbuild trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rbuild trunk/reactos/drivers/video/videoprt/videoprt.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild trunk/reactos/drivers/wdm/audio/drivers/sb16/sb16.rbuild trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halppc/generic/generic.rbuild trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/up/halup.rbuild trunk/reactos/hal/halx86/xbox/halxbox.rbuild trunk/reactos/lib/3rdparty/adns/adns.rbuild trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild trunk/reactos/lib/3rdparty/expat/expat.rbuild trunk/reactos/lib/3rdparty/libwine/libwine.rbuild trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/drivers/chew/chew.rbuild trunk/reactos/lib/drivers/csq/csq.rbuild trunk/reactos/lib/drivers/ip/ip.rbuild trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild trunk/reactos/lib/epsapi/epsapi.rbuild trunk/reactos/lib/fslib/vfatlib/vfatlib.rbuild trunk/reactos/lib/fslib/vfatxlib/vfatxlib.rbuild trunk/reactos/lib/pseh/pseh.rbuild trunk/reactos/lib/rossym/rossym.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/dxguid/dxguid.rbuild trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/lib/sdk/strmiids/strmiids.rbuild trunk/reactos/lib/sdk/uuid/uuid.rbuild trunk/reactos/lib/sdk/wdmguid/wdmguid.rbuild trunk/reactos/lib/smlib/smlib.rbuild trunk/reactos/lib/win32ksys/win32ksys.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/subsystems/csr/csr.rbuild trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild trunk/reactos/subsystems/ntvdm/ntvdm.rbuild trunk/reactos/subsystems/win/basesrv/basesrv.rbuild trunk/reactos/subsystems/win/winsrv/winsrv.rbuild trunk/reactos/subsystems/win32/csrss/csrss.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/cacls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/ca… Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… Modified: trunk/reactos/base/applications/charmap/charmap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/more.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/control/control.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/winemine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/hh/hh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/hh/hh.rb… Modified: trunk/reactos/base/applications/hostname/hostname.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/hostname… Modified: trunk/reactos/base/applications/logoff/logoff.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/mmc/mmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.… Modified: trunk/reactos/base/applications/msconfig/msconfig.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/servman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/network/arp/arp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/dwnl/dwnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/finger/finger.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/net.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/netstat/netstat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/ping.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/route/route.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/telnet/telnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/tracert/tracert.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/whois/whois.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/notepad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/clb/clb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/sc/sc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.rb… Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/shutdown.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winhelp/winhelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhcp.rb… Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Modified: trunk/reactos/base/setup/setup/setup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/setup.rbu… Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… Modified: trunk/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/notify… Modified: trunk/reactos/base/system/autochk/autochk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… Modified: trunk/reactos/base/system/expand/expand.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.… Modified: trunk/reactos/base/system/format/format.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… Modified: trunk/reactos/base/system/lsass/lsass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.rb… Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… Modified: trunk/reactos/base/system/regsvr32/regsvr32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… Modified: trunk/reactos/base/system/rundll32/rundll32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… Modified: trunk/reactos/base/system/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/smss/smss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.rbui… Modified: trunk/reactos/base/system/userinit/userinit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… Modified: trunk/reactos/base/system/winlogon/winlogon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… Modified: trunk/reactos/boot/freeldr/install/installfreeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/insta… Modified: trunk/reactos/drivers/base/beep/beep.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.rbu… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… Modified: trunk/reactos/drivers/base/null/null.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/null/null.rbu… Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… Modified: trunk/reactos/drivers/bus/isapnp/isapnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… Modified: trunk/reactos/drivers/bus/pci/pci.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.rbuild… Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… Modified: trunk/reactos/drivers/filesystems/msfs/msfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/m… Modified: trunk/reactos/drivers/filesystems/mup/mup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… Modified: trunk/reactos/drivers/filesystems/npfs/npfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n… Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… Modified: trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… Modified: trunk/reactos/drivers/input/mouclass/mouclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… Modified: trunk/reactos/drivers/input/sermouse/sermouse.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… Modified: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… Modified: trunk/reactos/drivers/multimedia/audio/sb16_nt4/sb16_nt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… Modified: trunk/reactos/drivers/multimedia/audio/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… Modified: trunk/reactos/drivers/multimedia/audio/sound/sound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… Modified: trunk/reactos/drivers/network/afd/afd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd.rb… Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… Modified: trunk/reactos/drivers/network/tdi/tdi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi.rb… Modified: trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/wshtcpip/w… Modified: trunk/reactos/drivers/parallel/parallel/parallel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parallel/… Modified: trunk/reactos/drivers/serial/serenum/serenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… Modified: trunk/reactos/drivers/serial/serial/serial.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seri… Modified: trunk/reactos/drivers/setup/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rb… Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskd… Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… Modified: trunk/reactos/drivers/usb/usbd/usbd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.rbui… Modified: trunk/reactos/drivers/usb/usbhub/usbhub.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… Modified: trunk/reactos/drivers/usb/usbstor/usbstor.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/xbo… Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/sb16/sb16.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=298… Modified: trunk/reactos/hal/halppc/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/generic… Modified: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… Modified: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild… Modified: trunk/reactos/hal/halx86/xbox/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halxbox.rb… Modified: trunk/reactos/lib/3rdparty/adns/adns.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns.rbu… Modified: trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzip2.r… Modified: trunk/reactos/lib/3rdparty/expat/expat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/expat.r… Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/drivers/chew/chew.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/chew.rbui… Modified: trunk/reactos/lib/drivers/csq/csq.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/csq/csq.rbuild… Modified: trunk/reactos/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/ip.rbuild?r… Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… Modified: trunk/reactos/lib/epsapi/epsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/epsapi/epsapi.rbuild?r… Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxli… Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=2… Modified: trunk/reactos/lib/rossym/rossym.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/rossym.rbuild?r… Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=298… Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… Modified: trunk/reactos/lib/sdk/dxguid/dxguid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/dxguid.rbui… Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… Modified: trunk/reactos/lib/sdk/strmiids/strmiids.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/strmiids/strmiids.… Modified: trunk/reactos/lib/sdk/uuid/uuid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.rbuild?r… Modified: trunk/reactos/lib/sdk/wdmguid/wdmguid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/wdmguid/wdmguid.rb… Modified: trunk/reactos/lib/smlib/smlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smlib.rbuild?rev… Modified: trunk/reactos/lib/win32ksys/win32ksys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/win32ksys/win32ksys.rb… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Modified: trunk/reactos/subsystems/csr/csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csr.rbuild?… Modified: trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/csrs… Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rbu… Modified: trunk/reactos/subsystems/win/basesrv/basesrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/bas… Modified: trunk/reactos/subsystems/win/winsrv/winsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/winsrv/wins… Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…

1 0

[hpoussin] 29814: __USE_W32API is always defined nowadays
by hpoussin＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: hpoussin Date: Tue Oct 23 11:53:02 2007 New Revision: 29814 URL: http://svn.reactos.org/svn/reactos?rev=29814&view=rev Log: __USE_W32API is always defined nowadays Modified: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/include/internal/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/debug.h (original) +++ trunk/reactos/ntoskrnl/include/internal/debug.h Tue Oct 23 11:53:02 2007 @@ -55,41 +55,6 @@ #ifdef DBG -#ifndef __USE_W32API -/* Assert only on "checked" version */ -#ifndef NASSERT -#ifdef CONFIG_SMP -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber()), DbgBreakPoint(); } -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber()), DbgBreakPoint(); } -#else -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } -#endif - -#define assertmsg(_c_, _m_) \ - if (!(_c_)) { \ - DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _m_ ; \ - KeBugCheck(0); \ - } - -#define ASSERTMSG(_c_, _m_) \ - if (!(_c_)) { \ - DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _m_ ; \ - KeBugCheck(0); \ - } - -#else - -#define assert(x) -#define ASSERT(x) -#define assertmsg(_c_, _m_) -#define ASSERTMSG(_c_, _m_) - -#endif -#endif /* !__USE_W32API */ - /* Print if using a "checked" version */ #ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ #define CPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) @@ -112,12 +77,6 @@ #define CPRINT #define DPRINT1 #endif -#ifndef __USE_W32API -#define assert(x) -#define ASSERT(x) -#define assertmsg(_c_, _m_) -#define ASSERTMSG(_c_, _m_) -#endif /* !__USE_W32API */ #endif /* DBG */

1 0

[jimtabor] 29813: Sync with Wine: Combo controls. Checked Button and no changes.
by jimtabor＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: jimtabor Date: Tue Oct 23 10:13:16 2007 New Revision: 29813 URL: http://svn.reactos.org/svn/reactos?rev=29813&view=rev Log: Sync with Wine: Combo controls. Checked Button and no changes. Modified: trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Tue Oct 23 10:13:16 2007 @@ -53,6 +53,8 @@ #define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) #define CB_HASSTRINGS( lphc ) ((lphc)->dwStyle & CBS_HASSTRINGS) #define CB_HWND( lphc ) ((lphc)->self) +// ReactOS already define in include/controls.h We have it here as a sync note. +//#define CB_GETTYPE( lphc ) ((lphc)->dwStyle & (CBS_DROPDOWNLIST)) #define ISWIN31 (LOWORD(GetVersion()) == 0x0a03) @@ -199,8 +201,9 @@ * The height of the text area is set in two ways. * It can be set explicitly through a combobox message or through a * WM_MEASUREITEM callback. - * If this is not the case, the height is set to 13 dialog units. + * If this is not the case, the height is set to font height + 4px * This height was determined through experimentation. + * CBCalcPlacement will add 2*COMBO_YBORDERSIZE pixels for the border */ static INT CBGetTextAreaHeight( HWND hwnd, @@ -231,14 +234,7 @@ ReleaseDC(hwnd, hDC); - iTextItemHeight = ((13 * baseUnitY) / 8); - - /* - * This "formula" calculates the height of the complete control. - * To calculate the height of the text area, we have to remove the - * borders. - */ - iTextItemHeight -= 2*COMBO_YBORDERSIZE(); + iTextItemHeight = baseUnitY + 4; } /* @@ -990,8 +986,7 @@ if( pText ) { - if( length ) GetWindowTextW( lphc->hWndEdit, pText, length + 1); - else pText[0] = '\0'; + GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, (WPARAM)(-1), (LPARAM)pText ); HeapFree( GetProcessHeap(), 0, pText ); @@ -1049,6 +1044,8 @@ */ static void CBDropDown( LPHEADCOMBO lphc ) { + HMONITOR monitor; + MONITORINFO mon_info; RECT rect,r; int nItems = 0; int nDroppedHeight; @@ -1120,6 +1117,10 @@ } /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/ + monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + if( (rect.bottom + nDroppedHeight) >= GetSystemMetrics( SM_CYSCREEN ) ) rect.bottom = rect.top - nDroppedHeight; @@ -1348,6 +1349,8 @@ TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lphc->wState ); + CB_NOTIFY( lphc, CBN_SELCHANGE ); + if( HIWORD(wParam) == LBN_SELCHANGE) { if( lphc->wState & CBF_EDIT ) @@ -1370,9 +1373,7 @@ } else lphc->wState &= ~CBF_NOROLLUP; - CB_NOTIFY( lphc, CBN_SELCHANGE ); - - /* fall through */ + break; case LBN_SETFOCUS: case LBN_KILLFOCUS: @@ -1639,7 +1640,7 @@ { if( height < 32768 ) { - lphc->editHeight = height; + lphc->editHeight = height + 2; /* Is the 2 for 2*EDIT_CONTROL_PADDING? */ /* * Redo the layout of the control. @@ -2081,11 +2082,13 @@ string = strdupA((LPSTR)lParam); CharLowerA(string); } + else if( lphc->dwStyle & CBS_UPPERCASE ) { string = strdupA((LPSTR)lParam); CharUpperA(string); } + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); HeapFree(GetProcessHeap(), 0, string); return ret; @@ -2371,5 +2374,6 @@ BOOL WINAPI GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ PCOMBOBOXINFO pcbi /* [in/out] combo box information */) { + TRACE("(%p, %p)\n", hwndCombo, pcbi); return SendMessageW(hwndCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Oct 23 10:13:16 2007 @@ -121,8 +121,8 @@ reactos/dll/win32/msvcrt/wine/*.c # Out of sync User32 - - reactos/dll/win32/user32/controls/button.c # Synced at 20060621 - reactos/dll/win32/user32/controls/combo.c # Synced at 20060904 + reactos/dll/win32/user32/controls/button.c # Synced at 20071022 + reactos/dll/win32/user32/controls/combo.c # Synced at 20071022 reactos/dll/win32/user32/controls/edit.c # Synced at 20071022 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616

1 0

[jimtabor] 29811: Sync with Wine: Edit controls.
by jimtabor＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: jimtabor Date: Tue Oct 23 08:19:29 2007 New Revision: 29811 URL: http://svn.reactos.org/svn/reactos?rev=29811&view=rev Log: Sync with Wine: Edit controls. Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Tue Oct 23 08:19:29 2007 @@ -68,7 +68,8 @@ #define EF_AFTER_WRAP 0x0080 /* the caret is displayed after the last character of a wrapped line, instead of in front of the next character */ #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ - +#define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of + the text buffer if this is clear. */ typedef enum { END_0 = 0, /* line ends with terminating '\0' character */ @@ -91,6 +92,7 @@ { BOOL is_unicode; /* how the control was created */ LPWSTR text; /* the actual contents of the control */ + UINT text_length; /* cached length of text buffer (in WCHARs) - use get_text_length() to retrieve */ UINT buffer_size; /* the size of the buffer in characters */ UINT buffer_limit; /* the maximum size to which the buffer may grow in characters */ HFONT font; /* NULL means standard system font */ @@ -240,7 +242,7 @@ #ifndef __REACTOS__ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc); #endif -static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); +static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit); static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); @@ -402,6 +404,17 @@ return version; } +static inline UINT get_text_length(EDITSTATE *es) +{ + if(es->text_length == (UINT)-1) + es->text_length = strlenW(es->text); + return es->text_length; +} + +static inline void text_buffer_changed(EDITSTATE *es) +{ + es->text_length = (UINT)-1; +} static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) { @@ -816,8 +829,7 @@ break; case EM_POSFROMCHAR: - result = strlenW(es->text); - if ((INT)wParam >= result) result = -1; + if ((INT)wParam >= get_text_length(es)) result = -1; else result = EDIT_EM_PosFromChar(es, (INT)wParam, FALSE); break; @@ -951,8 +963,8 @@ break; case WM_GETTEXTLENGTH: - if (unicode) result = strlenW(es->text); - else result = WideCharToMultiByte( CP_ACP, 0, es->text, strlenW(es->text), + if (unicode) result = get_text_length(es); + else result = WideCharToMultiByte( CP_ACP, 0, es->text, get_text_length(es), NULL, 0, NULL, NULL ); break; @@ -1077,6 +1089,8 @@ break; case WM_IME_COMPOSITION: + { + int caret_pos = es->selection_end; if (es->composition_len == 0) { if (es->selection_start != es->selection_end) @@ -1088,7 +1102,9 @@ es->composition_start = es->selection_end; } EDIT_ImeComposition(hwnd,lParam,es); - break; + EDIT_SetCaretPos(es, caret_pos, es->flags & EF_AFTER_WRAP); + break; + } case WM_IME_ENDCOMPOSITION: es->composition_len= 0; @@ -1631,7 +1647,7 @@ else { INT low = es->x_offset; - INT high = strlenW(es->text) + 1; + INT high = get_text_length(es) + 1; while (low < high - 1) { INT mid = (low + high) / 2; @@ -1707,7 +1723,7 @@ static LPWSTR EDIT_GetPasswordPointer_SL(EDITSTATE *es) { if (es->style & ES_PASSWORD) { - INT len = strlenW(es->text); + INT len = get_text_length(es); LPWSTR text = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); text[len] = '\0'; while(len) text[--len] = es->password_char; @@ -1803,6 +1819,7 @@ LocalUnlock(es->hloc32A); } } + if(es->flags & EF_APP_HAS_HANDLE) text_buffer_changed(es); es->lock_count++; } @@ -1905,7 +1922,7 @@ return; if (end == -1) - end = strlenW(es->text); + end = get_text_length(es); if (end < start) { INT tmp = start; @@ -2053,7 +2070,7 @@ e = EDIT_CharFromPos(es, 0x3fffffff, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap); else - e = strlenW(es->text); + e = get_text_length(es); EDIT_EM_SetSel(es, extend ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); } @@ -2463,7 +2480,7 @@ es->format_rect.bottom = min(es->format_rect.bottom, ClientRect.bottom); if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } @@ -2543,7 +2560,7 @@ if (es->hloc32W) { CHAR *textA = NULL; UINT countA = 0; - UINT countW = strlenW(es->text) + 1; + UINT countW = get_text_length(es) + 1; #ifndef __REACTOS__ STACK16FRAME* stack16 = NULL; HANDLE16 oldDS = 0; @@ -2982,7 +2999,7 @@ if (!(es->style & ES_MULTILINE)) return 0; - if (index > (INT)strlenW(es->text)) + if (index > (INT)get_text_length(es)) return es->line_count - 1; if (index == -1) index = min(es->selection_start, es->selection_end); @@ -3044,7 +3061,7 @@ LINEDEF *line_def; if (!(es->style & ES_MULTILINE)) - return strlenW(es->text); + return get_text_length(es); if (index == -1) { /* get the number of remaining non-selected chars of selected lines */ @@ -3152,7 +3169,7 @@ */ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { - INT len = strlenW(es->text); + INT len = get_text_length(es); INT l; INT li; INT x; @@ -3258,7 +3275,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit) { UINT strl = strlenW(lpsz_replace); - UINT tl = strlenW(es->text); + UINT tl = get_text_length(es); UINT utl; UINT s; UINT e; @@ -3288,7 +3305,11 @@ * such that buffer limit is honored. */ if ((honor_limit) && (es->buffer_limit > 0) && (size > es->buffer_limit)) { EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); - strl = es->buffer_limit - (tl - (e-s)); + /* Buffer limit can be smaller than the actual length of text in combobox */ + if (es->buffer_limit < (tl - (e-s))) + strl = 0; + else + strl = es->buffer_limit - (tl - (e-s)); } if (!EDIT_MakeFit(es, tl - (e - s) + strl)) @@ -3304,10 +3325,11 @@ buf[bufl] = 0; /* ensure 0 termination */ /* now delete */ strcpyW(es->text + s, es->text + e); + text_buffer_changed(es); } if (strl) { /* there is an insertion */ - tl = strlenW(es->text); + tl = get_text_length(es); TRACE("inserting stuff (tl %d, strl %d, selstart %d ('%s'), text '%s')\n", tl, strl, s, debugstr_w(es->text + s), debugstr_w(es->text)); for (p = es->text + tl ; p >= es->text + s ; p--) p[strl] = p[0]; @@ -3317,6 +3339,7 @@ CharUpperBuffW(p, strl); else if(es->style & ES_LOWERCASE) CharLowerBuffW(p, strl); + text_buffer_changed(es); } if (es->style & ES_MULTILINE) { @@ -3333,6 +3356,7 @@ if (e != s) for (i = 0 , p = es->text ; i < e - s ; i++) p[i + s] = buf[i]; + text_buffer_changed(es); EDIT_BuildLineDefs_ML(es, s, e, abs(es->selection_end - es->selection_start) - strl, hrgn); strl = 0; @@ -3351,6 +3375,7 @@ strl--; EDIT_CalcLineWidth_SL(es); } + text_buffer_changed(es); EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); } } @@ -3555,7 +3580,7 @@ EDIT_UpdateText(es, NULL, TRUE); } else if (x > es->format_rect.right) { INT x_last; - INT len = strlenW(es->text); + INT len = get_text_length(es); goal = es->format_rect.right - format_width / HSCROLL_FRACTION; do { es->x_offset++; @@ -3637,6 +3662,7 @@ es->buffer_size = LocalSize(es->hloc32W)/sizeof(WCHAR) - 1; + es->flags |= EF_APP_HAS_HANDLE; EDIT_LockBuffer(es); es->x_offset = es->y_offset = 0; @@ -3644,7 +3670,7 @@ EDIT_EM_EmptyUndoBuffer(es); es->flags &= ~EF_MODIFIED; es->flags &= ~EF_UPDATE; - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); EDIT_EM_ScrollCaret(es); /* force scroll info update */ @@ -3712,7 +3738,7 @@ EDIT_EM_EmptyUndoBuffer(es); es->flags &= ~EF_MODIFIED; es->flags &= ~EF_UPDATE; - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); EDIT_EM_ScrollCaret(es); /* force scroll info update */ @@ -3725,27 +3751,14 @@ * * EM_SETLIMITTEXT * - * FIXME: in WinNT maxsize is 0x7FFFFFFF / 0xFFFFFFFF - * However, the windows version is not complied to yet in all of edit.c - * - * Additionally as the wrapper for RichEdit controls we need larger buffers - * at present -1 will represent nolimit - */ -static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit) -{ - if (limit == 0xFFFFFFFF) - es->buffer_limit = -1; - else if (es->style & ES_MULTILINE) { - if (limit) - es->buffer_limit = min(limit, BUFLIMIT_MULTI); - else - es->buffer_limit = BUFLIMIT_MULTI; - } else { - if (limit) - es->buffer_limit = min(limit, BUFLIMIT_SINGLE); - else - es->buffer_limit = BUFLIMIT_SINGLE; - } + * NOTE: this version currently implements WinNT limits + * + */ +static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) +{ + if (!limit) limit = ~0u; + if (!(es->style & ES_MULTILINE)) limit = min(limit, 0x7ffffffe); + es->buffer_limit = limit; } @@ -3875,7 +3888,7 @@ { UINT old_start = es->selection_start; UINT old_end = es->selection_end; - UINT len = strlenW(es->text); + UINT len = get_text_length(es); if (start == (UINT)-1) { start = es->selection_end; @@ -3995,7 +4008,7 @@ #endif if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); } } @@ -4015,7 +4028,7 @@ es->word_break_proc = NULL; es->word_break_proc16 = wbp; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); } } @@ -4108,16 +4121,21 @@ } break; case 0x03: /* ^C */ - SendMessageW(es->hwndSelf, WM_COPY, 0, 0); + if (!(es->style & ES_PASSWORD)) + SendMessageW(es->hwndSelf, WM_COPY, 0, 0); break; case 0x16: /* ^V */ if (!(es->style & ES_READONLY)) SendMessageW(es->hwndSelf, WM_PASTE, 0, 0); break; case 0x18: /* ^X */ - if (!(es->style & ES_READONLY)) + if (!((es->style & ES_READONLY) || (es->style & ES_PASSWORD))) SendMessageW(es->hwndSelf, WM_CUT, 0, 0); break; + case 0x1A: /* ^Z */ + if (!(es->style & ES_READONLY)) + SendMessageW(es->hwndSelf, WM_UNDO, 0, 0); + break; default: /*If Edit control style is ES_NUMBER allow users to key in only numeric values*/ @@ -4212,7 +4230,17 @@ /* delete */ EnableMenuItem(popup, 5, MF_BYPOSITION | ((end - start) && !(es->style & ES_READONLY) ? MF_ENABLED : MF_GRAYED)); /* select all */ - EnableMenuItem(popup, 7, MF_BYPOSITION | (start || (end != strlenW(es->text)) ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(popup, 7, MF_BYPOSITION | (start || (end != get_text_length(es)) ? MF_ENABLED : MF_GRAYED)); + + if (x == -1 && y == -1) /* passed via VK_APPS press/release */ + { + RECT rc; + /* Windows places the menu at the edit's center in this case */ + GetClientRect(es->hwndSelf, &rc); + MapWindowPoints(es->hwndSelf, 0, (POINT *)&rc, 2); + x = rc.left + (rc.right - rc.left) / 2; + y = rc.top + (rc.bottom - rc.top) / 2; + } TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); DestroyMenu(menu); @@ -5040,6 +5068,11 @@ EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); GlobalUnlock(hsrc); } + else if (es->style & ES_PASSWORD) { + /* clear selected text in password edit box even with empty clipboard */ + const WCHAR empty_strW[] = { 0 }; + EDIT_EM_ReplaceSel(es, TRUE, empty_strW, TRUE, TRUE); + } CloseClipboard(); } @@ -5106,7 +5139,7 @@ EC_USEFONTINFO, EC_USEFONTINFO, FALSE); if (es->style & ES_MULTILINE) - EDIT_BuildLineDefs_ML(es, 0, strlenW(es->text), 0, NULL); + EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); else EDIT_CalcLineWidth_SL(es); @@ -5136,11 +5169,12 @@ */ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) { + LPWSTR textW = NULL; if (!unicode && text) { LPCSTR textA = (LPCSTR)text; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); - LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); + textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); if (textW) MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); text = textW; @@ -5157,7 +5191,7 @@ TRACE("%s\n", debugstr_w(text)); EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE); if(!unicode) - HeapFree(GetProcessHeap(), 0, (LPWSTR)text); + HeapFree(GetProcessHeap(), 0, textW); } else { @@ -5475,7 +5509,8 @@ return; } - ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); + if (dwBufLen) + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; if (CompFlag & GCS_COMPATTR) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Tue Oct 23 08:19:29 2007 @@ -123,7 +123,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced at 20060621 reactos/dll/win32/user32/controls/combo.c # Synced at 20060904 - reactos/dll/win32/user32/controls/edit.c # Synced at 20060710 + reactos/dll/win32/user32/controls/edit.c # Synced at 20071022 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 reactos/dll/win32/user32/controls/scrollbar.c # Forked

1 0

[peterw] 29810: - Remove the dependency on cut from sSVN.cmd.
by peterw＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: peterw Date: Tue Oct 23 06:44:23 2007 New Revision: 29810 URL: http://svn.reactos.org/svn/reactos?rev=29810&view=rev Log: - Remove the dependency on cut from sSVN.cmd. Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Tue Oct 23 06:44:23 2007 @@ -56,8 +56,8 @@ :: if "%1" == "status" ( title Status - for /f "usebackq" %%i in (`"svn info | find "Revision:" | cut -d " " -f 2"`) do set OFFSVN=%%i - for /f "usebackq" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:" | cut -d " " -f 2"`) do set ONSVN=%%j + for /f "usebackq tokens=2" %%i in (`"svn info | find "Revision:""`) do set OFFSVN=%%i + for /f "usebackq tokens=2" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j call :UP goto :ExitSVN )

1 0

[janderwald] 29809: - silence wine debug messages
by janderwald＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: janderwald Date: Tue Oct 23 06:03:29 2007 New Revision: 29809 URL: http://svn.reactos.org/svn/reactos?rev=29809&view=rev Log: - silence wine debug messages Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Tue Oct 23 06:03:29 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -#define YDEBUG +//#define YDEBUG #include "wine/debug.h" #include "windef.h"

1 0

[janderwald] 29808: - add a member to shlview to able to track the current context menu - make the background menu use owner drawn items to show icon (icon not yet shown) - let the shell item menu also accept owner drawn images - this makes winrar shellextension appear however the language is _not_ correct in most cases and executing a command is at your own risk :)
by janderwald＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: janderwald Date: Tue Oct 23 06:00:30 2007 New Revision: 29808 URL: http://svn.reactos.org/svn/reactos?rev=29808&view=rev Log: - add a member to shlview to able to track the current context menu - make the background menu use owner drawn items to show icon (icon not yet shown) - let the shell item menu also accept owner drawn images - this makes winrar shellextension appear however the language is _not_ correct in most cases and executing a command is at your own risk :) Modified: trunk/reactos/dll/win32/shell32/shlview.c trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Tue Oct 23 06:00:30 2007 @@ -109,6 +109,7 @@ LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ POINT ptLastMousePos; /* Mouse position at last DragOver call */ + IContextMenu2 *pCM; } IShellViewImpl; static const IShellViewVtbl svvt; @@ -948,7 +949,6 @@ BOOL fExplore = FALSE; HWND hwndTree = 0; LPCONTEXTMENU pContextMenu = NULL; - IContextMenu2 *pCM = NULL; CMINVOKECOMMANDINFO cmi; TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault); @@ -957,9 +957,9 @@ if( ShellView_GetSelections(This) ) { IShellFolder_GetUIObjectOf( This->pSFParent, This->hWndParent, This->cidl, (LPCITEMIDLIST*)This->apidl, - (REFIID)&IID_IContextMenu, NULL, (LPVOID *)&pContextMenu); - - if(pContextMenu) + (REFIID)&IID_IContextMenu, NULL, (LPVOID *)&This->pCM); + + if(This->pCM) { TRACE("-- pContextMenu\n"); hMenu = CreatePopupMenu(); @@ -977,7 +977,7 @@ wFlags = CMF_NORMAL | (This->cidl != 1 ? 0 : CMF_CANRENAME) | (fExplore ? CMF_EXPLORE : 0); /* let the ContextMenu merge its items in */ - if (SUCCEEDED(IContextMenu_QueryContextMenu( pContextMenu, hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, wFlags ))) + if (SUCCEEDED(IContextMenu_QueryContextMenu( This->pCM, hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, wFlags ))) { if (This->FolderSettings.fFlags & FWF_DESKTOP) SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); @@ -1017,16 +1017,19 @@ DestroyMenu(hMenu); } } - if (pContextMenu) - IContextMenu_Release(pContextMenu); + if (This->pCM) + { + IContextMenu_Release(This->pCM); + This->pCM = NULL; + } } } else /* background context menu */ { hMenu = CreatePopupMenu(); - pCM = ISvBgCm_Constructor(This->pSFParent, FALSE); - IContextMenu2_QueryContextMenu(pCM, hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); + This->pCM = ISvBgCm_Constructor(This->pSFParent, FALSE); + IContextMenu2_QueryContextMenu(This->pCM, hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); uCommand = TrackPopupMenu( hMenu, TPM_LEFTALIGN | TPM_RETURNCMD,x,y,0,This->hWnd,NULL); DestroyMenu(hMenu); @@ -1037,9 +1040,10 @@ cmi.cbSize = sizeof(cmi); cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); cmi.hwnd = This->hWndParent; - IContextMenu2_InvokeCommand(pCM, &cmi); - - IContextMenu2_Release(pCM); + IContextMenu2_InvokeCommand(This->pCM, &cmi); + + IContextMenu2_Release(This->pCM); + This->pCM = NULL; } } @@ -1582,6 +1586,26 @@ } return TRUE; } + +/********************************************************** +* ShellView_DoMeasureItem +*/ + +static LRESULT ShellView_DoCustomItem(IShellViewImpl * pThis, HWND hWnd, UINT uMsg, LPARAM lParam) +{ + if (!pThis->pCM) + { + /* no menu */ + ERR("no menu!!!\n"); + return FALSE; + } + + if (pThis->pCM->lpVtbl->HandleMenuMsg(pThis->pCM, uMsg, (WPARAM)hWnd, lParam) == S_OK) + return TRUE; + else + return FALSE; +} + /********************************************************** * ShellView_WndProc */ @@ -1616,6 +1640,9 @@ case WM_CONTEXTMENU: ShellView_DoContextMenu(pThis, LOWORD(lParam), HIWORD(lParam), FALSE); return 0; + case WM_DRAWITEM: + case WM_MEASUREITEM: + return ShellView_DoCustomItem(pThis, hWnd, uMessage, lParam); case WM_SHOWWINDOW: UpdateWindow(pThis->hWndList); break; @@ -1726,6 +1753,9 @@ if(This->pAdvSink) IAdviseSink_Release(This->pAdvSink); + + if (This->pCM) + IContextMenu_Release(This->pCM); HeapFree(GetProcessHeap(),0,This); } Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Tue Oct 23 06:00:30 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG +#define YDEBUG #include "wine/debug.h" #include "windef.h" @@ -36,6 +36,7 @@ #include "undocshell.h" #include "shlwapi.h" #include "stdio.h" +#include "winuser.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -277,7 +278,6 @@ } - ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -298,8 +298,8 @@ InsertMenuItemW(hMenu, -1, TRUE, &mii); - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; //MIIM_BITMAP; - mii.fType = MFT_STRING; + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; + mii.fType = MFT_OWNERDRAW; mii.fState = MFS_ENABLED; pCurItem = s_SnHead; @@ -467,6 +467,74 @@ break; } } +} +HRESULT +DoMeasureItem(BgCmImpl *This, HWND hWnd, MEASUREITEMSTRUCT * lpmis) +{ + PSHELLNEW_ITEM pCurItem; + PSHELLNEW_ITEM pItem; + UINT i; + HDC hDC; + SIZE size; + + TRACE("DoMeasureItem entered with id %x\n", lpmis->itemID); + + pCurItem = s_SnHead; + + i = This->iIdShellNewFirst; + pItem = NULL; + while(pCurItem) + { + if (i == lpmis->itemID) + { + pItem = pCurItem; + break; + } + pCurItem = pCurItem->Next; + i++; + } + + if (!pItem) + return E_FAIL; + + hDC = GetDC(hWnd); + GetTextExtentPoint32W(hDC, pCurItem->szDesc, strlenW(pCurItem->szDesc), &size); + lpmis->itemWidth = size.cx + 32; + lpmis->itemHeight = max(size.cy, 20); + ReleaseDC (hWnd, hDC); + return S_OK; +} + +HRESULT +DoDrawItem(BgCmImpl *This, HWND hWnd, DRAWITEMSTRUCT * drawItem) +{ + PSHELLNEW_ITEM pCurItem; + PSHELLNEW_ITEM pItem; + UINT i; + pCurItem = s_SnHead; + + TRACE("DoDrawItem entered with id %x\n", drawItem->itemID); + + i = This->iIdShellNewFirst; + pItem = NULL; + while(pCurItem) + { + if (i == drawItem->itemID) + { + pItem = pCurItem; + break; + } + pCurItem = pCurItem->Next; + i++; + } + + if (!pItem) + return E_FAIL; + + drawItem->rcItem.left += 20; + + DrawTextW(drawItem->hDC, pCurItem->szDesc, wcslen(pCurItem->szDesc), &drawItem->rcItem, 0); + return S_OK; } @@ -870,9 +938,23 @@ WPARAM wParam, LPARAM lParam) { - BgCmImpl *This = (BgCmImpl *)iface; - - FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + BgCmImpl *This = (BgCmImpl *)iface; + DRAWITEMSTRUCT * lpids = (DRAWITEMSTRUCT*) lParam; + MEASUREITEMSTRUCT *lpmis = (MEASUREITEMSTRUCT*) lParam; + + TRACE("ISVBgCm_fnHandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + switch(uMsg) + { + case WM_MEASUREITEM: + if (lpmis->itemID >= This->iIdShellNewFirst && lpmis->itemID <= This->iIdShellNewLast) + return DoMeasureItem(This, (HWND)wParam, lpmis); + break; + case WM_DRAWITEM: + if (lpmis->itemID >= This->iIdShellNewFirst && lpmis->itemID <= This->iIdShellNewLast) + return DoDrawItem(This, (HWND)wParam, lpids); + break; + } return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Tue Oct 23 06:00:30 2007 @@ -56,6 +56,8 @@ IContextMenu ** ecmenu; UINT esize; UINT ecount; + UINT iIdSHEFirst; + UINT iIdSHELast; } ItemCmImpl; UINT @@ -215,6 +217,50 @@ InsertMenuItemA( hmenu, indexMenu, fByPosition, &mii); } +HRESULT +DoCustomItemAction(ItemCmImpl *This, LPARAM lParam, UINT uMsg) +{ + IContextMenu2 * cmenu; + IContextMenu * menu; + MEASUREITEMSTRUCT * lpmis = (MEASUREITEMSTRUCT *)lParam; + DRAWITEMSTRUCT * drawItem = (DRAWITEMSTRUCT *)lParam; + HRESULT hResult; + + + TRACE("DoCustomItemAction entered with uMsg %x lParam %p\n", uMsg, lParam); + + if (uMsg == WM_MEASUREITEM) + { + menu = This->ecmenu[lpmis->itemID - This->iIdSHEFirst]; + } + else if (uMsg == WM_DRAWITEM) + { + menu = This->ecmenu[drawItem->itemID - This->iIdSHEFirst]; + } + else + { + ERR("unexpected message\n"); + return E_FAIL; + } + + if (!menu) + { + ERR("item is not valid\n"); + return E_FAIL; + } + + hResult = menu->lpVtbl->QueryInterface(menu, &IID_IContextMenu2, (void**)&cmenu); + if (hResult != S_OK) + { + ERR("failed to get IID_IContextMenu2 interface\n"); + return hResult; + } + + hResult = cmenu->lpVtbl->HandleMenuMsg(cmenu, uMsg, (WPARAM)0, lParam); + TRACE("returning hResult %x\n", hResult); + return hResult; +} + BOOL SH_EnlargeContextMenuArray(ItemCmImpl *This, UINT newsize) { @@ -253,7 +299,7 @@ HRESULT hResult; UINT idCmdFirst = 0x5000; UINT idCmdLast = 0xFFF0; - static const WCHAR szAny[] = { '*',0}; + static WCHAR szAny[] = { '*',0}; SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj); @@ -283,17 +329,16 @@ } TRACE("SH_LoadContextMenuHandlers num extensions %u\n", This->ecount); - + This->iIdSHEFirst = idCmdFirst; for (i = 0; i < This->ecount; i++) { cmenu = This->ecmenu[i]; - TRACE("Invoking menu %p\n", cmenu); - hResult = cmenu->lpVtbl->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, idCmdLast, CMF_NORMAL); - TRACE("result %x\n",hResult); - } - - - + hResult = cmenu->lpVtbl->QueryContextMenu(cmenu, hMenu, indexMenu, idCmdFirst, idCmdLast, CMF_NORMAL); + idCmdFirst += (hResult & 0xFFFF); + } + This->iIdSHELast = idCmdFirst; + + TRACE("SH_LoadContextMenuHandlers first %x last %x\n", This->iIdSHEFirst, This->iIdSHELast); } /************************************************************************** @@ -681,10 +726,20 @@ LPARAM lParam) { ItemCmImpl *This = (ItemCmImpl *)iface; - + LPMEASUREITEMSTRUCT lpmis = (LPMEASUREITEMSTRUCT) lParam; TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); - return E_NOTIMPL; + switch(uMsg) + { + case WM_MEASUREITEM: + case WM_DRAWITEM: + if (lpmis->itemID >= This->iIdSHEFirst && lpmis->itemID <= This->iIdSHELast) + return DoCustomItemAction(This, lParam, uMsg); + break; + + } + + return E_NOTIMPL; } static const IContextMenu2Vtbl cmvt =

1 0

[dreimer] 29807: Get rid of svnversion.exe and its need in ssvn.cmd. Now we call cut two times, but there seems to be NO way to get around it. If you try to do it without cut, then it wont load anything useful into the Variables, because the Variables are filled even before svn outputs anything. I even tried "cmd /V:ON /K" no way...
by dreimer＠svn.reactos.org 23 Oct '07

23 Oct '07

Author: dreimer Date: Tue Oct 23 05:38:27 2007 New Revision: 29807 URL: http://svn.reactos.org/svn/reactos?rev=29807&view=rev Log: Get rid of svnversion.exe and its need in ssvn.cmd. Now we call cut two times, but there seems to be NO way to get around it. If you try to do it without cut, then it wont load anything useful into the Variables, because the Variables are filled even before svn outputs anything. I even tried "cmd /V:ON /K" no way... Modified: trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Tue Oct 23 05:38:27 2007 @@ -2,7 +2,7 @@ :: PROJECT: RosBE - ReactOS Build Environment for Windows :: LICENSE: GPL - See LICENSE.txt in the top level directory. :: FILE: Root/options.cmd -:: PURPOSE: Starts options.exe and reboots RosBE at the End. +:: PURPOSE: Starts options.exe and restarts RosBE afterwards. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Tue Oct 23 05:38:27 2007 @@ -56,7 +56,7 @@ :: if "%1" == "status" ( title Status - for /f "usebackq" %%i in (`svnversion .`) do set OFFSVN=%%i + for /f "usebackq" %%i in (`"svn info | find "Revision:" | cut -d " " -f 2"`) do set OFFSVN=%%i for /f "usebackq" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:" | cut -d " " -f 2"`) do set ONSVN=%%j call :UP goto :ExitSVN

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