Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 40043: add wlantypes.h and move some definitions to the correct place
by cwittich＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: cwittich Date: Sun Mar 15 21:55:51 2009 New Revision: 40043 URL: http://svn.reactos.org/svn/reactos?rev=40043&view=rev Log: add wlantypes.h and move some definitions to the correct place Modified: trunk/reactos/include/psdk/windot11.h trunk/reactos/include/psdk/wlanapi.h Modified: trunk/reactos/include/psdk/windot11.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windot11.h?re… ============================================================================== --- trunk/reactos/include/psdk/windot11.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windot11.h [iso-8859-1] Sun Mar 15 21:55:51 2009 @@ -1,21 +1,19 @@ +#ifndef __WINDOT11_H__ +#define __WINDOT11_H__ #ifndef _NTDDNDIS_ #include <ntddndis.h> #endif +#include <wlantypes.h> + /* Enumerations */ #if defined(__midl) || defined(__WIDL__) -typedef [v1_enum] enum _DOT11_BSS_TYPE { +typedef [v1_enum] enum _DOT11_PHY_TYPE { #else -typedef enum _DOT11_BSS_TYPE { +typedef enum _DOT11_PHY_TYPE { #endif - dot11_BSS_type_infrastructure = 1, - dot11_BSS_type_independent, - dot11_BSS_type_any -} DOT11_BSS_TYPE; - -typedef enum _DOT11_PHY_TYPE { dot11_phy_type_unknown, dot11_phy_type_any, dot11_phy_type_fhss, @@ -56,37 +54,31 @@ /* Types */ +#if defined(__midl) || defined(__WIDL__) +typedef struct _DOT11_MAC_ADDRESS { + UCHAR ucDot11MacAddress[6]; +} DOT11_MAC_ADDRESS, *PDOT11_MAC_ADDRESS; +#else typedef UCHAR DOT11_MAC_ADDRESS[6]; typedef DOT11_MAC_ADDRESS* PDOT11_MAC_ADDRESS; +#endif typedef struct _DOT11_SSID { ULONG uSSIDLength; UCHAR ucSSID[32]; } DOT11_SSID, *PDOT11_SSID; -typedef struct _DOT11_NETWORK { - DOT11_SSID dot11Ssid; - DOT11_BSS_TYPE dot11BssType; -} DOT11_NETWORK, *PDOT11_NETWORK; - -typedef struct _DOT11_NETWORK_LIST { - DWORD dwNumberOfItems; - DWORD dwIndex; -#if defined(__midl) || defined(__WIDL__) - [size_is(dwNumberOfItems)] DOT11_NETWORK Network[]; -#else - DOT11_NETWORK Network[1]; -#endif -} DOT11_NETWORK_LIST, *PDOT11_NETWORK_LIST; - typedef struct _DOT11_BSSID_LIST { NDIS_OBJECT_HEADER Header; ULONG uNumOfEntries; ULONG uTotalNumOfEntries; #if defined(__midl) || defined(__WIDL__) - [size_is(uTotalNumOfEntries)] DOT11_MAC_ADDRESS BSSIDs[]; + [size_is(uTotalNumOfEntries)] DOT11_MAC_ADDRESS BSSIDs[*]; #else DOT11_MAC_ADDRESS BSSIDs[1]; #endif } DOT11_BSSID_LIST, *PDOT11_BSSID_LIST; + +#endif + Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Sun Mar 15 21:55:51 2009 @@ -1,12 +1,208 @@ #ifndef _WLANAPI_H #define _WLANAPI_H +#include <windot11.h> + #ifdef __cplusplus extern "C" { #endif +/* Defines */ +#define WLAN_MAX_PHY_INDEX 64 +#define WLAN_MAX_NAME_LENGTH 256 + +/* Enumerations */ + +typedef enum _WLAN_CONNECTION_MODE { + wlan_connection_mode_profile = 0, + wlan_connection_mode_temporary_profile, + wlan_connection_mode_discovery_secure, + wlan_connection_mode_discovery_unsecure, + wlan_connection_mode_auto, + wlan_connection_mode_invalid +} WLAN_CONNECTION_MODE, *PWLAN_CONNECTION_MODE; + +#if defined(__midl) || defined(__WIDL__) +typedef [v1_enum] enum _WLAN_INTERFACE_STATE { +#else +typedef enum _WLAN_INTERFACE_STATE { +#endif + wlan_interface_state_not_ready = 0, + wlan_interface_state_connected, + wlan_interface_state_ad_hoc_network_formed, + wlan_interface_state_disconnecting, + wlan_interface_state_disconnected, + wlan_interface_state_associating, + wlan_interface_state_discovering, + wlan_interface_state_authenticating +} WLAN_INTERFACE_STATE; + +typedef enum _WLAN_INTERFACE_TYPE { + wlan_interface_type_emulated_802_11 = 0, + wlan_interface_type_native_802_11, + wlan_interface_type_invalid +} WLAN_INTERFACE_TYPE, *PWLAN_INTERFACE_TYPE; + +/* Types */ +typedef DWORD WLAN_REASON_CODE, *PWLAN_REASON_CODE; +typedef ULONG WLAN_SIGNAL_QUALITY, *PWLAN_SIGNAL_QUALITY; + +typedef struct _DOT11_NETWORK { + DOT11_SSID dot11Ssid; + DOT11_BSS_TYPE dot11BssType; +} DOT11_NETWORK, *PDOT11_NETWORK; + +typedef struct _DOT11_NETWORK_LIST { + DWORD dwNumberOfItems; + DWORD dwIndex; +#if defined(__midl) || defined(__WIDL__) + [size_is(dwNumberOfItems)] DOT11_NETWORK Network[]; +#else + DOT11_NETWORK Network[1]; +#endif +} DOT11_NETWORK_LIST, *PDOT11_NETWORK_LIST; + +typedef struct _WLAN_INTERFACE_INFO { + GUID InterfaceGuid; + WCHAR strInterfaceDescription[256]; + WLAN_INTERFACE_STATE isState; +} WLAN_INTERFACE_INFO, *PWLAN_INTERFACE_INFO; + +typedef struct _WLAN_INTERFACE_INFO_LIST { + DWORD dwNumberOfItems; + DWORD dwIndex; +#if defined(__midl) || defined(__WIDL__) + [unique, size_is(dwNumberOfItems)] WLAN_INTERFACE_INFO InterfaceInfo[*]; +#else + WLAN_INTERFACE_INFO InterfaceInfo[1]; +#endif +} WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; + +typedef struct _WLAN_INTERFACE_CAPABILITY { + WLAN_INTERFACE_TYPE interfaceType; + BOOL bDot11DSupported; + DWORD dwMaxDesiredSsidListSize; + DWORD dwMaxDesiredBssidListSize; + DWORD dwNumberOfSupportedPhys; + /* enum32 */ long dot11PhyTypes[WLAN_MAX_PHY_INDEX]; +} WLAN_INTERFACE_CAPABILITY, *PWLAN_INTERFACE_CAPABILITY; + +typedef struct _WLAN_RAW_DATA { + DWORD dwDataSize; +#if defined(__midl) || defined(__WIDL__) + [size_is(dwDataSize)] BYTE DataBlob[]; +#else + BYTE DataBlob[1]; +#endif +} WLAN_RAW_DATA, *PWLAN_RAW_DATA; + +typedef struct _WLAN_PROFILE_INFO { + WCHAR strProfileName[256]; + DWORD dwFlags; +} WLAN_PROFILE_INFO, *PWLAN_PROFILE_INFO; + +typedef struct _WLAN_PROFILE_INFO_LIST { + DWORD dwNumberOfItems; + DWORD dwIndex; +#if defined(__midl) || defined(__WIDL__) + [size_is(dwNumberOfItems)] WLAN_PROFILE_INFO ProfileInfo[]; +#else + WLAN_PROFILE_INFO ProfileInfo[1]; +#endif +} WLAN_PROFILE_INFO_LIST, *PWLAN_PROFILE_INFO_LIST; + +typedef struct _WLAN_AVAILABLE_NETWORK { + WCHAR strProfileName[WLAN_MAX_NAME_LENGTH]; + DOT11_SSID dot11Ssid; + DOT11_BSS_TYPE dot11BssType; + ULONG uNumberOfBssids; + BOOL bNetworkConnectable; + WLAN_REASON_CODE wlanNotConnectableReason; + ULONG uNumberOfPhyTypes; + DOT11_PHY_TYPE dot11PhyTypes[8]; + BOOL bMorePhyTypes; + WLAN_SIGNAL_QUALITY wlanSignalQuality; + BOOL bSecurityEnabled; + DOT11_AUTH_ALGORITHM dot11DefaultAuthAlgorithm; + DOT11_CIPHER_ALGORITHM dot11DefaultCipherAlgorithm; + DWORD dwFlags; + DWORD dwReserved; +} WLAN_AVAILABLE_NETWORK, *PWLAN_AVAILABLE_NETWORK; + +typedef struct _WLAN_AVAILABLE_NETWORK_LIST { + DWORD dwNumberOfItems; + DWORD dwIndex; +#if defined(__midl) || defined(__WIDL__) + [size_is(dwNumberOfItems)] WLAN_AVAILABLE_NETWORK Network[]; +#else + WLAN_AVAILABLE_NETWORK Network[1]; +#endif +} WLAN_AVAILABLE_NETWORK_LIST ,*PWLAN_AVAILABLE_NETWORK_LIST; + +typedef struct _WLAN_CONNECTION_PARAMETERS { + WLAN_CONNECTION_MODE wlanConnectionMode; + [string] wchar_t * strProfile; + PDOT11_SSID pDot11Ssid; + PDOT11_BSSID_LIST pDesiredBssidList; + DOT11_BSS_TYPE dot11BssType; + DWORD dwFlags; +} WLAN_CONNECTION_PARAMETERS, *PWLAN_CONNECTION_PARAMETERS; + + +/* FIXME */ + +typedef struct _struct_8 { + DWORD elem_1; + DWORD elem_2; + GUID elem_3; + DWORD elem_4; + [size_is(elem_4)] LPBYTE elem_5; +} struct_8 ; + +typedef struct struct_12 { + BYTE elem_1; + DWORD elem_2; + DWORD elem_3; +} struct_12 ; + +typedef struct _struct_9 { + struct_12 elem_1; + DWORD elem_2; +} struct_9 ; + +typedef struct struct_C { + ULONGLONG elem_1; + ULONGLONG elem_2; + GUID elem_3; + GUID elem_4; + DWORD elem_5; + GUID elem_6; + DWORD elem_7; + DWORD elem_8; + ULONGLONG elem_9; + [size_is(elem_7)] BYTE elem_10[]; +} struct_C ; + +typedef struct struct_D { + GUID elem_1; + GUID elem_2; + DWORD elem_3; + ULONGLONG elem_4; + [size_is(elem_3)] BYTE elem_5[]; +} struct_D ; + +typedef struct struct_E { + /* enum16 */ short elem_1; + DWORD elem_2; + WCHAR elem_3[256]; + WCHAR elem_4[1024]; +} struct_E ; + +/* Functions */ +#if !defined(__midl) && !defined(__WIDL__) PVOID WINAPI WlanAllocateMemory(DWORD dwSize); VOID WINAPI WlanFreeMemory(PVOID pMemory); +#endif #ifdef __cplusplus }

1 0

[cwittich] 40042: add ntddndis.h and windot11.h
by cwittich＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: cwittich Date: Sun Mar 15 20:19:02 2009 New Revision: 40042 URL: http://svn.reactos.org/svn/reactos?rev=40042&view=rev Log: add ntddndis.h and windot11.h Added: trunk/reactos/include/psdk/ntddndis.h (with props) trunk/reactos/include/psdk/windot11.h (with props) Added: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h (added) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Sun Mar 15 20:19:02 2009 @@ -1,0 +1,12 @@ +#ifndef _NTDDNDIS_ +#define _NTDDNDIS_ +#endif + +typedef struct _NDIS_OBJECT_HEADER +{ + UCHAR Type; + UCHAR Revision; + USHORT Size; +} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; + + Propchange: trunk/reactos/include/psdk/ntddndis.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/windot11.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windot11.h?re… ============================================================================== --- trunk/reactos/include/psdk/windot11.h (added) +++ trunk/reactos/include/psdk/windot11.h [iso-8859-1] Sun Mar 15 20:19:02 2009 @@ -1,0 +1,92 @@ + +#ifndef _NTDDNDIS_ +#include <ntddndis.h> +#endif + +/* Enumerations */ + +#if defined(__midl) || defined(__WIDL__) +typedef [v1_enum] enum _DOT11_BSS_TYPE { +#else +typedef enum _DOT11_BSS_TYPE { +#endif + dot11_BSS_type_infrastructure = 1, + dot11_BSS_type_independent, + dot11_BSS_type_any +} DOT11_BSS_TYPE; + +typedef enum _DOT11_PHY_TYPE { + dot11_phy_type_unknown, + dot11_phy_type_any, + dot11_phy_type_fhss, + dot11_phy_type_dsss, + dot11_phy_type_irbaseband, + dot11_phy_type_ofdm, + dot11_phy_type_hrdsss, + dot11_phy_type_erp, + dot11_phy_type_ht, + dot11_phy_type_IHV_start, + dot11_phy_type_IHV_end +} DOT11_PHY_TYPE; + +typedef enum _DOT11_AUTH_ALGORITHM { + DOT11_AUTH_ALGO_80211_OPEN = 1, + DOT11_AUTH_ALGO_80211_SHARED_KEY, + DOT11_AUTH_ALGO_WPA, + DOT11_AUTH_ALGO_WPA_PSK, + DOT11_AUTH_ALGO_WPA_NONE, + DOT11_AUTH_ALGO_RSNA, + DOT11_AUTH_ALGO_RSNA_PSK, + DOT11_AUTH_ALGO_IHV_START = 0x80000000, + DOT11_AUTH_ALGO_IHV_END = 0xffffffff +} DOT11_AUTH_ALGORITHM; + +typedef enum _DOT11_CIPHER_ALGORITHM { + DOT11_CIPHER_ALGO_NONE = 0x00, + DOT11_CIPHER_ALGO_WEP40 = 0x01, + DOT11_CIPHER_ALGO_TKIP = 0x02, + DOT11_CIPHER_ALGO_CCMP = 0x04, + DOT11_CIPHER_ALGO_WEP104 = 0x05, + DOT11_CIPHER_ALGO_WPA_USE_GROUP = 0x100, + DOT11_CIPHER_ALGO_RSN_USE_GROUP = 0x100, + DOT11_CIPHER_ALGO_WEP = 0x101, + DOT11_CIPHER_ALGO_IHV_START = 0x80000000, + DOT11_CIPHER_ALGO_IHV_END = 0xffffffff +} DOT11_CIPHER_ALGORITHM; + +/* Types */ + +typedef UCHAR DOT11_MAC_ADDRESS[6]; +typedef DOT11_MAC_ADDRESS* PDOT11_MAC_ADDRESS; + +typedef struct _DOT11_SSID { + ULONG uSSIDLength; + UCHAR ucSSID[32]; +} DOT11_SSID, *PDOT11_SSID; + +typedef struct _DOT11_NETWORK { + DOT11_SSID dot11Ssid; + DOT11_BSS_TYPE dot11BssType; +} DOT11_NETWORK, *PDOT11_NETWORK; + +typedef struct _DOT11_NETWORK_LIST { + DWORD dwNumberOfItems; + DWORD dwIndex; +#if defined(__midl) || defined(__WIDL__) + [size_is(dwNumberOfItems)] DOT11_NETWORK Network[]; +#else + DOT11_NETWORK Network[1]; +#endif +} DOT11_NETWORK_LIST, *PDOT11_NETWORK_LIST; + +typedef struct _DOT11_BSSID_LIST { + NDIS_OBJECT_HEADER Header; + ULONG uNumOfEntries; + ULONG uTotalNumOfEntries; +#if defined(__midl) || defined(__WIDL__) + [size_is(uTotalNumOfEntries)] DOT11_MAC_ADDRESS BSSIDs[]; +#else + DOT11_MAC_ADDRESS BSSIDs[1]; +#endif +} DOT11_BSSID_LIST, *PDOT11_BSSID_LIST; + Propchange: trunk/reactos/include/psdk/windot11.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 40041: Evgeniy Boltik <bstsoft@narod.ru> - EngStretchBltROP expects a ROP4 code, but SRCCOPY is ROP3. Convert it accordingly. See issue #4156 for more details.
by fireball＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: fireball Date: Sun Mar 15 20:04:46 2009 New Revision: 40041 URL: http://svn.reactos.org/svn/reactos?rev=40041&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - EngStretchBltROP expects a ROP4 code, but SRCCOPY is ROP3. Convert it accordingly. See issue #4156 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Mar 15 20:04:46 2009 @@ -1009,7 +1009,7 @@ MaskOrigin, Mode, NULL, - SRCCOPY); + ROP3_TO_ROP4(SRCCOPY)); } BOOL APIENTRY

1 0

[fireball] 40040: Evgeniy Boltik <bstsoft@narod.ru> - Brush's origin is always (0, 0) of a window, not a screen. Offset it accordingly in NtGdiStretchBlt. See issue #4147 for more details.
by fireball＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: fireball Date: Sun Mar 15 20:00:13 2009 New Revision: 40040 URL: http://svn.reactos.org/svn/reactos?rev=40040&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Brush's origin is always (0,0) of a window, not a screen. Offset it accordingly in NtGdiStretchBlt. See issue #4147 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun Mar 15 20:00:13 2009 @@ -879,6 +879,10 @@ IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); } + /* Offset the brush */ + BrushOrigin.x += DCDest->ptlDCOrig.x; + BrushOrigin.y += DCDest->ptlDCOrig.y; + /* Perform the bitblt operation */ Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, DCDest->CombinedClip, XlateObj,

1 0

[dchapyshev] 40039: - Add mp3 codec from Wine
by dchapyshev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dchapyshev Date: Sun Mar 15 18:54:15 2009 New Revision: 40039 URL: http://svn.reactos.org/svn/reactos?rev=40039&view=rev Log: - Add mp3 codec from Wine Added: trunk/reactos/dll/win32/winemp3.acm/ (with props) trunk/reactos/dll/win32/winemp3.acm/common.c (with props) trunk/reactos/dll/win32/winemp3.acm/dct64_i386.c (with props) trunk/reactos/dll/win32/winemp3.acm/decode_i386.c (with props) trunk/reactos/dll/win32/winemp3.acm/huffman.h (with props) trunk/reactos/dll/win32/winemp3.acm/interface.c (with props) trunk/reactos/dll/win32/winemp3.acm/l2tables.h (with props) trunk/reactos/dll/win32/winemp3.acm/layer1.c (with props) trunk/reactos/dll/win32/winemp3.acm/layer2.c (with props) trunk/reactos/dll/win32/winemp3.acm/layer3.c (with props) trunk/reactos/dll/win32/winemp3.acm/mpegl3.c (with props) trunk/reactos/dll/win32/winemp3.acm/mpg123.h (with props) trunk/reactos/dll/win32/winemp3.acm/mpglib.h (with props) trunk/reactos/dll/win32/winemp3.acm/tabinit.c (with props) trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild (with props) trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.spec (with props) Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Added: trunk/reactos/dll/win32/winemp3.acm/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/comm… Added: trunk/reactos/dll/win32/winemp3.acm/dct64_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/dct6… Added: trunk/reactos/dll/win32/winemp3.acm/decode_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/deco… Added: trunk/reactos/dll/win32/winemp3.acm/huffman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/huff… Added: trunk/reactos/dll/win32/winemp3.acm/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/inte… Added: trunk/reactos/dll/win32/winemp3.acm/l2tables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/l2ta… Added: trunk/reactos/dll/win32/winemp3.acm/layer1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/laye… Added: trunk/reactos/dll/win32/winemp3.acm/layer2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/laye… Added: trunk/reactos/dll/win32/winemp3.acm/layer3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/laye… Added: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpeg… Added: trunk/reactos/dll/win32/winemp3.acm/mpg123.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpg1… Added: trunk/reactos/dll/win32/winemp3.acm/mpglib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpgl… Added: trunk/reactos/dll/win32/winemp3.acm/tabinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/tabi… Added: trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/wine… Added: trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/wine… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[jmorlan] 40038: - Allow running a batch file from inside a FOR - A little cleanup
by jmorlan＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: jmorlan Date: Sun Mar 15 18:45:17 2009 New Revision: 40038 URL: http://svn.reactos.org/svn/reactos?rev=40038&view=rev Log: - Allow running a batch file from inside a FOR - A little cleanup Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Sun Mar 15 18:45:17 2009 @@ -88,7 +88,7 @@ TRACE ("FindArg: (%d)\n", n); - if (bc == NULL || n < 0 || n > 9) + if (n < 0 || n > 9) return NULL; n += bc->shiftlevel; @@ -167,38 +167,32 @@ * message */ -VOID ExitBatch (LPTSTR msg) -{ - TRACE ("ExitBatch: (\'%s\')\n", debugstr_aw(msg)); - - if (bc != NULL) - { - if (bc->hBatchFile) - { - CloseHandle (bc->hBatchFile); - bc->hBatchFile = INVALID_HANDLE_VALUE; - } - - if (bc->raw_params) - cmd_free(bc->raw_params); - - if (bc->params) - cmd_free(bc->params); - - UndoRedirection(bc->RedirList, NULL); - FreeRedirection(bc->RedirList); - - /* Preserve echo state across batch calls */ - bEcho = bc->bEcho; - - while (bc->setlocal) - cmd_endlocal(_T("")); - - bc = bc->prev; - } - - if (msg && *msg) - ConOutPrintf (_T("%s\n"), msg); +VOID ExitBatch() +{ + TRACE ("ExitBatch\n"); + + if (bc->hBatchFile) + { + CloseHandle (bc->hBatchFile); + bc->hBatchFile = INVALID_HANDLE_VALUE; + } + + if (bc->raw_params) + cmd_free(bc->raw_params); + + if (bc->params) + cmd_free(bc->params); + + UndoRedirection(bc->RedirList, NULL); + FreeRedirection(bc->RedirList); + + /* Preserve echo state across batch calls */ + bEcho = bc->bEcho; + + while (bc->setlocal) + cmd_endlocal(_T("")); + + bc = bc->prev; } @@ -212,6 +206,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { BATCH_CONTEXT new; + LPFOR_CONTEXT saved_fc; HANDLE hFile; SetLastError(0); @@ -227,9 +222,6 @@ ConErrResPuts(STRING_BATCH_ERROR); return FALSE; } - - /* Kill any and all FOR contexts */ - fc = NULL; if (bc != NULL && Cmd == bc->current) { @@ -252,7 +244,7 @@ /* Get its SETLOCAL stack so it can be migrated to the new context */ setlocal = bc->setlocal; bc->setlocal = NULL; - ExitBatch(NULL); + ExitBatch(); } /* Create a new context. This function will not @@ -285,6 +277,10 @@ if (*firstword == _T(':')) cmd_goto(firstword); + /* If we are calling from inside a FOR, hide the FOR variables */ + saved_fc = fc; + fc = NULL; + /* If we have created a new context, don't return * until this batch file has completed. */ while (bc == &new && !bExit) @@ -310,15 +306,13 @@ TRACE ("Batch: returns TRUE\n"); + fc = saved_fc; return TRUE; } VOID AddBatchRedirection(REDIRECTION **RedirList) { REDIRECTION **ListEnd; - - if(!bc) - return; /* Prepend the list to the batch context's list */ ListEnd = RedirList; @@ -343,17 +337,13 @@ LPTSTR ReadBatchLine () { - /* No batch */ - if (bc == NULL) - return NULL; - TRACE ("ReadBatchLine ()\n"); /* User halt */ if (CheckCtrlBreak (BREAK_BATCHFILE)) { while (bc) - ExitBatch (NULL); + ExitBatch(); return NULL; } @@ -361,7 +351,7 @@ { TRACE ("ReadBatchLine(): Reached EOF!\n"); /* End of file.... */ - ExitBatch (NULL); + ExitBatch(); return NULL; } Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Sun Mar 15 18:45:17 2009 @@ -46,7 +46,7 @@ LPTSTR FindArg (TCHAR, BOOL *); LPTSTR BatchParams (LPTSTR, LPTSTR); -VOID ExitBatch (LPTSTR); +VOID ExitBatch (); BOOL Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); LPTSTR ReadBatchLine(); VOID AddBatchRedirection(REDIRECTION **); Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Sun Mar 15 18:45:17 2009 @@ -38,7 +38,6 @@ INT cmd_goto (LPTSTR param) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR tmp, tmp2; LONG lNewPosHigh = 0; @@ -58,8 +57,8 @@ if (*param == _T('\0')) { - LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ExitBatch(szMsg); + ConErrResPrintf(STRING_GOTO_ERROR1); + ExitBatch(); return 1; } @@ -117,7 +116,7 @@ } ConErrResPrintf(STRING_GOTO_ERROR2, param); - ExitBatch(NULL); + ExitBatch(); return 1; } Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sun Mar 15 18:45:17 2009 @@ -665,7 +665,7 @@ param++; if (_istdigit(*param)) nErrorLevel = _ttoi(param); - ExitBatch (NULL); + ExitBatch(); } else

1 0

[dchapyshev] 40037: - Fix build
by dchapyshev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dchapyshev Date: Sun Mar 15 18:37:05 2009 New Revision: 40037 URL: http://svn.reactos.org/svn/reactos?rev=40037&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sun Mar 15 18:37:05 2009 @@ -124,6 +124,9 @@ <directory name="hlink"> <xi:include href="hlink/hlink.rbuild" /> </directory> +<directory name="httpapi"> + <xi:include href="httpapi/httpapi.rbuild" /> +</directory> <directory name="iccvid"> <xi:include href="iccvid/iccvid.rbuild" /> </directory> @@ -145,12 +148,18 @@ <directory name="inetmib1"> <xi:include href="inetmib1/inetmib1.rbuild" /> </directory> +<directory name="initpki"> + <xi:include href="initpki/initpki.rbuild" /> +</directory> <directory name="inseng"> <xi:include href="inseng/inseng.rbuild" /> </directory> <directory name="iphlpapi"> <xi:include href="iphlpapi/iphlpapi.rbuild" /> </directory> +<directory name="itircl"> + <xi:include href="itircl/itircl.rbuild" /> +</directory> <directory name="itss"> <xi:include href="itss/itss.rbuild" /> </directory> @@ -259,6 +268,12 @@ <directory name="msisip"> <xi:include href="msisip/msisip.rbuild" /> </directory> +<directory name="msisys.ocx"> + <xi:include href="msisys.ocx/msisys.ocx.rbuild" /> +</directory> +<directory name="msnet32"> + <xi:include href="msnet32/msnet32.rbuild" /> +</directory> <directory name="msrle32"> <xi:include href="msrle32/msrle32.rbuild" /> </directory> @@ -358,6 +373,9 @@ <directory name="pdh"> <xi:include href="pdh/pdh.rbuild" /> </directory> +<directory name="pidgen"> + <xi:include href="pidgen/pidgen.rbuild" /> +</directory> <directory name="powrprof"> <xi:include href="powrprof/powrprof.rbuild" /> </directory> @@ -388,6 +406,9 @@ <directory name="rasman"> <xi:include href="rasman/rasman.rbuild" /> </directory> +<directory name="resutils"> + <xi:include href="resutils/resutils.rbuild" /> +</directory> <directory name="riched20"> <xi:include href="riched20/riched20.rbuild" /> </directory> @@ -409,6 +430,9 @@ <directory name="samsrv"> <xi:include href="samsrv/samsrv.rbuild" /> </directory> +<directory name="sccbase"> + <xi:include href="sccbase/sccbase.rbuild" /> +</directory> <directory name="schannel"> <xi:include href="schannel/schannel.rbuild" /> </directory> @@ -451,6 +475,9 @@ <directory name="shlwapi"> <xi:include href="shlwapi/shlwapi.rbuild" /> </directory> +<directory name="slbcsp"> + <xi:include href="slbcsp/slbcsp.rbuild" /> +</directory> <directory name="smdll"> <xi:include href="smdll/smdll.rbuild" /> </directory> @@ -460,6 +487,9 @@ <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> +<directory name="softpub"> + <xi:include href="softpub/softpub.rbuild" /> +</directory> <directory name="spoolss"> <xi:include href="spoolss/spoolss.rbuild" /> </directory> @@ -487,6 +517,9 @@ <directory name="tapiui"> <xi:include href="tapiui/tapiui.rbuild" /> </directory> +<directory name="traffic"> + <xi:include href="traffic/traffic.rbuild" /> +</directory> <directory name="twain_32"> <xi:include href="twain_32/twain_32.rbuild" /> </directory>

1 0

[dchapyshev] 40036: - Add httpapi, initpki, itircl, msisys.ocx, msnet32, pidgen, resutils, sccbase, slbcsp, softpub, traffic from Wine
by dchapyshev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dchapyshev Date: Sun Mar 15 18:20:51 2009 New Revision: 40036 URL: http://svn.reactos.org/svn/reactos?rev=40036&view=rev Log: - Add httpapi, initpki, itircl, msisys.ocx, msnet32, pidgen, resutils, sccbase, slbcsp, softpub, traffic from Wine Added: trunk/reactos/dll/win32/httpapi/ (with props) trunk/reactos/dll/win32/httpapi/httpapi.rbuild (with props) trunk/reactos/dll/win32/httpapi/httpapi.spec (with props) trunk/reactos/dll/win32/httpapi/httpapi_main.c (with props) trunk/reactos/dll/win32/initpki/ (with props) trunk/reactos/dll/win32/initpki/initpki.rbuild (with props) trunk/reactos/dll/win32/initpki/initpki.spec (with props) trunk/reactos/dll/win32/initpki/main.c (with props) trunk/reactos/dll/win32/itircl/ (with props) trunk/reactos/dll/win32/itircl/itircl.rbuild (with props) trunk/reactos/dll/win32/itircl/itircl.spec (with props) trunk/reactos/dll/win32/itircl/itircl_main.c (with props) trunk/reactos/dll/win32/msisys.ocx/ (with props) trunk/reactos/dll/win32/msisys.ocx/msisys.c (with props) trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild (with props) trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.spec (with props) trunk/reactos/dll/win32/msnet32/ (with props) trunk/reactos/dll/win32/msnet32/msnet32.rbuild (with props) trunk/reactos/dll/win32/msnet32/msnet32.spec (with props) trunk/reactos/dll/win32/msnet32/msnet_main.c (with props) trunk/reactos/dll/win32/pidgen/ (with props) trunk/reactos/dll/win32/pidgen/bink.bin (with props) trunk/reactos/dll/win32/pidgen/main.c (with props) trunk/reactos/dll/win32/pidgen/pidgen.rbuild (with props) trunk/reactos/dll/win32/pidgen/pidgen.spec (with props) trunk/reactos/dll/win32/pidgen/rsrc.rc (with props) trunk/reactos/dll/win32/resutils/ (with props) trunk/reactos/dll/win32/resutils/resutils.c (with props) trunk/reactos/dll/win32/resutils/resutils.rbuild (with props) trunk/reactos/dll/win32/resutils/resutils.spec (with props) trunk/reactos/dll/win32/sccbase/ (with props) trunk/reactos/dll/win32/sccbase/main.c (with props) trunk/reactos/dll/win32/sccbase/sccbase.rbuild (with props) trunk/reactos/dll/win32/sccbase/sccbase.spec (with props) trunk/reactos/dll/win32/slbcsp/ (with props) trunk/reactos/dll/win32/slbcsp/main.c (with props) trunk/reactos/dll/win32/slbcsp/slbcsp.rbuild (with props) trunk/reactos/dll/win32/slbcsp/slbcsp.spec (with props) trunk/reactos/dll/win32/softpub/ (with props) trunk/reactos/dll/win32/softpub/softpub.rbuild (with props) trunk/reactos/dll/win32/softpub/softpub.rc (with props) trunk/reactos/dll/win32/softpub/softpub.spec (with props) trunk/reactos/dll/win32/traffic/ (with props) trunk/reactos/dll/win32/traffic/traffic.rbuild (with props) trunk/reactos/dll/win32/traffic/traffic.spec (with props) trunk/reactos/dll/win32/traffic/traffic_main.c (with props) trunk/reactos/include/psdk/http.h (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=400… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -11,6 +11,7 @@ <property name="BASEADDRESS_RSAENH" value="0x35780000" /> <property name="BASEADDRESS_URL" value="0x42ea0000" /> <property name="BASEADDRESS_WLANAPI" value="0x470F0000" /> + <property name="BASEADDRESS_PIDGEN" value="0x473e0000" /> <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" /> <property name="BASEADDRESS_LOADPERF" value="0x4B920000" /> <property name="BASEADDRESS_MPRAPI" value="0x4C400000" /> @@ -65,9 +66,12 @@ <property name="BASEADDRESS_MLANG" value="0x65140000" /> <property name="BASEADDRESS_ACCESS" value="0x65180000" /> <property name="BASEADDRESS_ITSS" value="0x66370000" /> + <property name="BASEADDRESS_ITIRCL" value="0x663a0000" /> <property name="BASEADDRESS_INETMIB1" value="0x666f0000" /> + <property name="BASEADDRESS_INITPKI" value="0x66b00000" /> <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" /> <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" /> + <property name="BASEADDRESS_HTTPAPI" value="0x67ae0000" /> <property name="BASEADDRESS_HID" value="0x688f0000" /> <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> @@ -128,8 +132,10 @@ <property name="BASEADDRESS_MSADP32ACM" value="0x72cb0000" /> <property name="BASEADDRESS_WDMAUD" value="0x72d20000" /> <property name="BASEADDRESS_WINSPOOL" value="0x72f50000" /> + <property name="BASEADDRESS_SOFTPUB" value="0x73290000" /> <property name="BASEADDRESS_MSCAT32" value="0x732b0000" /> <property name="BASEADDRESS_MSTASK" value="0x73520000" /> + <property name="BASEADDRESS_TRAFFIC" value="0x73550000" /> <property name="BASEADDRESS_MCIAVI32" value="0x73610000" /> <property name="BASEADDRESS_MSVIDC32" value="0x73650000" /> <property name="BASEADDRESS_MSRLE32" value="0x73660000" /> @@ -157,6 +163,7 @@ <property name="BASEADDRESS_PDH" value="0x74c70000" /> <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> + <property name="BASEADDRESS_RESUTILS" value="0x75070000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> <property name="BASEADDRESS_NETCFGX" value="0x755F0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -276,6 +276,7 @@ dll\win32\hhctrl.ocx\hhctrl.ocx 1 dll\win32\hid\hid.dll 1 dll\win32\hlink\hlink.dll 1 +dll\win32\httpapi\httpapi.dll 1 dll\win32\iccvid\iccvid.dll 1 dll\win32\icmp\icmp.dll 1 dll\win32\imaadp32.acm\imaadp32.acm 1 @@ -283,8 +284,10 @@ dll\win32\imm32\imm32.dll 1 dll\win32\inetcomm\inetcomm.dll 1 dll\win32\inetmib1\inetmib1.dll 1 +dll\win32\initpki\initpki.dll 1 dll\win32\inseng\inseng.dll 1 dll\win32\iphlpapi\iphlpapi.dll 1 +dll\win32\itircl\itircl.dll 1 dll\win32\itss\itss.dll 1 dll\win32\jscript\jscript.dll 1 dll\win32\kernel32\kernel32.dll 1 @@ -320,6 +323,8 @@ dll\win32\msimg32\msimg32.dll 1 dll\win32\msimtf\msimtf.dll 1 dll\win32\msisip\msisip.dll 1 +dll\win32\msisys.ocx\msisys.ocx 1 +dll\win32\msnet32\msnet32.dll 1 dll\win32\msrle32\msrle32.dll 1 dll\win32\mssign32\mssign32.dll 1 dll\win32\mssip32\mssip32.dll 1 @@ -353,6 +358,7 @@ dll\win32\olethk32\olethk32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\pdh\pdh.dll 1 +dll\win32\pidgen\pidgen.dll 1 dll\win32\powrprof\powrprof.dll 1 dll\win32\printui\printui.dll 1 dll\win32\psapi\psapi.dll 1 @@ -362,6 +368,7 @@ dll\win32\query\query.dll 1 dll\win32\rasapi32\rasapi32.dll 1 dll\win32\rasdlg\rasdlg.dll 1 +dll\win32\resutils\resutils.dll 1 dll\win32\rasman\rasman.dll 1 dll\win32\riched20\riched20.dll 1 dll\win32\riched32\riched32.dll 1 @@ -370,6 +377,7 @@ dll\win32\rsaenh\rsaenh.dll 1 dll\win32\samlib\samlib.dll 1 dll\win32\samsrv\samsrv.dll 1 +dll\win32\sccbase\sccbase.dll 1 dll\win32\schannel\schannel.dll 1 dll\win32\secur32\secur32.dll 1 dll\win32\security\security.dll 1 @@ -384,8 +392,10 @@ dll\win32\shfolder\shfolder.dll 1 dll\win32\shimgvw\shimgvw.dll 1 dll\win32\shlwapi\shlwapi.dll 1 +dll\win32\slbcsp\slbcsp.dll 1 dll\win32\smdll\smdll.dll 1 dll\win32\snmpapi\snmpapi.dll 1 +dll\win32\softpub\softpub.dll 1 dll\win32\spoolss\spoolss.dll 1 dll\win32\srclient\srclient.dll 1 dll\win32\stdole2.tlb\stdole2.tlb 1 @@ -395,6 +405,7 @@ dll\win32\syssetup\syssetup.dll 1 dll\win32\tapi32\tapi32.dll 1 dll\win32\tapiui\tapiui.dll 1 +dll\win32\traffic\traffic.dll 1 dll\win32\twain_32\twain_32.dll 1 dll\win32\uext2\uext2.dll 1 dll\win32\ufat\ufat.dll 1 Propchange: trunk/reactos/dll/win32/httpapi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/httpapi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/httpapi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/httpapi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/httpapi/httpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi.… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi.rbuild (added) +++ trunk/reactos/dll/win32/httpapi/httpapi.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,10 @@ +<module name="httpapi" type="win32dll" baseaddress="${BASEADDRESS_HTTPAPI}" installbase="system32" installname="httpapi.dll" allowwarnings="true"> + <importlibrary definition="httpapi.spec" /> + <include base="httpapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>httpapi_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/httpapi/httpapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/httpapi/httpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi.… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi.spec (added) +++ trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,52 @@ +@ stub HttpAddFragmentToCache +@ stub HttpAddUrl +@ stub HttpAddUrlToConfigGroup +@ stub HttpCancelHttpRequest +@ stub HttpCreateAppPool +@ stub HttpCreateConfigGroup +@ stub HttpCreateFilter +@ stub HttpCreateHttpHandle +@ stub HttpDeleteConfigGroup +@ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) +@ stub HttpFilterAccept +@ stub HttpFilterAppRead +@ stub HttpFilterAppWrite +@ stub HttpFilterAppWriteAndRawRead +@ stub HttpFilterClose +@ stub HttpFilterRawRead +@ stub HttpFilterRawWrite +@ stub HttpFilterRawWriteAndAppRead +@ stub HttpFlushResponseCache +@ stub HttpGetCounters +@ stdcall HttpInitialize(long long ptr) +@ stub HttpInitializeServerContext +@ stub HttpOpenAppPool +@ stub HttpOpenControlChannel +@ stub HttpOpenFilter +@ stub HttpQueryAppPoolInformation +@ stub HttpQueryConfigGroupInformation +@ stub HttpQueryControlChannelInformation +@ stub HttpQueryServerContextInformation +@ stdcall HttpQueryServiceConfiguration(ptr long ptr long ptr long ptr ptr) +@ stub HttpReadFragmentFromCache +@ stub HttpReceiveClientCertificate +@ stub HttpReceiveHttpRequest +@ stub HttpReceiveHttpResponse +@ stub HttpReceiveRequestEntityBody +@ stub HttpRemoveAllUrlsFromConfigGroup +@ stub HttpRemoveUrl +@ stub HttpRemoveUrlFromConfigGroup +@ stub HttpSendHttpRequest +@ stub HttpSendHttpResponse +@ stub HttpSendRequestEntityBody +@ stub HttpSendResponseEntityBody +@ stub HttpSetAppPoolInformation +@ stub HttpSetConfigGroupInformation +@ stub HttpSetControlChannelInformation +@ stub HttpSetServerContextInformation +@ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr) +@ stub HttpShutdownAppPool +@ stub HttpShutdownFilter +@ stdcall HttpTerminate(long ptr) +@ stub HttpWaitForDemandStart +@ stub HttpWaitForDisconnect Propchange: trunk/reactos/dll/win32/httpapi/httpapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/httpapi/httpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi_… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi_main.c (added) +++ trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,159 @@ +/* + * HTTPAPI implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "http.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(httpapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/*********************************************************************** + * HttpInitialize (HTTPAPI.@) + * + * Initializes HTTP Server API engine + * + * PARAMS + * version [ I] HTTP API version which caller will use + * flags [ I] initialization options which specify parts of API what will be used + * reserved [IO] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpInitialize( HTTPAPI_VERSION version, ULONG flags, PVOID reserved ) +{ + FIXME( "({%d,%d}, 0x%x, %p): stub!\n", version.HttpApiMajorVersion, + version.HttpApiMinorVersion, flags, reserved ); + return NO_ERROR; +} + +/*********************************************************************** + * HttpTerminate (HTTPAPI.@) + * + * Cleans up HTTP Server API engine resources allocated by HttpInitialize + * + * PARAMS + * flags [ I] options which specify parts of API what should be released + * reserved [IO] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) +{ + FIXME( "(0x%x, %p): stub!\n", flags, reserved ); + return NO_ERROR; +} + +/*********************************************************************** + * HttpDeleteServiceConfiguration (HTTPAPI.@) + * + * Remove configuration record from HTTP Server API configuration store + * + * PARAMS + * handle [I] reserved, must be 0 + * type [I] configuration record type + * config [I] buffer which contains configuration record information + * length [I] length of configuration record buffer + * overlapped [I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, + PVOID config, ULONG length, LPOVERLAPPED overlapped ) +{ + FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + return NO_ERROR; +} + +/*********************************************************************** + * HttpQueryServiceConfiguration (HTTPAPI.@) + * + * Retrieves configuration records from HTTP Server API configuration store + * + * PARAMS + * handle [ I] reserved, must be 0 + * type [ I] configuration records type + * query [ I] buffer which contains query data used to retrieve records + * query_len [ I] length of query buffer + * buffer [IO] buffer to store query results + * buffer_len [ I] length of output buffer + * data_len [ O] optional pointer to a buffer which receives query result length + * overlapped [ I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, + PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, + PULONG data_len, LPOVERLAPPED overlapped ) +{ + FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, + buffer, buffer_len, data_len, overlapped ); + return ERROR_FILE_NOT_FOUND; +} + +/*********************************************************************** + * HttpSetServiceConfiguration (HTTPAPI.@) + * + * Add configuration record to HTTP Server API configuration store + * + * PARAMS + * handle [I] reserved, must be 0 + * type [I] configuration record type + * config [I] buffer which contains configuration record information + * length [I] length of configuration record buffer + * overlapped [I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, + PVOID config, ULONG length, LPOVERLAPPED overlapped ) +{ + FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + return NO_ERROR; +} Propchange: trunk/reactos/dll/win32/httpapi/httpapi_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/initpki/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/initpki/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/initpki/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/initpki/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/initpki/initpki.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/initpki.… ============================================================================== --- trunk/reactos/dll/win32/initpki/initpki.rbuild (added) +++ trunk/reactos/dll/win32/initpki/initpki.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,11 @@ +<module name="initpki" type="win32dll" baseaddress="${BASEADDRESS_INITPKI}" installbase="system32" installname="initpki.dll" allowwarnings="true"> +  + <importlibrary definition="initpki.spec" /> + <include base="initpki">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/initpki/initpki.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/initpki/initpki.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/initpki.… ============================================================================== --- trunk/reactos/dll/win32/initpki/initpki.spec (added) +++ trunk/reactos/dll/win32/initpki/initpki.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,4 @@ +@ stub DllInstall +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub InitializePKI Propchange: trunk/reactos/dll/win32/initpki/initpki.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/initpki/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/initpki/main.c (added) +++ trunk/reactos/dll/win32/initpki/main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,46 @@ +/* + * Copyright 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(initpki); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/initpki/main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/itircl/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/itircl/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/itircl/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/itircl/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/itircl/itircl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl.rb… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl.rbuild (added) +++ trunk/reactos/dll/win32/itircl/itircl.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,11 @@ +<module name="itircl" type="win32dll" baseaddress="${BASEADDRESS_ITIRCL}" installbase="system32" installname="itircl.dll" allowwarnings="true"> +  + <importlibrary definition="itircl.spec" /> + <include base="itircl">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>itircl_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/itircl/itircl.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/itircl/itircl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl.sp… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl.spec (added) +++ trunk/reactos/dll/win32/itircl/itircl.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/win32/itircl/itircl.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/itircl/itircl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl_ma… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl_main.c (added) +++ trunk/reactos/dll/win32/itircl/itircl_main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,76 @@ +/* + * itircl main + * + * Copyright 2008 James Hawkins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(itircl); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllRegisterServer (ITIRCL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllUnregisterServer (ITIRCL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllCanUnloadNow (ITIRCL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("stub\n"); + return S_FALSE; +} Propchange: trunk/reactos/dll/win32/itircl/itircl_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msisys.ocx/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msisys.ocx/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msisys.ocx/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msisys.ocx/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msisys.ocx/msisys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/msisy… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/msisys.c (added) +++ trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,121 @@ +/* + * Stub implementation of MSISYS.OCX to prevent MSINFO32.EXE from crashing. + * + * Copyright 2002 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winerror.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msisys); + + +/*********************************************************************** + * MSISYS_InitProcess (internal) + */ +static BOOL MSISYS_InitProcess( void ) +{ + TRACE("()\n"); + + return TRUE; +} + +/*********************************************************************** + * MSISYS_UninitProcess (internal) + */ +static void MSISYS_UninitProcess( void ) +{ + TRACE("()\n"); +} + +/*********************************************************************** + * DllMain for MSISYS + */ +BOOL WINAPI DllMain( + HINSTANCE hInstDLL, + DWORD fdwReason, + LPVOID lpvReserved ) +{ + TRACE("(%p,%d,%p)\n",hInstDLL,fdwReason,lpvReserved); + + switch ( fdwReason ) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + if ( !MSISYS_InitProcess() ) + return FALSE; + break; + case DLL_PROCESS_DETACH: + MSISYS_UninitProcess(); + break; + } + + return TRUE; +} + + +/*********************************************************************** + * DllCanUnloadNow (MSISYS.@) + * + * RETURNS + * Success: S_OK + * Failure: S_FALSE + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_OK; +} + +/*********************************************************************** + * DllGetClassObject (MSISYS.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) +{ + FIXME("\n"); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (MSISYS.@) + */ + +HRESULT WINAPI DllRegisterServer( void ) +{ + FIXME( "(): stub\n" ); + return E_FAIL; +} + +/*********************************************************************** + * DllUnregisterServer (MSISYS.@) + */ + +HRESULT WINAPI DllUnregisterServer( void ) +{ + FIXME( "(): stub\n" ); + return E_FAIL; +} Propchange: trunk/reactos/dll/win32/msisys.ocx/msisys.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/msisy… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild (added) +++ trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,12 @@ +<module name="msisys" type="win32ocx" installbase="system32" installname="msisys.ocx" allowwarnings="true"> +  + <importlibrary definition="msisys.ocx.spec" /> + <include base="msisys">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>msisys.c</file> + <library>wine</library> + <library>uuid</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/msisy… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.spec (added) +++ trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/win32/msisys.ocx/msisys.ocx.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/msnet32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msnet32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msnet32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msnet32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/msnet32/msnet32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msnet32/msnet32.… ============================================================================== --- trunk/reactos/dll/win32/msnet32/msnet32.rbuild (added) +++ trunk/reactos/dll/win32/msnet32/msnet32.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,10 @@ +<module name="msnet32" type="win32dll" installbase="system32" installname="msnet32.dll" allowwarnings="true"> + <importlibrary definition="msnet32.spec" /> + <include base="msnet32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>msnet_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/msnet32/msnet32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msnet32/msnet32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msnet32/msnet32.… ============================================================================== --- trunk/reactos/dll/win32/msnet32/msnet32.spec (added) +++ trunk/reactos/dll/win32/msnet32/msnet32.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,96 @@ + 1 stub @ + 2 stub @ + 3 stub @ + 4 stub @ + 5 stub @ + 6 stub @ + 7 stub @ + 8 stub @ + 9 stub @ + 10 stub @ + 11 stub @ + 12 stub @ + 13 stub @ + 14 stub @ + 15 stub @ + 16 stub @ + 17 stub @ + 18 stub @ + 19 stub @ + 20 stub @ + 21 stub @ + 22 stub @ + 23 stub @ + 24 stub @ + 25 stub @ + 26 stub @ + 27 stub @ + 28 stub @ + 29 stub @ + 30 stub @ + 31 stub @ + 32 stub @ + 33 stub @ + 34 stub @ + 35 stub @ + 36 stub @ + 37 stub @ + 38 stub @ + 39 stub @ + 40 stub @ + 41 stub @ + 42 stub @ + 43 stub @ + 44 stub @ + 45 stub @ + 46 stub @ + 47 stub @ + 48 stub @ + 49 stub @ + 50 stub @ + 51 stub @ + 52 stub @ + 53 stub @ + 54 stub @ + 55 stub @ + 56 stub @ + 57 stdcall @(long long ptr long ptr) MSNET32_57 + 58 stub @ + 59 stub @ + 60 stub @ + 61 stub @ + 62 stub @ + 63 stub @ + 64 stub @ + 65 stub @ + 66 stub @ + 67 stub @ + 68 stub @ + 69 stub @ + 70 stub @ + 71 stub @ + 72 stub @ + 73 stub @ + 74 stub @ + 75 stub @ + 76 stub @ + 77 stub @ + 78 stub @ + 79 stub @ + 80 stub @ + 81 stub @ + 82 stub @ + 83 stub @ + 84 stub @ + 85 stub @ + 86 stub @ + 87 stub @ + 88 stub @ + 89 stub @ + 90 stub @ + 91 stub @ + 92 stub @ + 93 stub @ + 94 stub @ + 95 stub @ + 96 stub @ Propchange: trunk/reactos/dll/win32/msnet32/msnet32.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/msnet32/msnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msnet32/msnet_ma… ============================================================================== --- trunk/reactos/dll/win32/msnet32/msnet_main.c (added) +++ trunk/reactos/dll/win32/msnet32/msnet_main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,51 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msnet); + + +/*********************************************************************** + * DllMain (MSNET32.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + +/*********************************************************************** + * @ (MSNET32.57) + */ +LONG WINAPI MSNET32_57( LONG a1, LONG a2, LPVOID a3, LONG a4, LPVOID a5 ) +{ + FIXME("(0x%04x 0x%04x %p 0x%04x %p): stub\n", a1, a2, a3, a4, a5); + return -1; /* FAILURE */ +} Propchange: trunk/reactos/dll/win32/msnet32/msnet_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/pidgen/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/pidgen/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/pidgen/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/pidgen/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/pidgen/bink.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/bink.bin?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/pidgen/bink.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/pidgen/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/pidgen/main.c (added) +++ trunk/reactos/dll/win32/pidgen/main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,45 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(pidgen); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/pidgen/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pidgen/pidgen.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/pidgen.rb… ============================================================================== --- trunk/reactos/dll/win32/pidgen/pidgen.rbuild (added) +++ trunk/reactos/dll/win32/pidgen/pidgen.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,11 @@ +<module name="pidgen" type="win32dll" baseaddress="${BASEADDRESS_PIDGEN}" installbase="system32" installname="pidgen.dll" allowwarnings="true"> + <importlibrary definition="pidgen.spec" /> + <include base="pidgen">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <file>rsrc.rc</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/pidgen/pidgen.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pidgen/pidgen.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/pidgen.sp… ============================================================================== --- trunk/reactos/dll/win32/pidgen/pidgen.spec (added) +++ trunk/reactos/dll/win32/pidgen/pidgen.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,7 @@ +@ stub PIDGenA +@ stub PIDGenW +@ stub PIDGenSimpA +@ stub PIDGenSimpW +@ stub SetupPIDGenA +@ stub SetupPIDGenW +@ stub VerifyPIDSequenceW Propchange: trunk/reactos/dll/win32/pidgen/pidgen.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pidgen/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/pidgen/rsrc.rc (added) +++ trunk/reactos/dll/win32/pidgen/rsrc.rc [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,21 @@ +/* + * Copyright 2008 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: bink.bin */ +1 BINK "bink.bin" +2 BINK "bink.bin" Propchange: trunk/reactos/dll/win32/pidgen/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/resutils/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/resutils/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/resutils/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/resutils/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/resutils/resutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/resutils/resutil… ============================================================================== --- trunk/reactos/dll/win32/resutils/resutils.c (added) +++ trunk/reactos/dll/win32/resutils/resutils.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,48 @@ +/* + * resutils main + * + * Copyright 2006 Benjamin Arai (Google) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(resutils); + +/*********************************************************************** + * DllMain (RESUTILS.@) + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/resutils/resutils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/resutils/resutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/resutils/resutil… ============================================================================== --- trunk/reactos/dll/win32/resutils/resutils.rbuild (added) +++ trunk/reactos/dll/win32/resutils/resutils.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,10 @@ +<module name="resutils" type="win32dll" baseaddress="${BASEADDRESS_RESUTILS}" installbase="system32" installname="resutils.dll" allowwarnings="true"> + <importlibrary definition="resutils.spec" /> + <include base="resutils">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>resutils.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/resutils/resutils.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/resutils/resutils.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/resutils/resutil… ============================================================================== --- trunk/reactos/dll/win32/resutils/resutils.spec (added) +++ trunk/reactos/dll/win32/resutils/resutils.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,71 @@ +@ stub ClusWorkerCheckTerminate +@ stub ClusWorkerCreate +@ stub ClusWorkerStart +@ stub ClusWorkerTerminate +@ stub ResUtilAddUnknownProperties +@ stub ResUtilCreateDirectoryTree +@ stub ResUtilDupParameterBlock +@ stub ResUtilDupString +@ stub ResUtilEnumPrivateProperties +@ stub ResUtilEnumProperties +@ stub ResUtilEnumResources +@ stub ResUtilEnumResourcesEx +@ stub ResUtilExpandEnvironmentStrings +@ stub ResUtilFindBinaryProperty +@ stub ResUtilFindDependentDiskResourceDriveLetter +@ stub ResUtilFindDwordProperty +@ stub ResUtilFindExpandSzProperty +@ stub ResUtilFindExpandedSzProperty +@ stub ResUtilFindLongProperty +@ stub ResUtilFindMultiSzProperty +@ stub ResUtilFindSzProperty +@ stub ResUtilFreeEnvironment +@ stub ResUtilFreeParameterBlock +@ stub ResUtilGetAllProperties +@ stub ResUtilGetBinaryProperty +@ stub ResUtilGetBinaryValue +@ stub ResUtilGetCoreClusterResources +@ stub ResUtilGetDwordProperty +@ stub ResUtilGetDwordValue +@ stub ResUtilGetEnvironmentWithNetName +@ stub ResUtilGetMultiSzProperty +@ stub ResUtilGetPrivateProperties +@ stub ResUtilGetProperties +@ stub ResUtilGetPropertiesToParameterBlock +@ stub ResUtilGetProperty +@ stub ResUtilGetPropertyFormats +@ stub ResUtilGetPropertySize +@ stub ResUtilGetResourceDependency +@ stub ResUtilGetResourceDependencyByClass +@ stub ResUtilGetResourceDependencyByName +@ stub ResUtilGetResourceDependentIPAddressProps +@ stub ResUtilGetResourceName +@ stub ResUtilGetResourceNameDependency +@ stub ResUtilGetSzProperty +@ stub ResUtilGetSzValue +@ stub ResUtilIsPathValid +@ stub ResUtilIsResourceClassEqual +@ stub ResUtilPropertyListFromParameterBlock +@ stub ResUtilResourceTypesEqual +@ stub ResUtilResourcesEqual +@ stub ResUtilSetBinaryValue +@ stub ResUtilSetDwordValue +@ stub ResUtilSetExpandSzValue +@ stub ResUtilSetMultiSzValue +@ stub ResUtilSetPrivatePropertyList +@ stub ResUtilSetPropertyParameterBlock +@ stub ResUtilSetPropertyParameterBlockEx +@ stub ResUtilSetPropertyTable +@ stub ResUtilSetPropertyTableEx +@ stub ResUtilSetResourceServiceEnvironment +@ stub ResUtilSetResourceServiceStartParameters +@ stub ResUtilSetSzValue +@ stub ResUtilSetUnknownProperties +@ stub ResUtilStartResourceService +@ stub ResUtilStopResourceService +@ stub ResUtilStopService +@ stub ResUtilTerminateServiceProcessFromResDll +@ stub ResUtilVerifyPrivatePropertyList +@ stub ResUtilVerifyPropertyTable +@ stub ResUtilVerifyResourceService +@ stub ResUtilVerifyService Propchange: trunk/reactos/dll/win32/resutils/resutils.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/sccbase/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/sccbase/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/sccbase/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/sccbase/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/sccbase/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/sccbase/main.c (added) +++ trunk/reactos/dll/win32/sccbase/main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,46 @@ +/* + * Copyright 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sccbase); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/sccbase/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sccbase/sccbase.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/sccbase.… ============================================================================== --- trunk/reactos/dll/win32/sccbase/sccbase.rbuild (added) +++ trunk/reactos/dll/win32/sccbase/sccbase.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,11 @@ +<module name="sccbase" type="win32dll" installbase="system32" installname="sccbase.dll" allowwarnings="true"> +  + <importlibrary definition="sccbase.spec" /> + <include base="sccbase">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/sccbase/sccbase.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/sccbase/sccbase.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/sccbase.… ============================================================================== --- trunk/reactos/dll/win32/sccbase/sccbase.spec (added) +++ trunk/reactos/dll/win32/sccbase/sccbase.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,26 @@ +@ stub CPAcquireContext +@ stub CPAcquireContextW +@ stub CPCreateHash +@ stub CPDecrypt +@ stub CPDeriveKey +@ stub CPDestroyHash +@ stub CPDestroyKey +@ stub CPEncrypt +@ stub CPExportKey +@ stub CPGenKey +@ stub CPGenRandom +@ stub CPGetHashParam +@ stub CPGetKeyParam +@ stub CPGetProvParam +@ stub CPGetUserKey +@ stub CPHashData +@ stub CPHashSessionKey +@ stub CPImportKey +@ stub CPReleaseContext +@ stub CPSetHashParam +@ stub CPSetKeyParam +@ stub CPSetProvParam +@ stub CPSignHash +@ stub CPVerifySignature +@ stub DllRegisterServer +@ stub DllUnregisterServer Propchange: trunk/reactos/dll/win32/sccbase/sccbase.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/slbcsp/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/slbcsp/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/slbcsp/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/slbcsp/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/slbcsp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/main.c (added) +++ trunk/reactos/dll/win32/slbcsp/main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,46 @@ +/* + * Copyright 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(slbcsp); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/slbcsp/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/slbcsp/slbcsp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/slbcsp.rb… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/slbcsp.rbuild (added) +++ trunk/reactos/dll/win32/slbcsp/slbcsp.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,11 @@ +<module name="slbcsp" type="win32dll" installbase="system32" installname="slbcsp.dll" allowwarnings="true"> +  + <importlibrary definition="slbcsp.spec" /> + <include base="slbcsp">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/slbcsp/slbcsp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/slbcsp/slbcsp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/slbcsp.sp… ============================================================================== --- trunk/reactos/dll/win32/slbcsp/slbcsp.spec (added) +++ trunk/reactos/dll/win32/slbcsp/slbcsp.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,27 @@ +@ stub CPAcquireContext +@ stub CPSetHashParam +@ stub CPSetKeyParam +@ stub CPSetProvParam +@ stub CPCreateHash +@ stub CPDecrypt +@ stub CPDeriveKey +@ stub CPDestroyHash +@ stub CPDestroyKey +@ stub CPDuplicateHash +@ stub CPDuplicateKey +@ stub CPEncrypt +@ stub CPExportKey +@ stub CPGenKey +@ stub CPGenRandom +@ stub CPGetHashParam +@ stub CPGetKeyParam +@ stub CPGetProvParam +@ stub CPGetUserKey +@ stub CPHashData +@ stub CPHashSessionKey +@ stub CPImportKey +@ stub CPReleaseContext +@ stub CPSignHash +@ stub CPVerifySignature +@ stub DllRegisterServer +@ stub DllUnregisterServer Propchange: trunk/reactos/dll/win32/slbcsp/slbcsp.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/softpub/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/softpub/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/softpub/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/softpub/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/softpub/softpub.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/softpub/softpub.… ============================================================================== --- trunk/reactos/dll/win32/softpub/softpub.rbuild (added) +++ trunk/reactos/dll/win32/softpub/softpub.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,10 @@ +<module name="softpub" type="win32dll" baseaddress="${BASEADDRESS_SOFTPUB}" installbase="system32" installname="softpub.dll" allowwarnings="true" entrypoint="0"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="softpub.spec" /> + <include base="softpub">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>wintrust</library> + <file>softpub.rc</file> +</module> Propchange: trunk/reactos/dll/win32/softpub/softpub.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/softpub/softpub.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/softpub/softpub.… ============================================================================== --- trunk/reactos/dll/win32/softpub/softpub.rc (added) +++ trunk/reactos/dll/win32/softpub/softpub.rc [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Softpub Forwarder DLL\0" +#define REACTOS_STR_INTERNAL_NAME "softpub\0" +#define REACTOS_STR_ORIGINAL_FILENAME "softpub.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/softpub/softpub.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/softpub/softpub.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/softpub/softpub.… ============================================================================== --- trunk/reactos/dll/win32/softpub/softpub.spec (added) +++ trunk/reactos/dll/win32/softpub/softpub.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,24 @@ +1 stdcall GenericChainCertificateTrust(ptr) wintrust.GenericChainCertificateTrust +2 stdcall GenericChainFinalProv(ptr) wintrust.GenericChainFinalProv +3 stdcall HTTPSCertificateTrust(ptr) wintrust.HTTPSCertificateTrust +4 stdcall SoftpubDefCertInit(ptr) wintrust.SoftpubDefCertInit +5 stub SoftpubFreeDefUsageCallData +6 stub SoftpubLoadDefUsageCallData +7 stub AddPersonalTrustDBPages +8 stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer +9 stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer +10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy +11 stdcall DriverFinalPolicy(ptr) wintrust.DriverFinalPolicy +12 stdcall DriverInitializePolicy(ptr) wintrust.DriverInitializePolicy +13 stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) wintrust.FindCertsByIssuer +14 stdcall HTTPSFinalProv(ptr) wintrust.HTTPSFinalProv +15 stdcall OfficeCleanupPolicy(ptr) wintrust.OfficeCleanupPolicy +16 stdcall OfficeInitializePolicy(ptr) wintrust.OfficeInitializePolicy +17 stdcall OpenPersonalTrustDBDialog(long) wintrust.OpenPersonalTrustDBDialog +18 stdcall SoftpubAuthenticode(ptr) wintrust.SoftpubAuthenticode +19 stdcall SoftpubCheckCert(ptr long long long) wintrust.SoftpubCheckCert +20 stdcall SoftpubCleanup(ptr) wintrust.SoftpubCleanup +21 stdcall SoftpubDumpStructure(ptr) wintrust.SoftpubDumpStructure +22 stdcall SoftpubInitialize(ptr) wintrust.SoftpubInitialize +23 stdcall SoftpubLoadMessage(ptr) wintrust.SoftpubLoadMessage +24 stdcall SoftpubLoadSignature(ptr) wintrust.SoftpubLoadSignature Propchange: trunk/reactos/dll/win32/softpub/softpub.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/traffic/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 15 18:20:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/traffic/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/traffic/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/traffic/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/traffic/traffic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/traffic/traffic.… ============================================================================== --- trunk/reactos/dll/win32/traffic/traffic.rbuild (added) +++ trunk/reactos/dll/win32/traffic/traffic.rbuild [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,10 @@ +<module name="traffic" type="win32dll" baseaddress="${BASEADDRESS_TRAFFIC}" installbase="system32" installname="traffic.dll" allowwarnings="true"> + <importlibrary definition="traffic.spec" /> + <include base="traffic">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>traffic_main.c</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> Propchange: trunk/reactos/dll/win32/traffic/traffic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/traffic/traffic.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/traffic/traffic.… ============================================================================== --- trunk/reactos/dll/win32/traffic/traffic.spec (added) +++ trunk/reactos/dll/win32/traffic/traffic.spec [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,21 @@ +@ stub TcAddClassMap +@ stub TcAddFilter +@ stub TcAddFlow +@ stub TcCloseInterface +@ stub TcDeleteFilter +@ stub TcDeleteFlow +@ stub TcDeregisterClient +@ stub TcEnumerateFlows +@ stub TcEnumerateInterfaces +@ stub TcGetFlowNameA +@ stub TcGetFlowNameW +@ stub TcModifyFlow +@ stub TcOpenInterfaceA +@ stub TcOpenInterfaceW +@ stub TcQueryFlowA +@ stub TcQueryFlowW +@ stub TcQueryInterface +@ stub TcRegisterClient +@ stub TcSetFlowA +@ stub TcSetFlowW +@ stub TcSetInterface Propchange: trunk/reactos/dll/win32/traffic/traffic.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/traffic/traffic_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/traffic/traffic_… ============================================================================== --- trunk/reactos/dll/win32/traffic/traffic_main.c (added) +++ trunk/reactos/dll/win32/traffic/traffic_main.c [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,44 @@ +/* + * QoS traffic control implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(traffic); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/traffic/traffic_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/http.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/http.h?rev=40… ============================================================================== --- trunk/reactos/include/psdk/http.h (added) +++ trunk/reactos/include/psdk/http.h [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -1,0 +1,64 @@ +/* + * HTTP Server API definitions + * + * Copyright (C) 2009 Andrey Turkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_HTTP_H +#define __WINE_HTTP_H + +#include <winsock2.h> +#include <ws2tcpip.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _HTTPAPI_VERSION +{ + USHORT HttpApiMajorVersion; + USHORT HttpApiMinorVersion; +} HTTPAPI_VERSION, *PHTTPAPI_VERSION; + +#define HTTPAPI_VERSION_1 {1,0} +#define HTTPAPI_VERSION_2 {2,0} + +/* HttpInitialize and HttpTerminate flags */ +#define HTTP_INITIALIZE_SERVER 0x00000001 +#define HTTP_INITIALIZE_CONFIG 0x00000002 + +typedef enum _HTTP_SERVICE_CONFIG_ID +{ + HttpServiceConfigIPListenList, + HttpServiceConfigSSLCertInfo, + HttpServiceConfigUrlAclInfo, + HttpServiceConfigTimeout, + HttpServiceConfigMax +} HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; + +ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); +ULONG WINAPI HttpTerminate(ULONG,PVOID); + +ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); +ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); +ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_HTTP_H */ Propchange: trunk/reactos/include/psdk/http.h ------------------------------------------------------------------------------ svn:eol-style = native 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 15 18:20:51 2009 @@ -55,6 +55,7 @@ reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync +reactos/dll/win32/httpapi # Autosync reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Autosync @@ -62,8 +63,10 @@ reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync +reactos/dll/win32/initpki # Autosync reactos/dll/win32/inseng # Autosync reactos/dll/win32/iphlpapi # Out of sync +reactos/dll/win32/itircl # Autosync reactos/dll/win32/itss # Autosync reactos/dll/win32/jscript # Autosync reactos/dll/win32/localspl # Autosync @@ -90,6 +93,8 @@ reactos/dll/win32/msi # Autosync reactos/dll/win32/msimtf # Autosync reactos/dll/win32/msisip # Autosync +reactos/dll/win32/msisys.ocx # Autosync +reactos/dll/win32/msnet32 # Autosync reactos/dll/win32/msrle32 # Autosync reactos/dll/win32/mssign32 # Autosync reactos/dll/win32/mssip32 # Autosync @@ -114,16 +119,19 @@ reactos/dll/win32/olesvr32 # Autosync reactos/dll/win32/olethk32 # Autosync reactos/dll/win32/pdh # Autosync +reactos/dll/win32/pidgen # Autosync reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Autosync reactos/dll/win32/pstorec # Autosync reactos/dll/win32/query # Autosync reactos/dll/win32/rasapi32 # Autosync +reactos/dll/win32/resutils # Autosync reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_55 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync +reactos/dll/win32/sccbase # Autosync reactos/dll/win32/schannel # Autosync reactos/dll/win32/sensapi # Autosync reactos/dll/win32/setupapi # Forked at Wine-20050524 @@ -131,11 +139,14 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync +reactos/dll/win32/slbcsp # Autosync +reactos/dll/win32/softpub # Autosync reactos/dll/win32/spoolss # Autosync reactos/dll/win32/stdole2.tlb # Autosync reactos/dll/win32/sti # Autosync reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync +reactos/dll/win32/traffic # Autosync reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/updspapi # Autosync reactos/dll/win32/url # Autosync

1 0

[dgorbachev] 40035: Update Spanish translations. Javier Remacha, bug #4278. (2/2)
by dgorbachev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dgorbachev Date: Sun Mar 15 17:13:46 2009 New Revision: 40035 URL: http://svn.reactos.org/svn/reactos?rev=40035&view=rev Log: Update Spanish translations. Javier Remacha, bug #4278. (2/2) Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:46 2009 @@ -55,16 +55,16 @@ CHECKBOX "&Intercambiar botones primario y secundario", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 152, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Activar esta casilla de verificación para asignar al botón de la derecha del ratón las funciones principales, tales como seleccionar y arrastrar", -1, 10, 30, 150, 30 - GROUPBOX "Velocidad de doble clic ", -1, 5, 75, 230, 70 - LTEXT "Haga Doble clic en la carpeta para probar su configuración. Si la carpeta no se abre o cierra, intente utilizar una configuración más lenta.", -1, 10, 85, 150, 30 - LTEXT "&Velocidad: Lenta", -1, 10, 120, 91, 8 - LTEXT "Rápida", -1, 137, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "Velocidad de doble clic ", -1, 5, 77, 230, 70 + LTEXT "Haga Doble clic en la carpeta para probar su configuración. Si la carpeta no se abre o cierra, intente utilizar una configuración más lenta.", -1, 10, 87, 150, 30 + LTEXT "&Velocidad: Lenta", -1, 10, 127, 91, 8 + LTEXT "Rápida", -1, 137, 127, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 127, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 86, 65, 57, WS_EX_STATICEDGE GROUPBOX "Bloqueo de clic ", -1, 5, 150, 230, 70 CHECKBOX "Ac&tivar bloqueo de clic", IDC_CHECK_CLICK_LOCK, 10, 160, 90, 20 PUSHBUTTON "C&onfiguración...", IDC_BUTTON_CLICK_LOCK, 170, 160, 55, 14 - LTEXT "Le permite resaltar o arrastrar sin tener que mantener apretado el botón del ratón. Para activarlo, presione brevemente el botón del mouse. Para soltarlo, vuelva a hacer clic en el botón del ratón", -1, 10, 180, 190, 30 + LTEXT "Le permite resaltar o arrastrar sin tener que mantener apretado el botón del ratón. Para activarlo, presione brevemente el botón del mouse. Para soltarlo, vuelva a hacer clic en el botón del ratón", -1, 10, 180, 200, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -73,9 +73,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Esquema ", -1, 5, 5, 170, 45 - COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Guardar como...", IDC_BUTTON_SAVEAS_SCHEME, 65, 30, 55, 15 - PUSHBUTTON "&Eliminar", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 160, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Guardar como...", IDC_BUTTON_SAVEAS_SCHEME, 55, 30, 60, 15 + PUSHBUTTON "&Eliminar", IDC_BUTTON_DELETE_SCHEME, 127, 30, 42, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Personali&zar", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY @@ -109,7 +109,7 @@ ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 CHECKBOX "&Habilitar precisión del puntero", IDC_CHECK_POINTER_PRECISION, 60, 50, 120, 10 GROUPBOX "Ajustar a ", -1, 5, 65, 230, 40 - CHECKBOX "Mover A&utomaticamente el puntero al botón predeterminado en un cuadro de diálogo", + CHECKBOX "Mover a&utomáticamente el puntero al botón predeterminado en un cuadro de diálogo", IDC_CHECK_SNAP_TO, 60, 75, 170, 20, BS_MULTILINE | BS_TOP ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 75, 15, 15 GROUPBOX "Visibilidad ", -1, 5, 105, 230, 95 Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:46 2009 @@ -35,17 +35,17 @@ GROUPBOX "Administrador de dispositivos ", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON LTEXT "El Administrador de dispositivos muestra una lista de todos los dispositivos de hardware instalados en su equipo. Puede usarlo para cambiar las propiedades de cualquier dispositivo.", IDC_STATIC, 42, 18, 204, 24 - PUSHBUTTON "&Administrador de dispositivos...", IDC_HARDWARE_DEVICE_MANAGER, 140, 48, 104, 15 + PUSHBUTTON "&Administrador de dispositivos...", IDC_HARDWARE_DEVICE_MANAGER, 138, 48, 106, 15 GROUPBOX "Asistente de Hardware ", IDC_STATIC, 6, 79, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON LTEXT "El asistente de hardware the ayuda instalar, desinstalar, reparar, desconectar, expulsar, y configurar tu hardware.", IDC_STATIC, 42, 90, 204, 24 - PUSHBUTTON "&Asistente de Hardware...", IDC_HARDWARE_WIZARD, 140, 120, 104, 15 + PUSHBUTTON "&Asistente de Hardware...", IDC_HARDWARE_WIZARD, 138, 120, 106, 15 GROUPBOX "Perfiles de Hardware ", IDC_STATIC, 6, 149, 244, 61 ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON LTEXT "Los perfiles de hardware le ofrecen una forma de definir y almacenar diferentes configuraciones de hardware.", IDC_STATIC, 42, 160, 204, 24 - PUSHBUTTON "Perfiles Hard&ware...", IDC_HARDWARE_PROFILE, 140, 190, 104, 15 + PUSHBUTTON "Perfiles Hard&ware...", IDC_HARDWARE_PROFILE, 138, 190, 106, 15 END @@ -57,7 +57,7 @@ LTEXT "Debe iniciar la sesión como un Administrador para hacer la mayoría de los cambios.", IDC_STATIC, 12, 5, 236, 17 GROUPBOX "Rendimiento ", IDC_STATIC, 6, 27, 244, 50 LTEXT "Efectos visuales, programación del precesador, uso de memoria y memoria virtual.", IDC_STATIC, 16, 38, 210, 17 - PUSHBUTTON "Configuración", IDC_PERFOR, 194, 47, 50, 15 + PUSHBUTTON "Configuración", IDC_PERFOR, 194, 57, 50, 15 GROUPBOX "Perfiles de usuario ", IDC_STATIC, 6,84,244,48 LTEXT "Configuración del escritorio relacionada con su inicio de sesión", IDC_STATIC, 16, 97, 210, 20 Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:46 2009 @@ -15,7 +15,7 @@ CONTROL "Instalar controlador automáticamente",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Instalar controlador desde una ubicación específica",IDC_RADIO_MANUAL, - "Button",BS_AUTORADIOBUTTON,120,133,164,14 + "Button",BS_AUTORADIOBUTTON,120,133,178,14 END IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:46 2009 @@ -360,7 +360,7 @@ AUTOCHECKBOX "&Mostrar cuadro de diálogo para confirmar la eliminación", 14004, 20, 155, 200, 10, WS_TABSTOP END -OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 +OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 284, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Abrir con" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -368,67 +368,67 @@ ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 LTEXT "Elija el programa que desea usar para abrir el siguiente archivo:", -1, 44, 12, 211, 10 LTEXT "Archivo: ", 14001, 44, 25, 188, 10 - GROUPBOX "&Programas ", -1, 7, 42, 249, 187 - LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - AUTOCHECKBOX "Utilizar &siempre el programa seleccionado para abrir este tipo de archivos", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Examinar...", 14004, 198, 207, 50, 14 - PUSHBUTTON "Aceptar", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancelar", 14006, 206, 236, 50, 14 -END - -FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 + GROUPBOX "&Programas ", -1, 7, 42, 269, 187 + LISTBOX 14002, 16 ,57, 250, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE + AUTOCHECKBOX "Utilizar &siempre el programa seleccionado para abrir este tipo de archivos", 14003, 15, 193, 250, 10 + PUSHBUTTON "&Examinar...", 14004, 218, 207, 50, 14 + PUSHBUTTON "Aceptar", 14005, 170, 236, 50, 14 + PUSHBUTTON "Cancelar", 14006, 226, 236, 50, 14 +END + +FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 294, 240 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Tareas", -1, 7, 10, 249, 45 + GROUPBOX "Tareas", -1, 7, 10, 279, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "M&ostrar tareas comunes en las carpetas", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Utilizar las carpetas clá&sicas de ReactOS", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP - GROUPBOX "Examinar carpetas ", -1, 7, 60, 249, 45, WS_TABSTOP + AUTORADIOBUTTON "M&ostrar tareas comunes en las carpetas", 14001, 40, 25, 160, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Utilizar las carpetas clá&sicas de ReactOS", 14002, 40, 37, 160, 10, WS_TABSTOP | WS_GROUP + GROUPBOX "Examinar carpetas ", -1, 7, 60, 279, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Abrir todas las carpetas en la &misma ventana", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Abrir cada carpeta ventanas di&ferentes", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP - GROUPBOX "Hacer clic en los elementos como se indica ", -1, 7, 110, 249, 60 + AUTORADIOBUTTON "Abrir todas las carpetas en la &misma ventana", 14004, 40, 75, 160, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Abrir cada carpeta ventanas di&ferentes", 14005, 40, 87, 140, 10, WS_TABSTOP | WS_GROUP + GROUPBOX "Hacer clic en los elementos como se indica ", -1, 7, 110, 279, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Restaurar valores predeterminados", 14011, 180, 180, 60, 14, WS_TABSTOP -END - -FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 + AUTORADIOBUTTON "&Un solo clic para abrir elemento (seleccionar al señalar)", 14007, 40, 120, 190, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Subrayar los títulos de iconos que coincidan con el e&xplorador", 14008, 50, 132, 220, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Subrayar &los títulos de iconos cuando yo los señale", 14009, 50, 144, 190, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "&Doble clic para abrir elemento (seleccionar con un clic)", 14010, 40, 156, 190, 10, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&Restaurar valores predeterminados", 14011, 146, 180, 140, 14, WS_TABSTOP +END + +FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 294, 240 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Ver" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -GROUPBOX "Vistas de carpeta", -1, 7, 10, 249, 60 +GROUPBOX "Vistas de carpeta", -1, 7, 10, 279, 60 //ICON -LTEXT "Puede aplicar la vista que está usando con esta carpeta para\nel resto (como Detalles o Mosaicos).", -1, 60, 20, 180, 20 -PUSHBUTTON "A&plicar a todas las carpetas", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "R&estaurar todas las carpetas", 14002, 150, 50, 80, 14, WS_TABSTOP +LTEXT "Puede aplicar la vista que está usando con esta carpeta para el resto (como Detalles o Mosaicos).", -1, 60, 20, 200, 20 +PUSHBUTTON "A&plicar a todas las carpetas", 14001, 60, 50, 100, 14, WS_TABSTOP +PUSHBUTTON "R&estaurar todas las carpetas", 14002, 165, 50, 100, 14, WS_TABSTOP LTEXT "Configuración avanzada:", -1, 7, 80, 100, 10 -CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "&Restaurar valores predeterminados", 14004, 180, 210, 80, 14, WS_TABSTOP -END - -FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 +CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 279, 120 +PUSHBUTTON "&Restaurar valores predeterminados", 14004, 156, 220, 130, 14, WS_TABSTOP +END + +FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 294, 240 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Tipos de Archivo" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -LTEXT "&Tipos de archivo registrados:", -1, 7, 10, 70, 10 -CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&Nueva", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "Eli&minar", 14002, 180, 110, 50, 14, WS_TABSTOP -GROUPBOX "Detalles para extensión '%s'", 14003, 7, 130, 249, 70 -LTEXT "Se abre con:", -1, 12, 140, 40, 10 +LTEXT "&Tipos de archivo registrados:", -1, 7, 10, 120, 10 +CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 +PUSHBUTTON "&Nueva", 14001, 170, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "Eli&minar", 14002, 230, 110, 50, 14, WS_TABSTOP +GROUPBOX "Detalles para el tipo de archivo '%s'", 14003, 7, 130, 279, 100 +LTEXT "Se abre con:", -1, 12, 140, 50, 10 //ICON LTEXT "Aplicación", 14005, 100, 140, 40, 10 -PUSHBUTTON "Cam&biar...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Archivos con extensión '%s' son del tipo '%s'. Para\ncambiar la configuración de los archivos '%s', haga clic\nen Avanzadas.", 14007, 12, 155, 160, 30 -PUSHBUTTON "A&vanzadas", 14008, 180, 175, 50, 14, WS_TABSTOP +PUSHBUTTON "Cam&biar...", 14006, 230, 140, 50, 14, WS_TABSTOP +LTEXT "Archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas.", 14007, 12, 165, 220, 30 +PUSHBUTTON "Opciones avanza&das", 14008, 190, 213, 90, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:46 2009 @@ -216,13 +216,13 @@ IDS_CMT_DEVMGMT "Ejecutar Administrador de dispositivos" IDS_CMT_SERVMAN "Ejecutar Administrador de servicios" IDS_CMT_RDESKTOP "Ejecutar Escritorio remoto" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Juegos" + IDS_CMT_EVENTVIEW "Ejecutar Visor de sucesos" + IDS_CMT_MSCONFIG "Ejecutar Utilidad de configuración del sistema" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Juegos" IDS_CMT_SOLITAIRE "Solitario" IDS_CMT_WINEMINE "Buscaminas" END @@ -244,21 +244,21 @@ STRINGTABLE BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "Instalación de ReactOS" + IDS_SYS_ENTERTAINMENT "Entretenimiento" + IDS_CMT_MPLAY32 "Ejecutar Reproductor multimedia" + IDS_CMT_SNDVOL32 "Ejecutar Control de volumen" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "Instalación de ReactOS" IDS_UNKNOWN_ERROR "Error desconocido" IDS_REGISTERING_COMPONENTS "Registrando componentes..." - IDS_LOADLIBRARY_FAILED "LoadLibrary falló: " - IDS_GETPROCADDR_FAILED "GetProcAddr falló: " + IDS_LOADLIBRARY_FAILED "LoadLibrary falló: " + IDS_GETPROCADDR_FAILED "GetProcAddr falló: " IDS_REGSVR_FAILED "DllRegisterServer falló: " - IDS_DLLINSTALL_FAILED "DllInstall falló: " - IDS_TIMEOUT "Tiempo agotado durante la instalación" + IDS_DLLINSTALL_FAILED "DllInstall falló: " + IDS_TIMEOUT "Tiempo agotado durante la instalación" IDS_REASON_UNKNOWN "" END

1 0

[dgorbachev] 40034: Update Spanish translations. Javier Remacha, bug #4278. (1/2)
by dgorbachev＠svn.reactos.org 15 Mar '09

15 Mar '09

Author: dgorbachev Date: Sun Mar 15 17:13:41 2009 New Revision: 40034 URL: http://svn.reactos.org/svn/reactos?rev=40034&view=rev Log: Update Spanish translations. Javier Remacha, bug #4278. (1/2) Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/msconfig/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:41 2009 @@ -4,26 +4,26 @@ BEGIN POPUP "&Archivo" BEGIN - MENUITEM "A&brir...", IDM_OPEN_FILE + MENUITEM "&Abrir...", IDM_OPEN_FILE MENUITEM "&Cerrar", IDM_CLOSE_FILE MENUITEM SEPARATOR MENUITEM "&Salir", IDM_EXIT END - POPUP "&Help" + POPUP "Ay&uda" BEGIN - MENUITEM "Ac&erca de...", IDM_ABOUT + MENUITEM "&Acerca de...", IDM_ABOUT END END STRINGTABLE DISCARDABLE BEGIN IDS_ALL_TYPES_FILTER "Todos los ficheros soportados (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0" - IDS_TOOLTIP_PLAY "Play" - IDS_TOOLTIP_STOP "Stop" + IDS_TOOLTIP_PLAY "Reproducir" + IDS_TOOLTIP_STOP "Detener" IDS_TOOLTIP_EJECT "Expulsar" - IDS_TOOLTIP_BACKWARD "Saltar atrÃ¡s" - IDS_TOOLTIP_SEEKBACK "Retroceso rÃ¡pido" - IDS_TOOLTIP_SEEKFORW "Avance rÃ¡pido" - IDS_TOOLTIP_FORWARD "Saltar adelante" + IDS_TOOLTIP_BACKWARD "Marca anterior" + IDS_TOOLTIP_SEEKBACK "Rebobinar" + IDS_TOOLTIP_SEEKFORW "Avance rápido" + IDS_TOOLTIP_FORWARD "Marca siguiente" IDS_APPTITLE "Reproductor Multimedia de ReactOS" END Modified: trunk/reactos/base/applications/msconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:41 2009 @@ -4,7 +4,7 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Programa de configuración del Sistema" +CAPTION "Utilidad de configuración del sistema" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:41 2009 @@ -43,7 +43,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Visor de sucesos Versión 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "ReactOS Visor de sucesos Versión 1.0",IDC_STATIC,49,10,124,8,SS_NOPREFIX LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 DEFPUSHBUTTON "Aceptar",IDOK,90,48,42,16,WS_GROUP END Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Sun Mar 15 17:13:41 2009 @@ -69,18 +69,18 @@ IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Create Partition" +CAPTION "Crear Partición" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 - LTEXT "Size:",IDC_STATIC, 13,24,27,9 + CONTROL "Crear y formatear una partición",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Tamaño:",IDC_STATIC, 13,24,27,9 EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP LTEXT "GB",IDC_UNIT, 117,24,14,9 - LTEXT "Filesystem:",IDC_STATIC,13,46,35,9 + LTEXT "Sistema de archivos:",IDC_STATIC,13,46,35,9 CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 - PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP - PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Aceptar",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Cancelar",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 @@ -95,17 +95,17 @@ CONTROL "Instalar el cargador de arranque en el disco duro (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Aceptar", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancelar", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + CONTROL "Resumen de la instalación", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Presione Siguiente para comenzar con el proceso de instalación.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193

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