Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[akhaldi] 67924: [NETAPI32_WINETEST] Sync with Wine Staging 1.7.43.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 26 17:17:50 2015 New Revision: 67924 URL: http://svn.reactos.org/svn/reactos?rev=67924&view=rev Log: [NETAPI32_WINETEST] Sync with Wine Staging 1.7.43. Modified: trunk/rostests/winetests/netapi32/access.c trunk/rostests/winetests/netapi32/ds.c trunk/rostests/winetests/netapi32/wksta.c Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… ============================================================================== --- trunk/rostests/winetests/netapi32/access.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/access.c [iso-8859-1] Tue May 26 17:17:50 2015 @@ -66,7 +66,7 @@ static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; -static int init_access_tests(void) +static BOOL init_access_tests(void) { DWORD dwSize; BOOL rc; @@ -77,14 +77,14 @@ if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not available.\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(WCHAR); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static NET_API_STATUS create_test_user(void) @@ -348,6 +348,8 @@ for(i=0;i<entries_read;i++) trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); + + pNetApiBufferFree(buffer); } START_TEST(access) Modified: trunk/rostests/winetests/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/ds.c?r… ============================================================================== --- trunk/rostests/winetests/netapi32/ds.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/ds.c [iso-8859-1] Tue May 26 17:17:50 2015 @@ -76,7 +76,7 @@ START_TEST(ds) { - HMODULE hnetapi32 = LoadLibrary("netapi32.dll"); + HMODULE hnetapi32 = LoadLibraryA("netapi32.dll"); pDsRoleGetPrimaryDomainInformation=(void*)GetProcAddress(hnetapi32,"DsRoleGetPrimaryDomainInformation"); if (pDsRoleGetPrimaryDomainInformation) Modified: trunk/rostests/winetests/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/wksta.… ============================================================================== --- trunk/rostests/winetests/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/wksta.c [iso-8859-1] Tue May 26 17:17:50 2015 @@ -44,7 +44,7 @@ static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; -static int init_wksta_tests(void) +static BOOL init_wksta_tests(void) { DWORD dwSize; BOOL rc; @@ -54,14 +54,14 @@ rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(computer_name[0]); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static void run_get_comp_name_tests(void)

9 years, 3 months

[akhaldi] 67923: [MSVCRT_WINETEST] Sync with Wine Staging 1.7.43.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 26 17:15:48 2015 New Revision: 67923 URL: http://svn.reactos.org/svn/reactos?rev=67923&view=rev Log: [MSVCRT_WINETEST] Sync with Wine Staging 1.7.43. Modified: trunk/rostests/winetests/msvcrt/misc.c trunk/rostests/winetests/msvcrt/printf.c trunk/rostests/winetests/msvcrt/string.c Modified: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] Tue May 26 17:15:48 2015 @@ -23,6 +23,26 @@ #include <stdio.h> #include "msvcrt.h" +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline BOOL almost_equal(double d1, double d2) { + if(d1-d2>-1e-30 && d1-d2<1e-30) + return TRUE; + return FALSE; +} + static int (__cdecl *prand_s)(unsigned int *); static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); @@ -34,6 +54,9 @@ const wchar_t*, const wchar_t*, unsigned int, uintptr_t); static void (__cdecl *p_qsort_s)(void*, MSVCRT_size_t, MSVCRT_size_t, int (__cdecl*)(void*, const void*, const void*), void*); +static double (__cdecl *p_atan)(double); +static double (__cdecl *p_exp)(double); +static double (__cdecl *p_tanh)(double); static void init(void) { @@ -48,6 +71,9 @@ p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter"); p_qsort_s = (void *)GetProcAddress(hmod, "qsort_s"); + p_atan = (void *)GetProcAddress(hmod, "atan"); + p_exp = (void *)GetProcAddress(hmod, "exp"); + p_tanh = (void *)GetProcAddress(hmod, "tanh"); } static void test_rand_s(void) @@ -477,6 +503,42 @@ ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static void test_math_functions(void) +{ + double ret; + + errno = 0xdeadbeef; + p_atan(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_atan(INFINITY); + ok(almost_equal(ret, 1.57079632679489661923), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_atan(-INFINITY); + ok(almost_equal(ret, -1.57079632679489661923), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_tanh(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = p_tanh(INFINITY); + ok(almost_equal(ret, 1.0), "ret = %lf\n", ret); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_exp(NAN); + ok(errno == EDOM, "errno = %d\n", errno); + + errno = 0xdeadbeef; + p_exp(INFINITY); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); +} + START_TEST(misc) { int arg_c; @@ -504,4 +566,5 @@ test__popen(arg_v[0]); test__invalid_parameter(); test_qsort_s(); -} + test_math_functions(); +} Modified: trunk/rostests/winetests/msvcrt/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/printf.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/printf.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/printf.c [iso-8859-1] Tue May 26 17:15:48 2015 @@ -27,13 +27,33 @@ #include <stdio.h> #include <errno.h> -#include <math.h> #include "windef.h" #include "winbase.h" #include "winnls.h" #include "wine/test.h" + +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + +static inline float __port_ind(void) +{ + static const unsigned __ind_bytes = 0xffc00000; + return *(const float *)&__ind_bytes; +} +#define IND __port_ind() static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); @@ -82,7 +102,7 @@ { char buffer[100]; const char *format; - double pnumber=789456123, inf, nan; + double pnumber=789456123; int x, r; WCHAR wide[] = { 'w','i','d','e',0}; @@ -675,38 +695,47 @@ r = sprintf(buffer, format, 0x12345); ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); - nan = 0.0; - inf = 1.0/nan; - nan = sqrt(-1); format = "%lf"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==9, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND00"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==8, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN0"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==8, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF00"), "failed: \"%s\"\n", buffer); format = "%le"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==14, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND00e+000"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==13, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN0e+000"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==13, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF00e+000"), "failed: \"%s\"\n", buffer); format = "%lg"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==7, "r = %d\n", r); ok(!strcmp(buffer, "-1.#IND"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==7, "r = %d\n", r); + ok(!strcmp(buffer, "1.#QNAN"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==6, "r = %d\n", r); ok(!strcmp(buffer, "1.#INF"), "failed: \"%s\"\n", buffer); format = "%010.2lf"; - r = sprintf(buffer, format, nan); + r = sprintf(buffer, format, IND); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "-000001.#J"), "failed: \"%s\"\n", buffer); - r = sprintf(buffer, format, inf); + r = sprintf(buffer, format, NAN); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000001.#R"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, INFINITY); ok(r==10, "r = %d\n", r); ok(!strcmp(buffer, "0000001.#J"), "failed: \"%s\"\n", buffer); } Modified: trunk/rostests/winetests/msvcrt/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/string.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/string.c [iso-8859-1] Tue May 26 17:15:48 2015 @@ -1144,6 +1144,65 @@ _setmbcp(prev_cp); } +static void test_mbctohira(void) +{ + static const unsigned int mbchira_932[][2] = { + {0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155}, + {0x82a0, 0x82a0}, {0x833f, 0x833f}, {0x8340, 0x829f}, {0x837e, 0x82dd}, + {0x837f, 0x837f}, {0x8380, 0x82de}, {0x8393, 0x82f1}, {0x8394, 0x8394}, + {0x8396, 0x8396}, {0x8397, 0x8397}, + {0xa5, 0xa5}, {0xb0, 0xb0}, {0xdd, 0xdd} }; + unsigned int i; + unsigned int prev_cp = _getmbcp(); + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + { + int ret, exp = mbchira_932[i][0]; + ret = _mbctohira(mbchira_932[i][0]); + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + + _setmbcp(932); + for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + { + unsigned int ret, exp; + ret = _mbctohira(mbchira_932[i][0]); + exp = mbchira_932[i][1]; + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + _setmbcp(prev_cp); +} + +static void test_mbctokata(void) +{ + static const unsigned int mbckata_932[][2] = { + {0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155}, + {0x833f, 0x833f}, {0x829f, 0x8340}, {0x82dd, 0x837e}, {0x837f, 0x837f}, + {0x82de, 0x8380}, {0x8394, 0x8394}, {0x8397, 0x8397}, + {0xa5, 0xa5}, {0xb0, 0xb0}, {0xdd, 0xdd} }; + unsigned int i; + unsigned int prev_cp = _getmbcp(); + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + { + int ret, exp = mbckata_932[i][0]; + ret = _mbctokata(mbckata_932[i][0]); + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + + _setmbcp(932); + for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + { + unsigned int ret, exp; + ret = _mbctokata(mbckata_932[i][0]); + exp = mbckata_932[i][1]; + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + _setmbcp(prev_cp); +} + static void test_mbbtombc(void) { static const unsigned int mbbmbc[][2] = { @@ -1189,6 +1248,37 @@ exp = mbcmbb_932[i][1]; ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); } + _setmbcp(prev_cp); +} + +static void test_ismbckata(void) { + struct katakana_pair { + UINT c; + BOOL exp; + }; + static const struct katakana_pair tests[] = { + {0x8152, FALSE}, {0x8153, FALSE}, {0x8154, FALSE}, {0x8155, FALSE}, + {0x82a0, FALSE}, {0x833f, FALSE}, {0x8340, TRUE }, {0x837e, TRUE }, + {0x837f, FALSE}, {0x8380, TRUE }, {0x8396, TRUE }, {0x8397, FALSE}, + {0xa5, FALSE}, {0xb0, FALSE}, {0xdd, FALSE} + }; + unsigned int prev_cp = _getmbcp(); + int ret; + unsigned int i; + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!ret, "expected 0, got %d for %04x\n", ret, tests[i].c); + } + + _setmbcp(932); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!!ret == tests[i].exp, "expected %d, got %d for %04x\n", + tests[i].exp, !!ret, tests[i].c); + } + _setmbcp(prev_cp); } @@ -2836,6 +2926,36 @@ ok(str[0] == 'c', "str[0] = %d\n", str[0]); ok(str[1] == 0, "str[1] = %d\n", str[1]); ok(str[2] == 'b', "str[2] = %d\n", str[2]); +} + +static void test__mbscmp(void) +{ + static const unsigned char a[] = {'a',0}, b[] = {'b',0}; + int ret; + + if (!p_mbrlen) + { + win_skip("_mbscmp tests\n"); + return; + } + + ret = _mbscmp(NULL, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(NULL, a); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, a); + ok(!ret, "got %d\n", ret); + + ret = _mbscmp(a, b); + ok(ret == -1, "got %d\n", ret); + + ret = _mbscmp(b, a); + ok(ret == 1, "got %d\n", ret); } START_TEST(string) @@ -2913,8 +3033,11 @@ test__mbscpy_s(); test_mbcjisjms(); test_mbcjmsjis(); + test_mbctohira(); + test_mbctokata(); test_mbbtombc(); test_mbctombb(); + test_ismbckata(); test_ismbclegal(); test_strtok(); test__mbstok(); @@ -2945,4 +3068,5 @@ test_strxfrm(); test__strnset_s(); test__wcsset_s(); -} + test__mbscmp(); +}

9 years, 3 months

[akhaldi] 67922: [PSDK] Add missing DYNAMIC_TIME_ZONE_INFORMATION and QueryInformationJobObject.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 26 16:25:42 2015 New Revision: 67922 URL: http://svn.reactos.org/svn/reactos?rev=67922&view=rev Log: [PSDK] Add missing DYNAMIC_TIME_ZONE_INFORMATION and QueryInformationJobObject. Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Tue May 26 16:25:42 2015 @@ -1056,6 +1056,18 @@ DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS,*LPSYSTEM_POWER_STATUS; +typedef struct _TIME_DYNAMIC_ZONE_INFORMATION { + LONG Bias; + WCHAR StandardName[32]; + SYSTEMTIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + SYSTEMTIME DaylightDate; + LONG DaylightBias; + WCHAR TimeZoneKeyName[128]; + BOOLEAN DynamicDaylightTimeDisabled; +} DYNAMIC_TIME_ZONE_INFORMATION, *PDYNAMIC_TIME_ZONE_INFORMATION; + typedef struct _TIME_ZONE_INFORMATION { LONG Bias; WCHAR StandardName[32]; @@ -2678,6 +2690,15 @@ BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); #endif void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR*); + +BOOL +WINAPI +QueryInformationJobObject( + _In_opt_ HANDLE hJob, + _In_ JOBOBJECTINFOCLASS JobObjectInformationClass, + _Out_writes_bytes_to_(cbJobObjectInformationLength, *lpReturnLength) LPVOID lpJobObjectInformation, + _In_ DWORD cbJobObjectInformationLength, + _Out_opt_ LPDWORD lpReturnLength); BOOL WINAPI

9 years, 3 months

[akhaldi] 67921: [WINE/INCLUDE] Add missing RTL_DYNAMIC_TIME_ZONE_INFORMATION and RtlQueryDynamicTimeZoneInformation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 26 12:09:59 2015 New Revision: 67921 URL: http://svn.reactos.org/svn/reactos?rev=67921&view=rev Log: [WINE/INCLUDE] Add missing RTL_DYNAMIC_TIME_ZONE_INFORMATION and RtlQueryDynamicTimeZoneInformation. Modified: trunk/reactos/include/reactos/wine/winternl.h Modified: trunk/reactos/include/reactos/wine/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winte… ============================================================================== --- trunk/reactos/include/reactos/wine/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winternl.h [iso-8859-1] Tue May 26 12:09:59 2015 @@ -130,6 +130,19 @@ RTL_SYSTEM_TIME DaylightDate; LONG DaylightBias; } RTL_TIME_ZONE_INFORMATION, *PRTL_TIME_ZONE_INFORMATION; + +typedef struct _RTL_TIME_DYNAMIC_ZONE_INFORMATION +{ + LONG Bias; + WCHAR StandardName[32]; + RTL_SYSTEM_TIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + RTL_SYSTEM_TIME DaylightDate; + LONG DaylightBias; + WCHAR TimeZoneKeyName[128]; + BOOLEAN DynamicDaylightTimeDisabled; +} RTL_DYNAMIC_TIME_ZONE_INFORMATION, *PRTL_DYNAMIC_TIME_ZONE_INFORMATION; typedef struct _CLIENT_ID { @@ -2490,6 +2503,7 @@ NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); +NTSYSAPI NTSTATUS WINAPI RtlQueryDynamicTimeZoneInformation(RTL_DYNAMIC_TIME_ZONE_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS);

9 years, 3 months

[akhaldi] 67920: [FREETYPE] Update to v2.5.5. CORE-8888

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 26 12:02:58 2015 New Revision: 67920 URL: http://svn.reactos.org/svn/reactos?rev=67920&view=rev Log: [FREETYPE] Update to v2.5.5. CORE-8888 Modified: trunk/reactos/lib/3rdparty/freetype/ChangeLog trunk/reactos/lib/3rdparty/freetype/README trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h trunk/reactos/lib/3rdparty/freetype/include/config/ftoption.h trunk/reactos/lib/3rdparty/freetype/include/freetype.h trunk/reactos/lib/3rdparty/freetype/include/ftadvanc.h trunk/reactos/lib/3rdparty/freetype/include/ftautoh.h trunk/reactos/lib/3rdparty/freetype/include/ftbbox.h trunk/reactos/lib/3rdparty/freetype/include/ftbdf.h trunk/reactos/lib/3rdparty/freetype/include/ftbitmap.h trunk/reactos/lib/3rdparty/freetype/include/ftbzip2.h trunk/reactos/lib/3rdparty/freetype/include/ftcache.h trunk/reactos/lib/3rdparty/freetype/include/ftcffdrv.h trunk/reactos/lib/3rdparty/freetype/include/ftcid.h trunk/reactos/lib/3rdparty/freetype/include/fterrdef.h trunk/reactos/lib/3rdparty/freetype/include/ftgasp.h trunk/reactos/lib/3rdparty/freetype/include/ftglyph.h trunk/reactos/lib/3rdparty/freetype/include/ftgxval.h trunk/reactos/lib/3rdparty/freetype/include/ftgzip.h trunk/reactos/lib/3rdparty/freetype/include/ftimage.h trunk/reactos/lib/3rdparty/freetype/include/ftincrem.h trunk/reactos/lib/3rdparty/freetype/include/ftlcdfil.h trunk/reactos/lib/3rdparty/freetype/include/ftlist.h trunk/reactos/lib/3rdparty/freetype/include/ftlzw.h trunk/reactos/lib/3rdparty/freetype/include/ftmm.h trunk/reactos/lib/3rdparty/freetype/include/ftmodapi.h trunk/reactos/lib/3rdparty/freetype/include/ftotval.h trunk/reactos/lib/3rdparty/freetype/include/ftoutln.h trunk/reactos/lib/3rdparty/freetype/include/ftpfr.h trunk/reactos/lib/3rdparty/freetype/include/ftrender.h trunk/reactos/lib/3rdparty/freetype/include/ftstroke.h trunk/reactos/lib/3rdparty/freetype/include/ftsynth.h trunk/reactos/lib/3rdparty/freetype/include/ftsystem.h trunk/reactos/lib/3rdparty/freetype/include/fttrigon.h trunk/reactos/lib/3rdparty/freetype/include/ftttdrv.h trunk/reactos/lib/3rdparty/freetype/include/fttypes.h trunk/reactos/lib/3rdparty/freetype/include/ftwinfnt.h trunk/reactos/lib/3rdparty/freetype/include/ftxf86.h trunk/reactos/lib/3rdparty/freetype/include/internal/ftcalc.h trunk/reactos/lib/3rdparty/freetype/include/internal/ftgloadr.h trunk/reactos/lib/3rdparty/freetype/include/internal/ftobjs.h trunk/reactos/lib/3rdparty/freetype/include/internal/ftvalid.h trunk/reactos/lib/3rdparty/freetype/include/internal/pshints.h trunk/reactos/lib/3rdparty/freetype/include/internal/sfnt.h trunk/reactos/lib/3rdparty/freetype/include/t1tables.h trunk/reactos/lib/3rdparty/freetype/include/ttnameid.h trunk/reactos/lib/3rdparty/freetype/include/tttables.h trunk/reactos/lib/3rdparty/freetype/include/ttunpat.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afangles.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.dat trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.hin trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.h trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.c trunk/reactos/lib/3rdparty/freetype/src/autofit/afscript.h trunk/reactos/lib/3rdparty/freetype/src/autofit/afstyles.h trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.c trunk/reactos/lib/3rdparty/freetype/src/base/ftadvanc.c trunk/reactos/lib/3rdparty/freetype/src/base/ftbbox.c trunk/reactos/lib/3rdparty/freetype/src/base/ftbdf.c trunk/reactos/lib/3rdparty/freetype/src/base/ftbitmap.c trunk/reactos/lib/3rdparty/freetype/src/base/ftcalc.c trunk/reactos/lib/3rdparty/freetype/src/base/ftfstype.c trunk/reactos/lib/3rdparty/freetype/src/base/ftglyph.c trunk/reactos/lib/3rdparty/freetype/src/base/ftgxval.c trunk/reactos/lib/3rdparty/freetype/src/base/ftinit.c trunk/reactos/lib/3rdparty/freetype/src/base/ftlcdfil.c trunk/reactos/lib/3rdparty/freetype/src/base/ftmac.c trunk/reactos/lib/3rdparty/freetype/src/base/ftmm.c trunk/reactos/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/lib/3rdparty/freetype/src/base/ftoutln.c trunk/reactos/lib/3rdparty/freetype/src/base/ftpfr.c trunk/reactos/lib/3rdparty/freetype/src/base/ftrfork.c trunk/reactos/lib/3rdparty/freetype/src/base/ftstream.c trunk/reactos/lib/3rdparty/freetype/src/base/ftstroke.c trunk/reactos/lib/3rdparty/freetype/src/base/ftsynth.c trunk/reactos/lib/3rdparty/freetype/src/base/fttrigon.c trunk/reactos/lib/3rdparty/freetype/src/base/fttype1.c trunk/reactos/lib/3rdparty/freetype/src/base/ftutil.c trunk/reactos/lib/3rdparty/freetype/src/base/ftwinfnt.c trunk/reactos/lib/3rdparty/freetype/src/bdf/bdfdrivr.c trunk/reactos/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/lib/3rdparty/freetype/src/bzip2/ftbzip2.c trunk/reactos/lib/3rdparty/freetype/src/cache/ftcbasic.c trunk/reactos/lib/3rdparty/freetype/src/cache/ftccmap.c trunk/reactos/lib/3rdparty/freetype/src/cache/ftcmanag.c trunk/reactos/lib/3rdparty/freetype/src/cache/ftcsbits.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2font.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2hints.c trunk/reactos/lib/3rdparty/freetype/src/cff/cf2intrp.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffcmap.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffdrivr.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffgload.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffobjs.c trunk/reactos/lib/3rdparty/freetype/src/cff/cffparse.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvbsln.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvfeat.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvjust.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvkern.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort.h trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort0.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort2.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort4.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort5.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx.h trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx0.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx1.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx4.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx5.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvopbd.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvprop.c trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c trunk/reactos/lib/3rdparty/freetype/src/gzip/ftgzip.c trunk/reactos/lib/3rdparty/freetype/src/gzip/inftrees.c trunk/reactos/lib/3rdparty/freetype/src/lzw/ftlzw.c trunk/reactos/lib/3rdparty/freetype/src/lzw/ftzopen.h trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvbase.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvcommn.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvcommn.h trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvgdef.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvgpos.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvgsub.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvjstf.c trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvmath.c trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfdrivr.c trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrcmap.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrdrivr.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrsbit.c trunk/reactos/lib/3rdparty/freetype/src/psaux/psconv.c trunk/reactos/lib/3rdparty/freetype/src/psaux/psobjs.c trunk/reactos/lib/3rdparty/freetype/src/psaux/t1cmap.c trunk/reactos/lib/3rdparty/freetype/src/psaux/t1decode.c trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshglob.c trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshglob.h trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshrec.c trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshrec.h trunk/reactos/lib/3rdparty/freetype/src/psnames/psmodule.c trunk/reactos/lib/3rdparty/freetype/src/raster/ftraster.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/pngshim.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfdriver.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfobjs.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttkern.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttload.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttmtx.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttmtx.h trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttpost.c trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttsbit.c trunk/reactos/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/lib/3rdparty/freetype/src/smooth/ftsmooth.c trunk/reactos/lib/3rdparty/freetype/src/tools/afblue.pl trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/content.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/docmaker.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/formatter.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/sources.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/utils.py trunk/reactos/lib/3rdparty/freetype/src/tools/ftrandom/ftrandom.c trunk/reactos/lib/3rdparty/freetype/src/tools/test_trig.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttdriver.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgxvar.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.h trunk/reactos/lib/3rdparty/freetype/src/truetype/ttobjs.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttobjs.h trunk/reactos/lib/3rdparty/freetype/src/truetype/ttpload.c trunk/reactos/lib/3rdparty/freetype/src/truetype/ttsubpix.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1driver.c trunk/reactos/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/lib/3rdparty/freetype/src/type42/t42objs.c trunk/reactos/lib/3rdparty/freetype/src/type42/t42parse.c trunk/reactos/lib/3rdparty/freetype/src/winfonts/winfnt.c trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/Chan… Modified: trunk/reactos/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/READ… Modified: trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/deve… Modified: trunk/reactos/lib/3rdparty/freetype/include/config/ftconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftadvanc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftautoh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftbbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftbdf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftbitmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftbzip2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftcache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftcffdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftcid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/fterrdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftgasp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftglyph.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftgxval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftgzip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftincrem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftlcdfil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftlzw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftmodapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftotval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftoutln.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftpfr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftrender.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftstroke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftsynth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/fttrigon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftttdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/fttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftwinfnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ftxf86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/ftcalc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/ftgloadr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/ftvalid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/pshints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/internal/sfnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/t1tables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ttnameid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/tttables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/include/ttunpat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/incl… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afangles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.dat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.hin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afcjk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/afstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftadvanc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftbbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftbdf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftfstype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftglyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftgxval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftlcdfil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftpfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftstroke.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftsynth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/fttrigon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/fttype1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/base/ftwinfnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/bzip2/ftbzip2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cache/ftcbasic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cache/ftccmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cache/ftcmanag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cache/ftcsbits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cf2intrp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvbsln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvfeat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvjust.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvkern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmort5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvmorx5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvopbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/gzip/inftrees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/lzw/ftlzw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/lzw/ftzopen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvbase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvcommn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvcommn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvgdef.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvgpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvgsub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvjstf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/otvalid/otvmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pfr/pfrsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psaux/psconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psaux/t1cmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psaux/t1decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshglob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshglob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/pshinter/pshrec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/psnames/psmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/pngshim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttkern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttmtx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttmtx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttpost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/smooth/ftsmooth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/afblue.pl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/content.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/docmaker.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/formatter.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/sources.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/docmaker/utils.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/ftrandom/ftrandom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/tools/test_trig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttpload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/truetype/ttsubpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/src/… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

9 years, 3 months

[akhaldi] 67919: [PSDK] Update JOB_OBJECT_* defines.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue May 26 12:00:39 2015 New Revision: 67919 URL: http://svn.reactos.org/svn/reactos?rev=67919&view=rev Log: [PSDK] Update JOB_OBJECT_* defines. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue May 26 12:00:39 2015 @@ -5890,8 +5890,9 @@ #define JOB_OBJECT_LIMIT_PROCESS_MEMORY 0x0100 #define JOB_OBJECT_LIMIT_JOB_MEMORY 0x0200 #define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x0400 -#define JOB_OBJECT_BREAKAWAY_OK 0x0800 -#define JOB_OBJECT_SILENT_BREAKAWAY 0x1000 +#define JOB_OBJECT_LIMIT_BREAKAWAY_OK 0x0800 +#define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK 0x1000 +#define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x2000 /* JOBOBJECT_BASIC_UI_RESTRICTIONS.UIRestrictionsClass constants */ #define JOB_OBJECT_UILIMIT_HANDLES 0x0001

9 years, 3 months

[pschweitzer] 67918: [NTFS] - Don't attempt to moon walk path name for reserved MFT entries. - Don't attempt to dereference file name if it doesn't exist

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue May 26 07:10:45 2015 New Revision: 67918 URL: http://svn.reactos.org/svn/reactos?rev=67918&view=rev Log: [NTFS] - Don't attempt to moon walk path name for reserved MFT entries. - Don't attempt to dereference file name if it doesn't exist Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Tue May 26 07:10:45 2015 @@ -98,8 +98,6 @@ DPRINT1("NtfsMoonWalkID(%p, %I64x, %p)\n", DeviceExt, Id, OutPath); - Id = Id & NTFS_MFT_MASK; - RtlZeroMemory(FullPath, sizeof(FullPath)); MftRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, @@ -123,6 +121,13 @@ } FileName = GetBestFileNameFromRecord(MftRecord); + if (FileName == NULL) + { + DPRINT1("$FILE_NAME attribute not found for %I64x\n", Id); + Status = STATUS_OBJECT_PATH_NOT_FOUND; + break; + } + WritePosition -= FileName->NameLength; ASSERT(WritePosition < MAX_PATH); RtlCopyMemory(FullPath + WritePosition, FileName->Name, FileName->NameLength * sizeof(WCHAR)); @@ -276,10 +281,19 @@ if ((RequestedOptions & FILE_OPEN_BY_FILE_ID) == FILE_OPEN_BY_FILE_ID) { + ULONGLONG MFTId; + if (FileObject->FileName.Length != sizeof(ULONGLONG)) return STATUS_INVALID_PARAMETER; - Status = NtfsMoonWalkID(DeviceExt, (*(PULONGLONG)FileObject->FileName.Buffer), &FullPath); + MFTId = (*(PULONGLONG)FileObject->FileName.Buffer) & NTFS_MFT_MASK; + if (MFTId < 0xf) + { + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + } + + Status = NtfsMoonWalkID(DeviceExt, MFTId, &FullPath); if (!NT_SUCCESS(Status)) { return Status;

9 years, 3 months

[ekohl] 67917: [SYSDM] Add the hardware profile property sheet dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 25 22:02:05 2015 New Revision: 67917 URL: http://svn.reactos.org/svn/reactos?rev=67917&view=rev Log: [SYSDM] Add the hardware profile property sheet dialog. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Mon May 25 22:02:05 2015 @@ -44,6 +44,7 @@ HWND hwndDlg, PPROFILEDATA pProfileData) { + EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFPROP), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFCOPY), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFRENAME), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_HRDPROFDEL), (pProfileData->dwSelectedProfileIndex != (DWORD)-1) ? TRUE : FALSE); @@ -384,6 +385,69 @@ static +INT_PTR +CALLBACK +HardwareProfilePropertiesDlgProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch (uMsg) + { + case WM_INITDIALOG: + return TRUE; + + } + + return FALSE; +} + + +static +VOID +HardwareProfileProperties( + HWND hwndDlg, + PPROFILEDATA pProfileData) +{ + HPROPSHEETPAGE hpsp; + PROPSHEETHEADER psh; + PROPSHEETPAGE psp; + + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(IDD_HARDWAREPROFILE); + psp.pfnDlgProc = HardwareProfilePropertiesDlgProc; + + hpsp = CreatePropertySheetPage(&psp); + if (hpsp == NULL) + { + return; + } + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = hwndDlg; + psh.hInstance = hApplet; + psh.hIcon = NULL; + psh.pszCaption = NULL; + psh.nPages = 1; + psh.nStartPage = 0; + psh.phpage = &hpsp; + psh.pfnCallback = NULL; + + PropertySheet(&psh); +} + + +static DWORD GetUserWaitInterval(VOID) { @@ -682,6 +746,10 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_HRDPROFPROP: + HardwareProfileProperties(hwndDlg, pProfileData); + break; + case IDC_HRDPROFCOPY: CopyHardwareProfile(hwndDlg, pProfileData); break; Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 143, 213, 50, 14 PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -101,6 +101,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Fortryd", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -105,6 +105,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 @@ -287,7 +307,7 @@ IDS_PAGEFILE_NONE "Keine" IDS_PAGEFILE_SYSTEM "Systemverwaltet" IDS_INFOREBOOT "Sie mÃ¼ssen den Computer neu starten, damit die Ãnderung wirksam wird." - IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃÄek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" + IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervÃ© Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKamil HornÃcek\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas BlÃ¼mel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGÃ© van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" IDS_HWPROFILE_CONFIRM_DELETE_TITLE "Confirm Profile Delete" IDS_HWPROFILE_CONFIRM_DELETE "Are you sure you want to delete the hardware profile ""%s""?" IDS_HWPROFILE_ALREADY_IN_USE "The profile name is already in use." Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "ÎÎºÏÏÎ¿", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 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] Mon May 25 22:02:05 2015 @@ -98,6 +98,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "Aceptar", IDOK, 143, 213, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -98,6 +98,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "×××©××¨", IDOK, 143, 213, 50, 14 PUSHBUTTON "×××××", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -98,6 +98,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "Rendben", IDOK, 143, 213, 50, 14 PUSHBUTTON "MÃ©gsem", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Annuleren", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -105,6 +105,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -105,6 +105,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "Con&firmÄ", IDOK, 143, 213, 50, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -104,6 +104,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -96,6 +96,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Anulo", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -98,6 +98,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -98,6 +98,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "Tamam", IDOK, 143, 213, 50, 14 PUSHBUTTON "Ä°ptal", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -104,6 +104,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Mon May 25 22:02:05 2015 @@ -98,6 +98,26 @@ UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 DEFPUSHBUTTON "ç¡®å®", IDOK, 143, 213, 50, 14 PUSHBUTTON "åæ¶", IDCANCEL, 197, 213, 50, 14 +END + +IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON + LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 + LTEXT "Dock ID:", IDC_STATIC, 10, 42, 43, 8 + LTEXT "", IDC_HWPPROP_DOCKID, 64, 42, 135, 8 + LTEXT "Serial Number:", IDC_STATIC, 10, 55, 52, 8 + LTEXT "", IDC_HWPPROP_SERIAL, 64, 55, 135, 8 + GROUPBOX "", IDC_STATIC, 10, 69, 192, 61 + AUTOCHECKBOX "This is a &portable computer", IDC_HWPPROP_PORTABLE, 17, 68, 102, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The docking &state is unknown", IDC_HWPPROP_UNKNOWN, 22, 85, 160, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "The computer is &docked", IDC_HWPPROP_DOCKED, 22, 97, 160, 10 + AUTORADIOBUTTON "The computer is &undocked", IDC_HWPPROP_UNDOCKED, 22, 109, 160, 10 + GROUPBOX "Hardware profiles selection", IDC_STATIC, 10, 138, 192, 42 + AUTOCHECKBOX "Always &include this profile as an option when Windows starts", IDC_HWPPROP_INCLUDE, 17, 150, 164, 20, WS_GROUP | WS_TABSTOP | BS_MULTILINE END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Mon May 25 22:02:05 2015 @@ -153,20 +153,31 @@ #define IDC_HRDPROFEDIT 1111 #define IDC_HRDPROFUPDWN 1112 +/* Hardware profile */ +#define IDD_HARDWAREPROFILE 1200 +#define IDC_HWPPROP_PROFILE 1201 +#define IDC_HWPPROP_DOCKID 1202 +#define IDC_HWPPROP_SERIAL 1203 +#define IDC_HWPPROP_PORTABLE 1204 +#define IDC_HWPPROP_UNKNOWN 1205 +#define IDC_HWPPROP_DOCKED 1206 +#define IDC_HWPPROP_UNDOCKED 1207 +#define IDC_HWPPROP_INCLUDE 1208 + /* Copy profile */ -#define IDD_COPYPROFILE 1200 -#define IDC_COPYPROFILEFROM 1201 -#define IDC_COPYPROFILETO 1202 +#define IDD_COPYPROFILE 1300 +#define IDC_COPYPROFILEFROM 1301 +#define IDC_COPYPROFILETO 1302 /* Rename profile */ -#define IDD_RENAMEPROFILE 1300 -#define IDC_RENPROFEDITFROM 1301 -#define IDC_RENPROFEDITTO 1302 +#define IDD_RENAMEPROFILE 1400 +#define IDC_RENPROFEDITFROM 1401 +#define IDC_RENPROFEDITTO 1402 /* Licence */ -#define IDD_LICENCE 1500 -#define IDC_LICENCEEDIT 1501 -#define RC_LICENSE 1502 -#define RTDATA 1503 +#define IDD_LICENCE 1500 +#define IDC_LICENCEEDIT 1501 +#define RC_LICENSE 1502 +#define RTDATA 1503 #define IDS_DEVS 2000

9 years, 3 months

[akhaldi] 67916: [GDI32_WINETEST] Sync with Wine Staging 1.7.43.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 25 18:52:18 2015 New Revision: 67916 URL: http://svn.reactos.org/svn/reactos?rev=67916&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.7.43. Modified: trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/palette.c Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Mon May 25 18:52:18 2015 @@ -56,8 +56,9 @@ { BITMAP bm; BITMAP bma[2]; - INT ret, width_bytes; + INT ret, width_bytes, i; BYTE buf[512], buf_cmp[512]; + INT test_size[] = {0 /*first value will be changed */, 0, -1, -1000, ~0, sizeof(buf)}; ret = GetObjectW(hbm, sizeof(bm), &bm); ok(ret == sizeof(bm), "GetObject returned %d\n", ret); @@ -75,17 +76,28 @@ assert(sizeof(buf) == sizeof(buf_cmp)); SetLastError(0xdeadbeef); - ret = GetBitmapBits(hbm, 0, NULL); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + test_size[0] = bm.bmWidthBytes * bm.bmHeight; + /* NULL output buffer with different count values */ + for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + { + ret = GetBitmapBits(hbm, test_size[i], NULL); + ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + } memset(buf_cmp, 0xAA, sizeof(buf_cmp)); memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); - memset(buf, 0xAA, sizeof(buf)); - ret = GetBitmapBits(hbm, sizeof(buf), buf); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), - "buffers do not match, depth %d\n", bmih->biBitCount); + /* Correct output buffer with different count values */ + for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + { + int expect = i == 1 ? 0 : bm.bmWidthBytes * bm.bmHeight; + memset(buf, 0xAA, sizeof(buf)); + ret = GetBitmapBits(hbm, test_size[i], buf); + ok(ret == expect, "Test[%d]: %d != %d\n", i, ret, expect); + if (expect) + ok(!memcmp(buf, buf_cmp, sizeof(buf)), + "Test[%d]: buffers do not match, depth %d\n", i, bmih->biBitCount); + } /* test various buffer sizes for GetObject */ ret = GetObjectW(hbm, sizeof(*bma) * 2, bma); Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Mon May 25 18:52:18 2015 @@ -3708,9 +3708,10 @@ default_char = GET_BE_WORD(tt_os2.usDefaultChar); break_char = GET_BE_WORD(tt_os2.usBreakChar); - trace("font %s charset %u: %x-%x (%x-%x) default %x break %x OS/2 version %u vendor %4.4s\n", - font_name, lf->lfCharSet, os2_first_char, os2_last_char, cmap_first, cmap_last, - default_char, break_char, version, (LPCSTR)&tt_os2.achVendID); + if (winetest_debug > 1) + trace("font %s charset %u: %x-%x (%x-%x) default %x break %x OS/2 version %u vendor %4.4s\n", + font_name, lf->lfCharSet, os2_first_char, os2_last_char, cmap_first, cmap_last, + default_char, break_char, version, (LPCSTR)&tt_os2.achVendID); if (cmap_type == cmap_ms_symbol || (cmap_first >= 0xf000 && cmap_first < 0xf100)) { Modified: trunk/rostests/winetests/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/palette.c… ============================================================================== --- trunk/rostests/winetests/gdi32/palette.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/palette.c [iso-8859-1] Mon May 25 18:52:18 2015 @@ -191,9 +191,121 @@ ReleaseDC( 0, hdc ); } +static void test_system_palette_entries(void) +{ + HDC hdc; + PALETTEENTRY entries[256]; + PALETTEENTRY defpal[20]; + int i, count; + + hdc = GetDC(0); + + if (!(GetDeviceCaps( hdc, RASTERCAPS ) & RC_PALETTE)) + { + memset( defpal, 0xaa, sizeof(defpal) ); + count = GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 20, defpal ); + ok( count == 20, "wrong size %u\n", count ); + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 0, 256, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + for (i = 10; i < 246; ++i) + { + ok( !entries[i].peRed && + !entries[i].peGreen && + !entries[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); + } + for (i = 246; i < 256; i++) + { + int idx = i - 246 + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 0, 10, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + ok( entries[i].peRed == defpal[i].peRed && + entries[i].peGreen == defpal[i].peGreen && + entries[i].peBlue == defpal[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[i].peRed, defpal[i].peGreen, defpal[i].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 10, 246, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 236; ++i) + { + ok( !entries[i].peRed && + !entries[i].peGreen && + !entries[i].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of 0,0,0\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags); + } + for (i = 236; i < 246; i++) + { + int idx = i - 236 + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + memset( entries, 0x55, sizeof(entries) ); + count = GetSystemPaletteEntries( hdc, 246, 10, entries ); + ok( count == 0, "wrong size %u\n", count); + for (i = 0; i < 10; i++) + { + int idx = i + 10; + ok( entries[i].peRed == defpal[idx].peRed && + entries[i].peGreen == defpal[idx].peGreen && + entries[i].peBlue == defpal[idx].peBlue && + !entries[i].peFlags, + "%u: wrong color %02x,%02x,%02x,%02x instead of %02x,%02x,%02x\n", i, + entries[i].peRed, entries[i].peGreen, entries[i].peBlue, entries[i].peFlags, + defpal[idx].peRed, defpal[idx].peGreen, defpal[idx].peBlue ); + } + + } + else + { + skip( "device is palette-based, skipping test\n" ); + } + + ReleaseDC( 0, hdc ); +} + START_TEST(palette) { test_DIB_PAL_COLORS(); test_palette_entries(); test_halftone_palette(); -} + test_system_palette_entries(); +}

9 years, 3 months

[akhaldi] 67915: [ADVAPI32_WINETEST] Sync with Wine Staging 1.7.43.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 25 18:46:12 2015 New Revision: 67915 URL: http://svn.reactos.org/svn/reactos?rev=67915&view=rev Log: [ADVAPI32_WINETEST] Sync with Wine Staging 1.7.43. Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Mon May 25 18:46:12 2015 @@ -22,5 +22,5 @@ endif() set_module_type(advapi32_winetest win32cui) -add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32) +add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET advapi32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Mon May 25 18:46:12 2015 @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "wine/winternl.h" #include "aclapi.h" #include "winnt.h" #include "sddl.h" @@ -61,29 +62,6 @@ #define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) #define THREAD_ALL_ACCESS_VISTA (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff) - -/* copied from Wine winternl.h - not included in the Windows SDK */ -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation, - ObjectNameInformation, - ObjectTypeInformation, - ObjectAllInformation, - ObjectDataInformation -} OBJECT_INFORMATION_CLASS, *POBJECT_INFORMATION_CLASS; - -typedef struct _OBJECT_BASIC_INFORMATION { - ULONG Attributes; - ACCESS_MASK GrantedAccess; - ULONG HandleCount; - ULONG PointerCount; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; - ULONG Reserved[3]; - ULONG NameInformationLength; - ULONG TypeInformationLength; - ULONG SecurityDescriptorLength; - LARGE_INTEGER CreateTime; -} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; #define expect_eq(expr, value, type, format) { type ret_ = expr; ok((value) == ret_, #expr " expected " format " got " format "\n", (value), (ret_)); } @@ -150,6 +128,10 @@ PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); +static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); +static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); +static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN); static HMODULE hmod; static int myARGC; @@ -176,6 +158,10 @@ hntdll = GetModuleHandleA("ntdll.dll"); pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); pNtAccessCheck = (void *)GetProcAddress( hntdll, "NtAccessCheck" ); + pNtSetSecurityObject = (void *)GetProcAddress(hntdll, "NtSetSecurityObject"); + pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); + pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); hmod = GetModuleHandleA("advapi32.dll"); pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); @@ -2531,19 +2517,21 @@ static void test_process_security(void) { BOOL res; + PTOKEN_USER user; PTOKEN_OWNER owner; PTOKEN_PRIMARY_GROUP group; - PSID AdminSid = NULL, UsersSid = NULL; + PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL; PACL Acl = NULL, ThreadAcl = NULL; SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; SECURITY_ATTRIBUTES psa, tsa; HANDLE token, event; - DWORD size; + DWORD size, acc_size, dom_size, ret; SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY }; PSID EveryoneSid = NULL; + SID_NAME_USE use; Acl = HeapAlloc(GetProcessHeap(), 0, 256); res = InitializeAcl(Acl, 256, ACL_REVISION); @@ -2575,7 +2563,8 @@ owner = HeapAlloc(GetProcessHeap(), 0, size); res = GetTokenInformation( token, TokenOwner, owner, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); - AdminSid = ((TOKEN_OWNER*)owner)->Owner; + AdminSid = owner->Owner; + test_sid_str(AdminSid); res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res); @@ -2585,13 +2574,34 @@ group = HeapAlloc(GetProcessHeap(), 0, size); res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size ); ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); - UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup; + UsersSid = group->PrimaryGroup; + test_sid_str(UsersSid); + + acc_size = sizeof(account); + dom_size = sizeof(domain); + ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); + ok(ret, "LookupAccountSid failed with %d\n", ret); + ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); + ok(!strcmp(account, "None"), "expect None, got %s\n", account); + + res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); + ok(!res, "Expected failure, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + user = HeapAlloc(GetProcessHeap(), 0, size); + res = GetTokenInformation( token, TokenUser, user, size, &size ); + ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); + UserSid = user->User.Sid; + test_sid_str(UserSid); + ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); CloseHandle( token ); if (!res) { HeapFree(GetProcessHeap(), 0, group); HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, Acl); return; } @@ -2698,6 +2708,7 @@ CloseHandle( event ); HeapFree(GetProcessHeap(), 0, group); HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, Acl); HeapFree(GetProcessHeap(), 0, SecurityDescriptor); HeapFree(GetProcessHeap(), 0, ThreadAcl); @@ -3142,6 +3153,98 @@ HeapFree(GetProcessHeap(), 0, OldAcl); } +/* helper function for test_CreateDirectoryA */ +static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) +{ + UNICODE_STRING strW; + ANSI_STRING str; + NTSTATUS status; + BOOLEAN ret; + RtlInitAnsiString(&str, name); + + status = pRtlAnsiStringToUnicodeString(&strW, &str, TRUE); + ok(!status, "RtlAnsiStringToUnicodeString failed with %08x\n", status); + + ret = pRtlDosPathNameToNtPathName_U(strW.Buffer, nameW, NULL, NULL); + ok(ret, "RtlDosPathNameToNtPathName_U failed\n"); + + RtlFreeUnicodeString(&strW); +} + +static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD flags, DWORD mask, + BOOL todo_count, BOOL todo_sid, BOOL todo_flags, int line) +{ + ACL_SIZE_INFORMATION acl_size; + ACCESS_ALLOWED_ACE *ace; + BOOL bret; + + bret = pGetAclInformation(dacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok_(__FILE__, line)(bret, "GetAclInformation failed\n"); + + if (todo_count) + todo_wine + ok_(__FILE__, line)(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2)\n", + acl_size.AceCount); + else + ok_(__FILE__, line)(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2)\n", + acl_size.AceCount); + + if (acl_size.AceCount > 0) + { + bret = pGetAce(dacl, 0, (VOID **)&ace); + ok_(__FILE__, line)(bret, "Failed to get Current User ACE\n"); + + bret = EqualSid(&ace->SidStart, user_sid); + if (todo_sid) + todo_wine + ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); + else + ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); + + if (todo_flags) + todo_wine + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Current User ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + else + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Current User ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + + ok_(__FILE__, line)(ace->Mask == mask, + "Current User ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(dacl, 1, (VOID **)&ace); + ok_(__FILE__, line)(bret, "Failed to get Administators Group ACE\n"); + + bret = EqualSid(&ace->SidStart, admin_sid); + if (todo_sid) + todo_wine + ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); + else + ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); + + if (todo_flags) + todo_wine + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + else + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + + ok_(__FILE__, line)(ace->Mask == mask, + "Administators Group ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, mask); + } +} + static void test_CreateDirectoryA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; @@ -3150,17 +3253,20 @@ char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; PSECURITY_DESCRIPTOR pSD = &sd; ACL_SIZE_INFORMATION acl_size; - ACCESS_ALLOWED_ACE *ace; + UNICODE_STRING tmpfileW; SECURITY_ATTRIBUTES sa; + OBJECT_ATTRIBUTES attr; char tmpfile[MAX_PATH]; char tmpdir[MAX_PATH]; HANDLE token, hTemp; + IO_STATUS_BLOCK io; struct _SID *owner; BOOL bret = TRUE; + NTSTATUS status; DWORD error; PACL pDacl; - if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) + if (!pGetSecurityInfo || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { win_skip("Required functions are not available\n"); return; @@ -3218,72 +3324,288 @@ goto done; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - + test_inherited_dacl(pDacl, admin_sid, user_sid, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + 0x1f01ff, FALSE, FALSE, FALSE, __LINE__); + LocalFree(pSD); + + /* Test inheritance of ACLs in CreateFile without security descriptor */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(hTemp != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError()); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + test_inherited_dacl(pDacl, admin_sid, user_sid, INHERITED_ACE, + 0x1f01ff, FALSE, FALSE, FALSE, __LINE__); + LocalFree(pSD); + CloseHandle(hTemp); + + /* Test inheritance of ACLs in CreateFile with security descriptor - + * When a security descriptor is set, then inheritance doesn't take effect */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = TRUE; + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, &sa, + CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(hTemp != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Current User ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - ok(bret, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } LocalFree(pSD); - /* Test inheritance of ACLs */ + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + CloseHandle(hTemp); + + /* Test inheritance of ACLs in NtCreateFile without security descriptor */ strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); - hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, - FILE_FLAG_DELETE_ON_CLOSE, NULL); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, - OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, - NULL, &pDacl, NULL, &pSD); - ok(error == ERROR_SUCCESS, "Failed to get permissions on file.\n"); + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + test_inherited_dacl(pDacl, admin_sid, user_sid, INHERITED_ACE, + 0x1f01ff, FALSE, FALSE, FALSE, __LINE__); + LocalFree(pSD); + CloseHandle(hTemp); + + /* Test inheritance of ACLs in NtCreateFile with security descriptor - + * When a security descriptor is set, then inheritance doesn't take effect */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = pSD; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Inherited Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - ok(bret, "Inherited Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Inherited Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } + LocalFree(pSD); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + CloseHandle(hTemp); + + /* Test inheritance of ACLs in CreateDirectory without security descriptor */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpdir"); + bret = CreateDirectoryA(tmpfile, NULL); + ok(bret == TRUE, "CreateDirectoryA failed with error %u\n", GetLastError()); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + test_inherited_dacl(pDacl, admin_sid, user_sid, + OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERITED_ACE, + 0x1f01ff, FALSE, FALSE, FALSE, __LINE__); + LocalFree(pSD); + bret = RemoveDirectoryA(tmpfile); + ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError()); + + /* Test inheritance of ACLs in CreateDirectory with security descriptor */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpdir1"); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = TRUE; + bret = CreateDirectoryA(tmpfile, &sa); + ok(bret == TRUE, "CreateDirectoryA failed with error %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + + SetLastError(0xdeadbeef); + bret = RemoveDirectoryA(tmpfile); + error = GetLastError(); + ok(bret == FALSE, "RemoveDirectoryA unexpected succeeded\n"); + ok(error == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %u\n", error); + + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, 100); + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, pDacl, NULL); + ok(error == ERROR_SUCCESS, "SetNamedSecurityInfoA failed with error %u\n", error); + HeapFree(GetProcessHeap(), 0, pDacl); + + bret = RemoveDirectoryA(tmpfile); + ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError()); + + /* Test inheritance of ACLs in NtCreateFile(..., FILE_DIRECTORY_FILE, ...) without security descriptor */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpdir"); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_READ | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + test_inherited_dacl(pDacl, admin_sid, user_sid, + OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERITED_ACE, + 0x1f01ff, FALSE, FALSE, FALSE, __LINE__); + LocalFree(pSD); + CloseHandle(hTemp); + + /* Test inheritance of ACLs in NtCreateFile(..., FILE_DIRECTORY_FILE, ...) with security descriptor */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpdir2"); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = pSD; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_READ | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); CloseHandle(hTemp); done: @@ -3303,7 +3625,7 @@ char invalid_path[] = "/an invalid file path"; int users_ace_id = -1, admins_ace_id = -1, i; char software_key[] = "MACHINE\\Software"; - char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH+sizeof(void*)]; SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; CHAR windows_dir[MAX_PATH]; @@ -3315,11 +3637,12 @@ BOOL owner_defaulted; BOOL group_defaulted; BOOL dacl_defaulted; - HANDLE token, hTemp; + HANDLE token, hTemp, h; PSID owner, group; BOOL dacl_present; PACL pDacl; BYTE flags; + NTSTATUS status; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { @@ -3424,8 +3747,8 @@ bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); ok(bret, "Failed to add ACL to security desciptor.\n"); GetTempFileNameA(".", "foo", 0, tmpfile); - hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_FLAG_DELETE_ON_CLOSE, NULL); + hTemp = CreateFileA(tmpfile, WRITE_DAC|GENERIC_WRITE, FILE_SHARE_DELETE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); SetLastError(0xdeadbeef); error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); @@ -3460,8 +3783,8 @@ ok(bret, "Current User ACE != Current User SID.\n"); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); + ok(ace->Mask == 0x1f01ff, + "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } if (acl_size.AceCount > 1) { @@ -3475,74 +3798,119 @@ "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); - CloseHandle(hTemp); - - /* Create security descriptor with no inheritance and test that it comes back the same */ - pSD = &sd; + + /* show that setting empty DACL is not removing all file permissions */ + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get ACE.\n"); + ok(((ACE_HEADER *)ace)->AceFlags & INHERITED_ACE, + "ACE has unexpected flags: 0x%x\n", ((ACE_HEADER *)ace)->AceFlags); + } + LocalFree(pSD); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + /* test setting NULL DACL */ + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL); + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + todo_wine ok(!pDacl, "pDacl != NULL\n"); + LocalFree(pSD); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + /* NtSetSecurityObject doesn't inherit DACL entries */ + pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*); + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pDacl = HeapAlloc(GetProcessHeap(), 0, 100); - InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); - pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + pSetSecurityDescriptorControl(pSD, SE_DACL_AUTO_INHERIT_REQ, SE_DACL_AUTO_INHERIT_REQ); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + pSetSecurityDescriptorControl(pSD, SE_DACL_AUTO_INHERIT_REQ|SE_DACL_AUTO_INHERITED, + SE_DACL_AUTO_INHERIT_REQ|SE_DACL_AUTO_INHERITED); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + /* test if DACL is properly mapped to permission */ bret = InitializeAcl(pDacl, 100, ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); - bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); - ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); ok(bret, "Failed to add ACL to security desciptor.\n"); - GetTempFileNameA(".", "foo", 0, tmpfile); - hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_FLAG_DELETE_ON_CLOSE, NULL); - SetLastError(0xdeadbeef); - error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, - DACL_SECURITY_INFORMATION|PROTECTED_DACL_SECURITY_INFORMATION, - NULL, NULL, pDacl, NULL); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + + bret = InitializeAcl(pDacl, 100, ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); + ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, pDacl); - if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("SetNamedSecurityInfoA is not implemented\n"); - HeapFree(GetProcessHeap(), 0, user); - CloseHandle(hTemp); - return; - } - ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); - SetLastError(0xdeadbeef); - error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, - NULL, NULL, &pDacl, NULL, &pSD); - if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) - { - win_skip("GetNamedSecurityInfoA is not implemented\n"); - HeapFree(GetProcessHeap(), 0, user); - CloseHandle(hTemp); - return; - } - ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == 0, - "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == 0, - "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, - "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } - LocalFree(pSD); HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); @@ -3728,6 +4096,13 @@ Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); LocalFree(pSD); + + SetLastError(0xdeadbeef); + ret = pConvertStringSecurityDescriptorToSecurityDescriptorA( + "D:P(A;;GRGW;;;BA)(A;;GRGW;;;S-1-5-21-0-0-0-1000)S:(ML;;NWNR;;;S-1-16-12288)", SDDL_REVISION_1, &pSD, NULL); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_DATATYPE) /* win2k */, + "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %u\n", GetLastError()); + if (ret) LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) @@ -4201,7 +4576,7 @@ ok(((ACE_HEADER *)ace)->AceFlags == 0, "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); + ace->Mask); } if (acl_size.AceCount > 1) { @@ -4211,8 +4586,8 @@ ok(bret, "Administators Group ACE != Administators Group SID.\n"); ok(((ACE_HEADER *)ace)->AceFlags == 0, "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); + ok(ace->Mask == 0x1f01ff, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); CloseHandle(obj); @@ -5693,6 +6068,51 @@ AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prev, NULL); CloseHandle(token); +} + +static void test_AddAce(void) +{ + static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; + + char acl_buf[1024], ace_buf[256]; + ACCESS_ALLOWED_ACE *ace = (ACCESS_ALLOWED_ACE*)ace_buf; + PACL acl = (PACL)acl_buf; + BOOL ret; + + memset(ace, 0, sizeof(ace_buf)); + ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD)+sizeof(SID); + memcpy(&ace->SidStart, &sidWorld, sizeof(sidWorld)); + + ret = InitializeAcl(acl, sizeof(acl_buf), ACL_REVISION2); + ok(ret, "InitializeAcl failed: %d\n", GetLastError()); + + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ret = AddAce(acl, ACL_REVISION2, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ret = AddAce(acl, ACL_REVISION3, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION3, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION4, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION4, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION4, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION2, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + + ret = AddAce(acl, MIN_ACL_REVISION-1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + /* next test succeededs but corrupts ACL */ + ret = AddAce(acl, MAX_ACL_REVISION+1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == MAX_ACL_REVISION+1, "acl->AclRevision = %d\n", acl->AclRevision); + SetLastError(0xdeadbeef); + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(!ret, "AddAce succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); } START_TEST(security) @@ -5736,4 +6156,5 @@ test_TokenIntegrityLevel(); test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); -} + test_AddAce(); +} Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Mon May 25 18:46:12 2015 @@ -53,6 +53,7 @@ DWORD, LPDWORD); static BOOL (WINAPI *pQueryServiceObjectSecurity)(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD); +static DWORD (WINAPI *pNotifyServiceStatusChangeW)(SC_HANDLE,DWORD,SERVICE_NOTIFYW*); static void init_function_pointers(void) { @@ -66,6 +67,7 @@ pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); pQueryServiceStatusEx= (void*)GetProcAddress(hadvapi32, "QueryServiceStatusEx"); pQueryServiceObjectSecurity = (void*)GetProcAddress(hadvapi32, "QueryServiceObjectSecurity"); + pNotifyServiceStatusChangeW = (void*)GetProcAddress(hadvapi32, "NotifyServiceStatusChangeW"); } static void test_open_scm(void) @@ -2201,6 +2203,75 @@ return le1; } +struct notify_data { + SERVICE_NOTIFYW notify; + SC_HANDLE svc; +}; + +static void CALLBACK cb_stopped(void *user) +{ + struct notify_data *data = user; + BOOL br; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = StartServiceA(data->svc, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); +} + +static void CALLBACK cb_running(void *user) +{ + struct notify_data *data = user; + BOOL br; + SERVICE_STATUS status; + + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + + br = ControlService(data->svc, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); +} + +static void test_servicenotify(SC_HANDLE svc) +{ + DWORD dr; + struct notify_data data; + + if(!pNotifyServiceStatusChangeW){ + win_skip("No NotifyServiceStatusChangeW\n"); + return; + } + + memset(&data.notify, 0, sizeof(data.notify)); + data.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data.notify.pfnNotifyCallback = &cb_stopped; + data.notify.pContext = &data; + data.svc = svc; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + + data.notify.pfnNotifyCallback = &cb_running; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); +} + static void test_start_stop(void) { BOOL ret; @@ -2279,17 +2350,12 @@ le = try_start_stop(svc_handle, displayname, is_nt4); ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); - /* And finally with a service that plays dead, forcing a timeout. - * This time we will put no quotes. That should work too, even if there are - * spaces in the path. - */ - sprintf(cmd, "%s service sleep", selfname); - displayname = "Winetest Sleep Service"; + /* create a real service and test notifications */ + sprintf(cmd, "%s service serve", selfname); + displayname = "Winetest Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - - le = try_start_stop(svc_handle, displayname, is_nt4); - ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + test_servicenotify(svc_handle); cleanup: if (svc_handle) @@ -2394,6 +2460,57 @@ CloseServiceHandle(scm_handle); } +static DWORD WINAPI ctrl_handler(DWORD ctl, DWORD type, void *data, void *user) +{ + HANDLE evt = user; + + switch(ctl){ + case SERVICE_CONTROL_STOP: + SetEvent(evt); + break; + case SERVICE_CONTROL_INTERROGATE: + return NO_ERROR; + } + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +static void WINAPI service_main(DWORD argc, char **argv) +{ + SERVICE_STATUS_HANDLE st_handle; + SERVICE_STATUS st; + HANDLE evt = CreateEventW(0, FALSE, FALSE, 0); + + st_handle = RegisterServiceCtrlHandlerExA("", &ctrl_handler, evt); + + st.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + st.dwServiceSpecificExitCode = 0; + st.dwCurrentState = SERVICE_RUNNING; + st.dwWin32ExitCode = NO_ERROR; + st.dwWaitHint = 0; + st.dwControlsAccepted = SERVICE_ACCEPT_STOP; + st.dwCheckPoint = 0; + + SetServiceStatus(st_handle, &st); + + WaitForSingleObject(evt, 5000); + + st.dwCurrentState = SERVICE_STOPPED; + + SetServiceStatus(st_handle, &st); +} + +static void run_service(void) +{ + char empty[] = {0}; + SERVICE_TABLE_ENTRYA table[] = { + {empty, &service_main }, + {0, 0} + }; + + StartServiceCtrlDispatcherA(table); +} + START_TEST(service) { SC_HANDLE scm_handle; @@ -2404,10 +2521,8 @@ GetFullPathNameA(myARGV[0], sizeof(selfname), selfname, NULL); if (myARGC >= 3) { - if (strcmp(myARGV[2], "sleep") == 0) - /* Cause a service startup timeout */ - Sleep(90000); - /* then, or if myARGV[2] == "exit", just exit */ + if (strcmp(myARGV[2], "serve") == 0) + run_service(); return; }

9 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015