Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[tkreuzer] 48622: delete old Zwcontinue test
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 10:15:34 2010 New Revision: 48622 URL: http://svn.reactos.org/svn/reactos?rev=48622&view=rev Log: delete old Zwcontinue test Removed: trunk/rostests/tests/zwcontinue/ Modified: trunk/rostests/tests/directory.rbuild Modified: trunk/rostests/tests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/directory.rbuild?re… ============================================================================== --- trunk/rostests/tests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/directory.rbuild [iso-8859-1] Wed Aug 25 10:15:34 2010 @@ -268,5 +268,4 @@  - </group>

1 0

[tkreuzer] 48621: [ROSTESTS] - Add wine style ntdll_apitest and move test for ZwContinue there
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 10:15:01 2010 New Revision: 48621 URL: http://svn.reactos.org/svn/reactos?rev=48621&view=rev Log: [ROSTESTS] - Add wine style ntdll_apitest and move test for ZwContinue there Added: trunk/rostests/apitests/ntdll/ (with props) trunk/rostests/apitests/ntdll/ZwContinue.c (with props) trunk/rostests/apitests/ntdll/i386/ (with props) trunk/rostests/apitests/ntdll/i386/ZwContinue.asm (with props) trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild (with props) trunk/rostests/apitests/ntdll/testlist.c (with props) Modified: trunk/rostests/ (props changed) trunk/rostests/apitests/directory.rbuild Propchange: trunk/rostests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 25 10:15:01 2010 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/rostests:44459,44462 +/branches/ros-amd64-bringup/rostests:44459,44462,44537 Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -12,6 +12,10 @@ <directory name="gdi32"> <xi:include href="gdi32/gdi32_apitest.rbuild" /> + </directory> + + <directory name="ntdll"> + <xi:include href="ntdll/ntdll_apitest.rbuild" /> </directory> <directory name="user32"> Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 10:15:01 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/ntdll/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/ntdll/ZwContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ZwContinue… ============================================================================== --- trunk/rostests/apitests/ntdll/ZwContinue.c (added) +++ trunk/rostests/apitests/ntdll/ZwContinue.c [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,173 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ZwContinue + * PROGRAMMER: + */ + +#include <setjmp.h> +#include <stdio.h> +#include <time.h> +#include <wine/test.h> + +#ifdef _M_IX86 +#define ZWC_SEGMENT_BITS (0xFFFF) +#define ZWC_EFLAGS_BITS (0x3C0CD5) +#endif + +void continuePoint(void); +LONG NTAPI ZwContinue(IN CONTEXT *, IN BOOLEAN); + +static jmp_buf jmpbuf; +static CONTEXT continueContext; +static unsigned int nRandBytes; + +static int initrand(void) +{ + unsigned int nRandMax; + unsigned int nRandMaxBits; + time_t tLoc; + + nRandMax = RAND_MAX; + for(nRandMaxBits = 0; nRandMax != 0; nRandMax >>= 1, ++ nRandMaxBits); + nRandBytes = nRandMaxBits / CHAR_BIT; + //assert(nRandBytes != 0); + srand((unsigned)(time(&tLoc) & UINT_MAX)); + return 1; +} + +static void randbytes(void * p, size_t n) +{ + unsigned char * b; + size_t i; + int r = rand(); + + b = (unsigned char *)p; + for(i = 0; i < n; ++ i) + { + if(i % nRandBytes == 0) + r = rand(); + b[i] = (unsigned char)(r & UCHAR_MAX); + r >>= CHAR_BIT; + } +} + +static ULONG randULONG(void) +{ + ULONG n; + randbytes(&n, sizeof(n)); + return n; +} + +void check(CONTEXT * pContext) +{ +#ifdef _M_IX86 + ok(pContext->ContextFlags == CONTEXT_FULL, + "ContextFlags=0x%lx\n", pContext->ContextFlags); + + /* Random data segments */ + ok((pContext->SegGs & ZWC_SEGMENT_BITS) == + (continueContext.SegGs & ZWC_SEGMENT_BITS), + "SegGs=0x%lx / 0x%lx\n", pContext->SegGs, continueContext.SegGs); + + ok((pContext->SegFs & ZWC_SEGMENT_BITS) == + (continueContext.SegFs & ZWC_SEGMENT_BITS), + "SegFs=0x%lx / 0x%lx\n", pContext->SegFs, continueContext.SegFs); + + ok((pContext->SegEs & ZWC_SEGMENT_BITS) == + (continueContext.SegEs & ZWC_SEGMENT_BITS), + "SegEs=0x%lx / 0x%lx\n", pContext->SegEs, continueContext.SegEs); + + ok((pContext->SegDs & ZWC_SEGMENT_BITS) == + (continueContext.SegDs & ZWC_SEGMENT_BITS), + "SegDs=0x%lx / 0x%lx\n", pContext->SegDs, continueContext.SegDs); + + /* Integer registers */ + ok(pContext->Edi == continueContext.Edi, + "Edi: 0x%lx != 0x%lx\n", pContext->Edi, continueContext.Edi); + ok(pContext->Esi == continueContext.Esi, + "Esi: 0x%lx != 0x%lx\n", pContext->Esi, continueContext.Esi); + ok(pContext->Ebx == continueContext.Ebx, + "Ebx: 0x%lx != 0x%lx\n", pContext->Ebx, continueContext.Ebx); + ok(pContext->Edx == continueContext.Edx, + "Edx: 0x%lx != 0x%lx\n", pContext->Edx, continueContext.Edx); + ok(pContext->Ecx == continueContext.Ecx, + "Ecx: 0x%lx != 0x%lx\n", pContext->Ecx, continueContext.Ecx); + ok(pContext->Eax == continueContext.Eax, + "Eax: 0x%lx != 0x%lx\n", pContext->Eax, continueContext.Eax); + + /* Control registers and segments */ + ok(pContext->Ebp == continueContext.Ebp, + "Ebp: 0x%lx != 0x%lx\n", pContext->Ebp, continueContext.Ebp); + ok(pContext->Eip == continueContext.Eip, + "Eip: 0x%lx != 0x%lx\n", pContext->Eip, continueContext.Eip); + ok(pContext->Esp == continueContext.Esp, + "Esp: 0x%lx != 0x%lx\n", pContext->Esp, continueContext.Esp); + + ok((pContext->SegCs & ZWC_SEGMENT_BITS) == + (continueContext.SegCs & ZWC_SEGMENT_BITS), + "SegCs: 0x%lx != 0x%lx\n", pContext->SegCs, continueContext.SegCs); + + ok((pContext->EFlags & ZWC_EFLAGS_BITS) == + (continueContext.EFlags & ZWC_EFLAGS_BITS), + "EFlags: 0x%lx != 0x%lx\n", pContext->EFlags, continueContext.EFlags); + + ok((pContext->SegSs & ZWC_SEGMENT_BITS) == + (continueContext.SegSs & ZWC_SEGMENT_BITS), + "SegSs: 0x%lx != 0x%lx\n", pContext->SegSs, continueContext.SegSs); +#endif + + /* Return where we came from */ + longjmp(jmpbuf, 1); +} + +void Test_ZwContinue() +{ + initrand(); + + /* First time */ + if(setjmp(jmpbuf) == 0) + { + CONTEXT bogus; + + continueContext.ContextFlags = CONTEXT_FULL; + GetThreadContext(GetCurrentThread(), &continueContext); + +#ifdef _M_IX86 + continueContext.ContextFlags = CONTEXT_FULL; + + /* Fill the integer registers with random values */ + continueContext.Edi = randULONG(); + continueContext.Esi = randULONG(); + continueContext.Ebx = randULONG(); + continueContext.Edx = randULONG(); + continueContext.Ecx = randULONG(); + continueContext.Eax = randULONG(); + continueContext.Ebp = randULONG(); + + /* Randomize all the allowed flags (determined experimentally with WinDbg) */ + continueContext.EFlags = randULONG() & 0x3C0CD5; + + /* Randomize the stack pointer as much as possible */ + continueContext.Esp = (ULONG)(((ULONG_PTR)&bogus) & 0xFFFFFFFF) + + sizeof(bogus) - (randULONG() & 0xF) * 4; + + /* continuePoint() is implemented in assembler */ + continueContext.Eip = (ULONG)((ULONG_PTR)continuePoint & 0xFFFFFFF); + + /* Can't do a lot about segments */ +#endif + + ZwContinue(&continueContext, FALSE); + ok(0, "should never get here\n"); + } + + /* Second time */ + return; +} + +START_TEST(ZwContinue) +{ + Test_ZwContinue(); +} + Propchange: trunk/rostests/apitests/ntdll/ZwContinue.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 10:15:01 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/ntdll/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/i386/ZwCon… ============================================================================== --- trunk/rostests/apitests/ntdll/i386/ZwContinue.asm (added) +++ trunk/rostests/apitests/ntdll/i386/ZwContinue.asm [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,48 @@ +; cpu 486 +segment .text use32 + +extern _check + +global _continuePoint +_continuePoint: + push ss + push dword 0 + pushfd + push cs + push dword _continuePoint + push ebp + + push eax + push ecx + push edx + push ebx + push esi + push edi + + push ds + push es + push fs + push gs + + ; TODO: floating point state + sub esp, 70h + + ; Debug registers + sub esp, 18h + + push dword 00010007h + + ; Fill the Esp field + lea eax, [esp+0CCh] + lea ecx, [esp+0C4h] + mov [ecx], eax + + ; Call the function that will compare the current context with the expected one + cld + push esp + call _check + + ; check() must not return + int 3 + +; EOF Propchange: trunk/rostests/apitests/ntdll/i386/ZwContinue.asm ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/ntdll_apit… ============================================================================== --- trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild (added) +++ trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="ntdll_apitest" type="win32cui" installbase="bin" installname="ntdll_apitest.exe"> + <include base="ntdll_apitest">.</include> + <library>wine</library> + <library>ntdll</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>ZwContinue.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>ZwContinue.asm</file> + </directory> + </if> +</module> +</group> Propchange: trunk/rostests/apitests/ntdll/ntdll_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c (added) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Wed Aug 25 10:15:01 2010 @@ -1,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_ZwContinue(void); + +const struct test winetest_testlist[] = +{ + { "ZwContinue", func_ZwContinue }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/ntdll/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 48620: Add missing files
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 08:50:10 2010 New Revision: 48620 URL: http://svn.reactos.org/svn/reactos?rev=48620&view=rev Log: Add missing files Added: trunk/rostests/apitests/dciman32/ (with props) trunk/rostests/apitests/dciman32/DCICreatePrimary.c (with props) trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild (with props) trunk/rostests/apitests/dciman32/testlist.c (with props) trunk/rostests/apitests/user32/ (with props) trunk/rostests/apitests/user32/GetSystemMetrics.c (with props) trunk/rostests/apitests/user32/InitializeLpkHooks.c (with props) trunk/rostests/apitests/user32/RealGetWindowClass.c (with props) trunk/rostests/apitests/user32/ScrollDC.c (with props) trunk/rostests/apitests/user32/ScrollWindowEx.c (with props) trunk/rostests/apitests/user32/testlist.c (with props) trunk/rostests/apitests/user32/user32_apitest.rbuild (with props) Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 08:50:10 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/dciman32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/dciman32/DCICreatePrimary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/DCICrea… ============================================================================== --- trunk/rostests/apitests/dciman32/DCICreatePrimary.c (added) +++ trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for DCICreatePrimary + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_DCICreatePrimary() +{ + +} + +START_TEST(DCICreatePrimary) +{ + Test_DCICreatePrimary(); +} + Propchange: trunk/rostests/apitests/dciman32/DCICreatePrimary.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/dciman3… ============================================================================== --- trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild (added) +++ trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="dciman32_apitest" type="win32cui" installbase="bin" installname="dciman32_apitest.exe"> + <include base="dciman32_apitest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>DCICreatePrimary.c</file> + +</module> +</group> Propchange: trunk/rostests/apitests/dciman32/dciman32_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dciman32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/testlis… ============================================================================== --- trunk/rostests/apitests/dciman32/testlist.c (added) +++ trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_DCICreatePrimary(void); + +const struct test winetest_testlist[] = +{ + { "DCICreatePrimary", func_DCICreatePrimary }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/dciman32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Aug 25 08:50:10 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/user32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/user32/GetSystemMetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetSystem… ============================================================================== --- trunk/rostests/apitests/user32/GetSystemMetrics.c (added) +++ trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,410 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for GetSystemMetrics + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_GetSystemMetrics() +{ + INT ret; + HDC hDC; + BOOL BoolVal; + UINT UintVal; + RECT rect; + + SetLastError(0); + hDC = GetDC(0); + + ret = GetSystemMetrics(0); + ok(ret > 0, "ret = %d", ret); + + ret = GetSystemMetrics(64); + ok(ret == 0, "ret = %d", ret); + ret = GetSystemMetrics(65); + ok(ret == 0, "ret = %d", ret); + ret = GetSystemMetrics(66); + ok(ret == 0, "ret = %d", ret); + + + ret = GetSystemMetrics(SM_CXSCREEN); + ok(ret == GetDeviceCaps(hDC, HORZRES), "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSCREEN); + ok(ret == GetDeviceCaps(hDC, VERTRES), "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXVSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYHSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYCAPTION); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXDLGFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYDLGFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYVTHUMB); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXHTHUMB); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXCURSOR); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYCURSOR); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMENU); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + SystemParametersInfoW(SPI_GETWORKAREA, 0, &rect, 0); + ret = GetSystemMetrics(SM_CXFULLSCREEN); + ok(ret == rect.right, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYFULLSCREEN); + ok(ret == rect.bottom - rect.top - GetSystemMetrics(SM_CYCAPTION), "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYKANJIWINDOW); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MOUSEPRESENT); + ok(ret == 1, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYVSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXHSCROLL); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_DEBUG); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SWAPBUTTON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED1); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED2); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED3); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_RESERVED4); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMIN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMIN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYFRAME); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMINTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMINTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXDOUBLECLK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYDOUBLECLK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXICONSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYICONSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MENUDROPALIGNMENT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_PENWINDOWS); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_DBCSENABLED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CMOUSEBUTTONS); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + +#if(WINVER >= 0x0400) + ret = GetSystemMetrics(SM_SECURE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXEDGE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYEDGE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMINSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMINSPACING); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXSMICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSMICON); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSMCAPTION); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXSMSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYSMSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMENUSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMENUSIZE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_ARRANGE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMINIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMINIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMAXTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMAXTRACK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMAXIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMAXIMIZED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_NETWORK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CLEANBOOT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXDRAG); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYDRAG); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SHOWSOUNDS); + SystemParametersInfoW(SPI_GETSHOWSOUNDS, 0, &BoolVal, 0); + ok(ret == BoolVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXMENUCHECK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYMENUCHECK); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SLOWMACHINE); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MIDEASTENABLED); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400) + ret = GetSystemMetrics(SM_MOUSEWHEELPRESENT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(WINVER >= 0x0500) + ret = GetSystemMetrics(SM_XVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_YVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYVIRTUALSCREEN); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CMONITORS); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SAMEDISPLAYFORMAT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(_WIN32_WINNT >= 0x0500) + ret = GetSystemMetrics(SM_IMMENABLED); + ok(ret == 0 || ret == 1, "ret = %d\n", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(_WIN32_WINNT >= 0x0501) + ret = GetSystemMetrics(SM_CXFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERWIDTH, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CYFOCUSBORDER); + SystemParametersInfoW(SPI_GETFOCUSBORDERHEIGHT, 0, &UintVal, 0); + ok(ret == UintVal, "ret = %d", ret); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_TABLETPC); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_MEDIACENTER); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_STARTER); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_SERVERR2); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +#if(_WIN32_WINNT >= 0x0600) + ret = GetSystemMetrics(SM_MOUSEHORIZONTALWHEELPRESENT); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); + + ret = GetSystemMetrics(SM_CXPADDEDBORDER); +// TEST(ret == 0); + ok(GetLastError() == 0, "GetLastError() = %ld\n", GetLastError()); +#endif + +} + +START_TEST(GetSystemMetrics) +{ + Test_GetSystemMetrics(); +} + Propchange: trunk/rostests/apitests/user32/GetSystemMetrics.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/Initializ… ============================================================================== --- trunk/rostests/apitests/user32/InitializeLpkHooks.c (added) +++ trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,110 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for InitializeLpkHooks + * PROGRAMMERS: Magnus Olsen + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + + +typedef struct _LPK_LPEDITCONTROL_LIST +{ + PVOID EditCreate; + PVOID EditIchToXY; + PVOID EditMouseToIch; + PVOID EditCchInWidth; + PVOID EditGetLineWidth; + PVOID EditDrawText; + PVOID EditHScroll; + PVOID EditMoveSelection; + PVOID EditVerifyText; + PVOID EditNextWord; + PVOID EditSetMenu; + PVOID EditProcessMenu; + PVOID EditCreateCaret; + PVOID EditAdjustCaret; +} LPK_LPEDITCONTROL_LIST, *PLPK_LPEDITCONTROL_LIST; + + +DWORD (APIENTRY *fpLpkTabbedTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +DWORD (APIENTRY *fpLpkPSMTextOut) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +DWORD (APIENTRY *fpLpkDrawTextEx) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID); +PLPK_LPEDITCONTROL_LIST (APIENTRY *fpLpkEditControl) (); + +int Count_myLpkTabbedTextOut = 0; +int Count_myLpkPSMTextOut = 0; +int Count_myLpkDrawTextEx = 0; + +DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, + LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12) +{ + Count_myLpkTabbedTextOut++; + return fpLpkTabbedTextOut(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12); +} + +DWORD myLpkPSMTextOut (LPVOID x1,LPVOID x2,LPVOID x3,LPVOID x4,LPVOID x5,LPVOID x6) +{ + Count_myLpkPSMTextOut++; + return fpLpkPSMTextOut ( x1, x2, x3, x4, x5, x6); +} + +DWORD myLpkDrawTextEx(LPVOID x1,LPVOID x2,LPVOID x3,LPVOID x4,LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, LPVOID x9,LPVOID x10) +{ + Count_myLpkDrawTextEx++; + return fpLpkDrawTextEx(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); +} + + +typedef struct _USER32_INTERN_INITALIZEHOOKS +{ + PVOID fpLpkTabbedTextOut; + PVOID fpLpkPSMTextOut; + PVOID fpLpkDrawTextEx; + PLPK_LPEDITCONTROL_LIST fpListLpkEditControl; +} USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS; + +VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS); + +void Test_InitializeLpkHooks() +{ + USER32_INTERN_INITALIZEHOOKS setup; + HMODULE lib = LoadLibrary("LPK.DLL"); + + ok(lib != NULL, "lib = 0\n"); + if (lib != NULL) + { + fpLpkTabbedTextOut = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID, LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "LpkTabbedTextOut"); + fpLpkPSMTextOut = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "fpLpkPSMTextOut"); + fpLpkDrawTextEx = (DWORD (APIENTRY *) (LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID,LPVOID)) GetProcAddress(lib, "LpkDrawTextEx"); + fpLpkEditControl = (PLPK_LPEDITCONTROL_LIST (APIENTRY *) (VOID)) GetProcAddress(lib, "LpkEditControl"); + + setup.fpLpkTabbedTextOut = myLpkTabbedTextOut; + setup.fpLpkPSMTextOut = myLpkPSMTextOut; + setup.fpLpkDrawTextEx = myLpkDrawTextEx; + + /* we have not add any test to this api */ + setup.fpListLpkEditControl = (PLPK_LPEDITCONTROL_LIST)fpLpkEditControl; + + /* use our own api that we just made */ + InitializeLpkHooks(&setup); + + /* FIXME add test now */ + + /* restore */ + setup.fpLpkTabbedTextOut = fpLpkTabbedTextOut; + setup.fpLpkPSMTextOut = fpLpkPSMTextOut; + setup.fpLpkDrawTextEx = fpLpkDrawTextEx; + setup.fpListLpkEditControl = (PLPK_LPEDITCONTROL_LIST)fpLpkEditControl; + InitializeLpkHooks(&setup); + } + +} + +START_TEST(InitializeLpkHooks) +{ + Test_InitializeLpkHooks(); +} + Propchange: trunk/rostests/apitests/user32/InitializeLpkHooks.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/RealGetWindowClass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RealGetWi… ============================================================================== --- trunk/rostests/apitests/user32/RealGetWindowClass.c (added) +++ trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,134 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for RealGetWindowClass + * PROGRAMMERS: Gregor Gullwi + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + +typedef struct _TestData +{ + BOOL OverrideWndProc; /* TRUE if lpfnWndProc should be overridden */ + LPCSTR ClassName; /* Name of the new class to register */ + DWORD WndExtra; /* Remove these WNDCLASS::cbWndExtra flags */ + BOOL ExpectsHwnd; /* TRUE if a HWND should be created to run tests on */ + LPCSTR ExpectedClassNameBefore; /* Expected class name before any dialog function is called */ + LPCSTR ExpectedClassNameAfter; /* Expected class name after any dialog function is called */ +} TestData; + +static TestData RealClassTestData[] = +{ + { + TRUE, + "OverrideWndProc_with_DLGWINDOWEXTRA_TRUE", + 0, + TRUE, + "OverrideWndProc_with_DLGWINDOWEXTRA_TRUE", + "#32770", + }, + { + TRUE, + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + DLGWINDOWEXTRA, + TRUE, + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + "OverrideWndProc_without_DLGWINDOWEXTRA_TRUE", + }, + { + FALSE, + "DefaultWndProc_with_DLGWINDOWEXTRA_FALSE", + 0, + TRUE, + "#32770", + "#32770", + }, + { + FALSE, + "DefaultWndProc_without_DLGWINDOWEXTRA_FALSE", + DLGWINDOWEXTRA, + FALSE, + "N/A", + "N/A", + }, +}; + +void Test_RealGetWindowClass() +{ + int testNo; + UINT Result; + CHAR Buffer[1024]; + + Result = RealGetWindowClass( NULL, Buffer, ARRAY_SIZE(Buffer) ); + ok(Result == 0, "Result = %d\n", Result); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "GetLastError() = %ld\n", GetLastError()); + + for (testNo = 0; testNo < ARRAY_SIZE(RealClassTestData); testNo++) + { + ATOM atom; + WNDCLASSA cls; + HWND hWnd; + + /* Register classes, "derived" from built-in dialog, with and without the DLGWINDOWEXTRA flag set */ + GetClassInfoA(0, "#32770", &cls); + if (RealClassTestData[testNo].OverrideWndProc) + cls.lpfnWndProc = DefWindowProcA; + cls.lpszClassName = RealClassTestData[testNo].ClassName; + cls.cbWndExtra &= ~RealClassTestData[testNo].WndExtra; + atom = RegisterClassA (&cls); + if (atom == 0) return; + + /* Create a window */ + hWnd = CreateWindowEx( WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | + WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW, + RealClassTestData[testNo].ClassName, + RealClassTestData[testNo].ClassName, + WS_POPUPWINDOW | WS_CLIPSIBLINGS | WS_DLGFRAME | WS_OVERLAPPED | + WS_MINIMIZEBOX | WS_MAXIMIZEBOX | DS_3DLOOK | DS_SETFONT | DS_MODALFRAME, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); + + /* Do we expect a HWND at all? */ + if (RealClassTestData[testNo].ExpectsHwnd) + { + ok(hWnd != NULL, "\n"); + + if (hWnd != NULL) + { + /* Get the "real" class name */ + Result = RealGetWindowClass( hWnd, Buffer, ARRAY_SIZE(Buffer) ); + printf("Buffer: %s\nExpectedClassNameBefore(%d): %s\n", Buffer, testNo, RealClassTestData[testNo].ExpectedClassNameBefore); + ok( Result != 0, "\n" ); + ok( strcmp( Buffer, RealClassTestData[testNo].ExpectedClassNameBefore ) == 0, "\n" ); + + /* Call a function that requires a dialog window */ + DefDlgProcA( hWnd, DM_SETDEFID, IDCANCEL, 0 ); + + /* Get the "real" class name again */ + Result = RealGetWindowClass( hWnd, Buffer, ARRAY_SIZE(Buffer) ); + printf("Buffer: %s\nExpectedClassNameAfter(%d): %s\n", Buffer, testNo, RealClassTestData[testNo].ExpectedClassNameAfter); + ok( Result != 0, "\n" ); + ok( strcmp( Buffer, RealClassTestData[testNo].ExpectedClassNameAfter ) == 0, "\n" ); + } + } + else + { + ok(hWnd == NULL, "\n"); + } + + /* Cleanup */ + DestroyWindow(hWnd); + UnregisterClass(RealClassTestData[testNo].ClassName, 0); + } + +} + +START_TEST(RealGetWindowClass) +{ + Test_RealGetWindowClass(); +} + Propchange: trunk/rostests/apitests/user32/RealGetWindowClass.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollDC.… ============================================================================== --- trunk/rostests/apitests/user32/ScrollDC.c (added) +++ trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,72 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ScrollDC + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_ScrollDC() +{ + HWND hWnd, hWnd2; + HDC hDC; + HRGN hrgn; + RECT rcClip; + int iResult; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 100, 100, + NULL, NULL, 0, 0); + UpdateWindow(hWnd); + hDC = GetDC(hWnd); + + /* Test that no update region is there */ + hrgn = CreateRectRgn(0,0,0,0); + iResult = GetUpdateRgn(hWnd, hrgn, FALSE); + ok (iResult == NULLREGION, "\n"); + + /* Test normal scrolling */ + ok(ScrollDC(hDC, 0, 0, NULL, NULL, hrgn, NULL) == TRUE, "\n"); + + /* Scroll with invalid update region */ + DeleteObject(hrgn); + ok(ScrollDC(hDC, 50, 0, NULL, NULL, hrgn, NULL) == FALSE, "\n"); + hrgn = CreateRectRgn(0,0,0,0); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Scroll with invalid update rect pointer */ + ok(ScrollDC(hDC, 50, 0, NULL, NULL, NULL, (PRECT)1) == 0, "\n"); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Scroll with a clip rect */ + rcClip.left = 50; rcClip.top = 0; rcClip.right = 100; rcClip.bottom = 100; + ok(ScrollDC(hDC, 50, 0, NULL, &rcClip, hrgn, NULL) == TRUE, "\n"); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Scroll with a clip rect */ + rcClip.left = 50; rcClip.top = 0; rcClip.right = 100; rcClip.bottom = 100; + ok(ScrollDC(hDC, 50, 50, NULL, &rcClip, hrgn, NULL) == TRUE, "\n"); + ok(GetUpdateRgn(hWnd, hrgn, FALSE) == NULLREGION, "\n"); + + /* Overlap with another window */ + hWnd2 = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 30, 160, 100, 100, + NULL, NULL, 0, 0); + UpdateWindow(hWnd2); + + /* Cleanup */ + ReleaseDC(hWnd, hDC); + DestroyWindow(hWnd); + DestroyWindow(hWnd2); + +} + +START_TEST(ScrollDC) +{ + Test_ScrollDC(); +} + Propchange: trunk/rostests/apitests/user32/ScrollDC.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollWin… ============================================================================== --- trunk/rostests/apitests/user32/ScrollWindowEx.c (added) +++ trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,63 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ScrollWindowEx + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void Test_ScrollWindowEx() +{ + HWND hWnd; + HRGN hrgn; + int Result; + + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); + UpdateWindow(hWnd); + + /* Assert that no update region is there */ + hrgn = CreateRectRgn(0,0,0,0); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == NULLREGION, "Result = %d\n", Result); + + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, NULL, 0); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == NULLREGION, "Result = %d\n", Result); + + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, NULL, SW_INVALIDATE); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + UpdateWindow(hWnd); + + // test invalid update region + DeleteObject(hrgn); + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, hrgn, NULL, SW_INVALIDATE); + ok(Result == ERROR, "Result = %d\n", Result); + hrgn = CreateRectRgn(0,0,0,0); + UpdateWindow(hWnd); + + // Test invalid updaterect pointer + Result = ScrollWindowEx(hWnd, 20, 0, NULL, NULL, NULL, (LPRECT)1, SW_INVALIDATE); + ok(Result == ERROR, "Result = %d\n", Result); + Result = GetUpdateRgn(hWnd, hrgn, FALSE); + ok(Result == SIMPLEREGION, "Result = %d\n", Result); + +// test for alignment of rects + + DeleteObject(hrgn); + DestroyWindow(hWnd); +} + +START_TEST(ScrollWindowEx) +{ + Test_ScrollWindowEx(); +} + Propchange: trunk/rostests/apitests/user32/ScrollWindowEx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c (added) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,24 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_InitializeLpkHooks(void); +extern void func_RealGetWindowClass(void); +extern void func_ScrollDC(void); +extern void func_ScrollWindowEx(void); +extern void func_GetSystemMetrics(void); + +const struct test winetest_testlist[] = +{ + { "InitializeLpkHooks", func_InitializeLpkHooks }, + { "RealGetWindowClass", func_RealGetWindowClass }, + { "ScrollDC", func_ScrollDC }, + { "ScrollWindowEx", func_ScrollWindowEx }, + { "GetSystemMetrics", func_GetSystemMetrics }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/user32/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild (added) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Wed Aug 25 08:50:10 2010 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="user32_apitest" type="win32cui" installbase="bin" installname="user32_apitest.exe"> + <include base="user32_apitest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>InitializeLpkHooks.c</file> + <file>RealGetWindowClass.c</file> + <file>ScrollDC.c</file> + <file>ScrollWindowEx.c</file> + <file>GetSystemMetrics.c</file> + +</module> +</group> Propchange: trunk/rostests/apitests/user32/user32_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 48619: [APITESTS] Convert dciman32api, user32api and wa2_32 into wine style tests
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 08:48:55 2010 New Revision: 48619 URL: http://svn.reactos.org/svn/reactos?rev=48619&view=rev Log: [APITESTS] Convert dciman32api, user32api and wa2_32 into wine style tests Added: trunk/rostests/apitests/ws2_32/ioctlsocket.c (with props) trunk/rostests/apitests/ws2_32/recv.c (with props) trunk/rostests/apitests/ws2_32/ws2_32_apitest.rbuild (with props) Removed: trunk/rostests/apitests/dciman32api/ trunk/rostests/apitests/user32api/ trunk/rostests/apitests/ws2_32/tests/ trunk/rostests/apitests/ws2_32/ws2_32.c trunk/rostests/apitests/ws2_32/ws2_32.rbuild Modified: trunk/rostests/apitests/directory.rbuild trunk/rostests/apitests/ws2_32/helpers.c trunk/rostests/apitests/ws2_32/testlist.c trunk/rostests/apitests/ws2_32/ws2_32.h Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -6,16 +6,16 @@ <file>apitest.c</file> </module> - <directory name="dciman32api"> - <xi:include href="dciman32api/dciman32api.rbuild" /> + <directory name="dciman32"> + <xi:include href="dciman32/dciman32_apitest.rbuild" /> </directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32_apitest.rbuild" /> </directory> - <directory name="user32api"> - <xi:include href="user32api/user32api.rbuild" /> + <directory name="user32"> + <xi:include href="user32/user32_apitest.rbuild" /> </directory> <if property="ARCH" value="i386"> @@ -29,6 +29,6 @@ </if> <directory name="ws2_32"> - <xi:include href="ws2_32/ws2_32.rbuild" /> + <xi:include href="ws2_32/ws2_32_apitest.rbuild" /> </directory> </group> Modified: trunk/rostests/apitests/ws2_32/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/helpers.c… ============================================================================== --- trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/helpers.c [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -6,25 +6,27 @@ * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> */ +#include <stdio.h> +#include <wine/test.h> #include "ws2_32.h" -int CreateSocket(PTESTINFO pti, SOCKET* psck) +int CreateSocket(SOCKET* psck) { /* Create the socket */ *psck = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - TEST(*psck != INVALID_SOCKET); + ok(*psck != INVALID_SOCKET, "*psck = %d\n", *psck); if(*psck == INVALID_SOCKET) { printf("Winsock error code is %u\n", WSAGetLastError()); WSACleanup(); - return APISTATUS_ASSERTION_FAILED; + return 0; } - return APISTATUS_NORMAL; + return 1; } -int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck) +int ConnectToReactOSWebsite(SOCKET sck) { int iResult; struct hostent* host; @@ -38,11 +40,11 @@ sa.sin_port = htons(80); SCKTEST(connect(sck, (struct sockaddr *)&sa, sizeof(sa))); - - return APISTATUS_NORMAL; + + return 1; } -int GetRequestAndWait(PTESTINFO pti, SOCKET sck) +int GetRequestAndWait(SOCKET sck) { const char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; int iResult; @@ -50,7 +52,7 @@ /* Send the GET request */ SCKTEST(send(sck, szGetRequest, strlen(szGetRequest), 0)); - TEST(iResult == strlen(szGetRequest)); + ok(iResult == strlen(szGetRequest), "iResult = %d\n", iResult); /* Shutdown the SEND connection */ SCKTEST(shutdown(sck, SD_SEND)); @@ -60,6 +62,6 @@ FD_SET(sck, &readable); SCKTEST(select(0, &readable, NULL, NULL, NULL)); - - return APISTATUS_NORMAL; + + return 1; } Added: trunk/rostests/apitests/ws2_32/ioctlsocket.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ioctlsock… ============================================================================== --- trunk/rostests/apitests/ws2_32/ioctlsocket.c (added) +++ trunk/rostests/apitests/ws2_32/ioctlsocket.c [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -1,0 +1,98 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ioctlsocket + * PROGRAMMERS: Colin Finck + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "ws2_32.h" + +int Test_ioctlsocket() +{ + LPSTR pszBuf; + int iResult; + SOCKET sck; + ULONG BytesAvailable; + ULONG BytesToRead; + WSADATA wdata; + + /* Start up Winsock */ + iResult = WSAStartup(MAKEWORD(2, 2), &wdata); + ok(iResult == 0, "WSAStartup failed. iResult = %d\n", iResult); + + /* If we call ioctlsocket without a socket, it should return with an error and do nothing. */ + BytesAvailable = 0xdeadbeef; + iResult = ioctlsocket(0, FIONREAD, &BytesAvailable); + ok(iResult == SOCKET_ERROR, "iResult = %d\n", iResult); + ok(BytesAvailable == 0xdeadbeef, "BytesAvailable = %ld\n", BytesAvailable); + + /* Create the socket */ + if (!CreateSocket(&sck)) + { + ok(0, "CreateSocket failed. Aborting test.\n"); + return 0; + } + + /* Now we can pass at least a socket, but we have no connection yet. The function should return 0. */ + BytesAvailable = 0xdeadbeef; + iResult = ioctlsocket(sck, FIONREAD, &BytesAvailable); + ok(iResult == 0, "iResult = %d\n", iResult); + ok(BytesAvailable == 0, "BytesAvailable = %ld\n", BytesAvailable); + + /* Connect to "www.reactos.org" */ + if (!ConnectToReactOSWebsite(sck)) + { + ok(0, "ConnectToReactOSWebsite failed. Aborting test.\n"); + return 0; + } + + /* Even with a connection, there shouldn't be any bytes available. */ + iResult = ioctlsocket(sck, FIONREAD, &BytesAvailable); + ok(iResult == 0, "iResult = %d\n", iResult); + ok(BytesAvailable == 0, "BytesAvailable = %ld\n", BytesAvailable); + + /* Send the GET request */ + if (!GetRequestAndWait(sck)) + { + ok(0, "GetRequestAndWait failed. Aborting test.\n"); + return 0; + } + + /* Try ioctlsocket with FIONREAD. There should be bytes available now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + ok(BytesAvailable != 0, "BytesAvailable = %ld\n", BytesAvailable); + + /* Get half of the data */ + BytesToRead = BytesAvailable / 2; + pszBuf = (LPSTR) HeapAlloc(GetProcessHeap(), 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(GetProcessHeap(), 0, pszBuf); + + BytesToRead = BytesAvailable - BytesToRead; + + /* Now try ioctlsocket again. BytesAvailable should be at the value saved in BytesToRead now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + ok(BytesAvailable == BytesToRead, "BytesAvailable = %ld\n", BytesAvailable); + + /* Read those bytes */ + pszBuf = (LPSTR) HeapAlloc(GetProcessHeap(), 0, BytesToRead); + SCKTEST(recv(sck, pszBuf, BytesToRead, 0)); + HeapFree(GetProcessHeap(), 0, pszBuf); + + /* Try it for the last time. BytesAvailable should be at 0 now. */ + SCKTEST(ioctlsocket(sck, FIONREAD, &BytesAvailable)); + ok(BytesAvailable == 0, "BytesAvailable = %ld\n", BytesAvailable); + + closesocket(sck); + WSACleanup(); + return 1; +} + +START_TEST(ioctlsocket) +{ + Test_ioctlsocket(); +} + Propchange: trunk/rostests/apitests/ws2_32/ioctlsocket.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ws2_32/recv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/recv.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/recv.c (added) +++ trunk/rostests/apitests/ws2_32/recv.c [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -1,0 +1,85 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for recv + * PROGRAMMERS: Colin Finck + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "ws2_32.h" + +#define RECV_BUF 4 + +/* For valid test results, the ReactOS Website needs to return at least 8 bytes on a "GET / HTTP/1.0" request. + Also the first 4 bytes and the last 4 bytes need to be different. + Both factors usually apply on standard HTTP responses. */ + +int Test_recv() +{ + const char szDummyBytes[RECV_BUF] = {0xFF, 0x00, 0xFF, 0x00}; + + char szBuf1[RECV_BUF]; + char szBuf2[RECV_BUF]; + int iResult; + SOCKET sck; + WSADATA wdata; + + /* Start up Winsock */ + iResult = WSAStartup(MAKEWORD(2, 2), &wdata); + ok(iResult == 0, "WSAStartup failed, iResult == %d\n", iResult); + + /* If we call recv without a socket, it should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + iResult = recv(0, szBuf1, RECV_BUF, 0); + ok(iResult == SOCKET_ERROR, "iRseult = %d\n", iResult); + ok(!memcmp(szBuf1, szDummyBytes, RECV_BUF), "not equal\n"); + + /* Create the socket */ + if (!CreateSocket(&sck)) + { + ok(0, "CreateSocket failed. Aborting test.\n"); + return 0; + } + + /* Now we can pass at least a socket, but we have no connection yet. Should return with an error and do nothing. */ + memcpy(szBuf1, szDummyBytes, RECV_BUF); + iResult = recv(sck, szBuf1, RECV_BUF, 0); + ok(iResult == SOCKET_ERROR, "iResult = %d\n", iResult); + ok(!memcmp(szBuf1, szDummyBytes, RECV_BUF), "not equal\n"); + + /* Connect to "www.reactos.org" */ + if (!ConnectToReactOSWebsite(sck)) + { + ok(0, "ConnectToReactOSWebsite failed. Aborting test.\n"); + return 0; + } + + /* Send the GET request */ + if (!GetRequestAndWait(sck)) + { + ok(0, "GetRequestAndWait failed. Aborting test.\n"); + return 0; + } + + /* Receive the data. + MSG_PEEK will not change the internal number of bytes read, so that a subsequent request should return the same bytes again. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, MSG_PEEK)); + SCKTEST(recv(sck, szBuf2, RECV_BUF, 0)); + ok(!memcmp(szBuf1, szBuf2, RECV_BUF), "not equal\n"); + + /* The last recv() call moved the internal file pointer, so that the next request should return different data. */ + SCKTEST(recv(sck, szBuf1, RECV_BUF, 0)); + ok(memcmp(szBuf1, szBuf2, RECV_BUF), "equal\n"); + + closesocket(sck); + WSACleanup(); + return 1; +} + +START_TEST(recv) +{ + Test_recv(); +} + Propchange: trunk/rostests/apitests/ws2_32/recv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -1,33 +1,18 @@ -/* - * PROJECT: ws2_32.dll API tests - * LICENSE: GPLv2 or any later version - * FILE: apitests/ws2_32/testlist.c - * PURPOSE: Test list file - * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> - */ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> -#ifndef _WS2_32_TESTLIST_H -#define _WS2_32_TESTLIST_H +#define STANDALONE +#include "wine/test.h" -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +extern void func_ioctlsocket(void); +extern void func_recv(void); -#include "ws2_32.h" +const struct test winetest_testlist[] = +{ + { "ioctlsocket", func_ioctlsocket }, + { "recv", func_recv }, -/* include the tests */ -#include "tests/ioctlsocket.c" -#include "tests/recv.c" - -/* The List of tests */ -TESTENTRY TestList[] = -{ - { L"ioctlsocket", Test_ioctlsocket }, - { L"recv", Test_recv } + { 0, 0 } }; -/* The function that gives us the number of tests */ -INT NumTests(void) -{ - return ARRAY_SIZE(TestList); -} - -#endif Removed: trunk/rostests/apitests/ws2_32/ws2_32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.c?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/ws2_32.c (removed) @@ -1,24 +1,0 @@ -/* - * PROJECT: ws2_32.dll API tests - * LICENSE: GPLv2 or any later version - * FILE: apitests/ws2_32/ws2_32.c - * PURPOSE: Program entry point - * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> - */ - -#include "ws2_32.h" - -HANDLE g_hHeap; - -BOOL -IsFunctionPresent(LPWSTR lpszFunction) -{ - return TRUE; -} - -int wmain() -{ - g_hHeap = GetProcessHeap(); - - return TestMain(L"ws2_32_apitests", L"ws2_32.dll"); -} Modified: trunk/rostests/apitests/ws2_32/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.h?… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/ws2_32.h [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -11,24 +11,22 @@ #include <winsock2.h> -#include "../apitest.h" - /* Simple macro for executing a socket command and doing cleanup operations in case of a failure */ #define SCKTEST(_cmd_) \ iResult = _cmd_; \ - TEST(iResult != SOCKET_ERROR); \ + ok(iResult != SOCKET_ERROR, "iResult = %d\n", iResult); \ if(iResult == SOCKET_ERROR) \ { \ printf("Winsock error code is %u\n", WSAGetLastError()); \ closesocket(sck); \ WSACleanup(); \ - return APISTATUS_ASSERTION_FAILED; \ + return 0; \ } /* helpers.c */ -int CreateSocket(PTESTINFO pti, SOCKET* sck); -int ConnectToReactOSWebsite(PTESTINFO pti, SOCKET sck); -int GetRequestAndWait(PTESTINFO pti, SOCKET sck); +int CreateSocket(SOCKET* sck); +int ConnectToReactOSWebsite(SOCKET sck); +int GetRequestAndWait(SOCKET sck); /* ws2_32.c */ extern HANDLE g_hHeap; Removed: trunk/rostests/apitests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32.rb… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/ws2_32.rbuild (removed) @@ -1,9 +1,0 @@ -<module name="ws2_32_apitests" type="win32cui" unicode="yes"> - <library>apitest</library> - <library>user32</library> - <library>shell32</library> - <library>ws2_32</library> - <file>helpers.c</file> - <file>testlist.c</file> - <file>ws2_32.c</file> -</module> Added: trunk/rostests/apitests/ws2_32/ws2_32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/ws2_32_ap… ============================================================================== --- trunk/rostests/apitests/ws2_32/ws2_32_apitest.rbuild (added) +++ trunk/rostests/apitests/ws2_32/ws2_32_apitest.rbuild [iso-8859-1] Wed Aug 25 08:48:55 2010 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="ws2_32_apitest" type="win32cui" installbase="bin" installname="ws2_32_apitest.exe"> + <include base="ws2_32_apitest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>pseh</library> + <library>ws2_32</library> + <file>testlist.c</file> + <file>helpers.c</file> + + <file>ioctlsocket.c</file> + <file>recv.c</file> + +</module> +</group> Propchange: trunk/rostests/apitests/ws2_32/ws2_32_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 48618: [FASTFAT] - "Fix for a stupid mistake" - patch by Pierre Schweitzer
by tkreuzer＠svn.reactos.org 25 Aug '10

25 Aug '10

Author: tkreuzer Date: Wed Aug 25 08:29:52 2010 New Revision: 48618 URL: http://svn.reactos.org/svn/reactos?rev=48618&view=rev Log: [FASTFAT] - "Fix for a stupid mistake" - patch by Pierre Schweitzer Modified: trunk/reactos/drivers/filesystems/fastfat/pnp.c Modified: trunk/reactos/drivers/filesystems/fastfat/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/pnp.c [iso-8859-1] Wed Aug 25 08:29:52 2010 @@ -29,6 +29,8 @@ case IRP_MN_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: Status = STATUS_NOT_IMPLEMENTED; + IrpContext->Irp->IoStatus.Status = Status; + IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); break; default: IoSkipCurrentIrpStackLocation(IrpContext->Irp);

1 0

[tkreuzer] 48617: Convert gdi32api into wine style test
by tkreuzer＠svn.reactos.org 24 Aug '10

24 Aug '10

Author: tkreuzer Date: Tue Aug 24 13:54:10 2010 New Revision: 48617 URL: http://svn.reactos.org/svn/reactos?rev=48617&view=rev Log: Convert gdi32api into wine style test Added: trunk/rostests/apitests/gdi32/ (with props) trunk/rostests/apitests/gdi32/AddFontResource.c (with props) trunk/rostests/apitests/gdi32/AddFontResourceEx.c (with props) trunk/rostests/apitests/gdi32/BeginPath.c (with props) trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c (with props) trunk/rostests/apitests/gdi32/CreateCompatibleDC.c (with props) trunk/rostests/apitests/gdi32/CreateFont.c (with props) trunk/rostests/apitests/gdi32/CreateFontIndirect.c (with props) trunk/rostests/apitests/gdi32/CreatePen.c (with props) trunk/rostests/apitests/gdi32/CreateRectRgn.c (with props) trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c (with props) trunk/rostests/apitests/gdi32/EngCreateSemaphore.c (with props) trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c (with props) trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c (with props) trunk/rostests/apitests/gdi32/ExtCreatePen.c (with props) trunk/rostests/apitests/gdi32/GdiConvertBitmap.c (with props) trunk/rostests/apitests/gdi32/GdiConvertBrush.c (with props) trunk/rostests/apitests/gdi32/GdiConvertDC.c (with props) trunk/rostests/apitests/gdi32/GdiConvertFont.c (with props) trunk/rostests/apitests/gdi32/GdiConvertPalette.c (with props) trunk/rostests/apitests/gdi32/GdiConvertRegion.c (with props) trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c (with props) trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c (with props) trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c (with props) trunk/rostests/apitests/gdi32/GdiGetLocalDC.c (with props) trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c (with props) trunk/rostests/apitests/gdi32/GdiSetAttrs.c (with props) trunk/rostests/apitests/gdi32/GetClipRgn.c (with props) trunk/rostests/apitests/gdi32/GetCurrentObject.c (with props) trunk/rostests/apitests/gdi32/GetDIBits.c (with props) trunk/rostests/apitests/gdi32/GetObject.c (with props) trunk/rostests/apitests/gdi32/GetStockObject.c (with props) trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c (with props) trunk/rostests/apitests/gdi32/GetTextFace.c (with props) trunk/rostests/apitests/gdi32/SelectObject.c (with props) trunk/rostests/apitests/gdi32/SetDCPenColor.c (with props) trunk/rostests/apitests/gdi32/SetMapMode.c (with props) trunk/rostests/apitests/gdi32/SetSysColors.c (with props) trunk/rostests/apitests/gdi32/SetWindowExtEx.c (with props) trunk/rostests/apitests/gdi32/SetWorldTransform.c (with props) trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild (with props) trunk/rostests/apitests/gdi32/testlist.c (with props) Removed: trunk/rostests/apitests/gdi32api/ Modified: trunk/rostests/apitests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… Added: trunk/rostests/apitests/gdi32/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… Added: trunk/rostests/apitests/gdi32/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… Added: trunk/rostests/apitests/gdi32/BeginPath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/BeginPath.… Added: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… Added: trunk/rostests/apitests/gdi32/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateComp… Added: trunk/rostests/apitests/gdi32/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont… Added: trunk/rostests/apitests/gdi32/CreateFontIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont… Added: trunk/rostests/apitests/gdi32/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.… Added: trunk/rostests/apitests/gdi32/CreateRectRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateRect… Added: trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngAcquire… Added: trunk/rostests/apitests/gdi32/EngCreateSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngCreateS… Added: trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngDeleteS… Added: trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngRelease… Added: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… Added: trunk/rostests/apitests/gdi32/GdiConvertBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… Added: trunk/rostests/apitests/gdi32/GdiConvertBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… Added: trunk/rostests/apitests/gdi32/GdiConvertDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… Added: trunk/rostests/apitests/gdi32/GdiConvertFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… Added: trunk/rostests/apitests/gdi32/GdiConvertPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… Added: trunk/rostests/apitests/gdi32/GdiConvertRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… Added: trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiDeleteL… Added: trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetChar… Added: trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca… Added: trunk/rostests/apitests/gdi32/GdiGetLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca… Added: trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiRelease… Added: trunk/rostests/apitests/gdi32/GdiSetAttrs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiSetAttr… Added: trunk/rostests/apitests/gdi32/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipRgn… Added: trunk/rostests/apitests/gdi32/GetCurrentObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent… Added: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… Added: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… Added: trunk/rostests/apitests/gdi32/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb… Added: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt… Added: trunk/rostests/apitests/gdi32/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac… Added: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… Added: trunk/rostests/apitests/gdi32/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo… Added: trunk/rostests/apitests/gdi32/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode… Added: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… Added: trunk/rostests/apitests/gdi32/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE… Added: trunk/rostests/apitests/gdi32/SetWorldTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWorldTr… Added: trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/gdi32_apit… Added: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c…

1 0

[tkreuzer] 48616: Fix copy paste error in file header
by tkreuzer＠svn.reactos.org 24 Aug '10

24 Aug '10

Author: tkreuzer Date: Tue Aug 24 05:27:39 2010 New Revision: 48616 URL: http://svn.reactos.org/svn/reactos?rev=48616&view=rev Log: Fix copy paste error in file header Modified: trunk/rostests/regtests/bugs/bug3481.c Modified: trunk/rostests/regtests/bugs/bug3481.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/bugs/bug3481.c?r… ============================================================================== --- trunk/rostests/regtests/bugs/bug3481.c [iso-8859-1] (original) +++ trunk/rostests/regtests/bugs/bug3481.c [iso-8859-1] Tue Aug 24 05:27:39 2010 @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS CRT regression tests + * PROJECT: ReactOS bug regression tests * LICENSE: GPL - See COPYING in the top level directory - * FILE: rostests/regtests/crt/time.c + * FILE: rostests/regtests/bugs/bug3481.c * PURPOSE: Test for bug 3481 * PROGRAMMERS: Timo Kreuzer */

1 0

[tkreuzer] 48615: [REGTESTS] Add bugs_regtest. This can be used to create testcases / regression tests for already fixed bugs. I added a first test for bug 3481
by tkreuzer＠svn.reactos.org 24 Aug '10

24 Aug '10

Author: tkreuzer Date: Tue Aug 24 05:20:16 2010 New Revision: 48615 URL: http://svn.reactos.org/svn/reactos?rev=48615&view=rev Log: [REGTESTS] Add bugs_regtest. This can be used to create testcases / regression tests for already fixed bugs. I added a first test for bug 3481 Added: trunk/rostests/regtests/bugs/ (with props) trunk/rostests/regtests/bugs/bug3481.c (with props) trunk/rostests/regtests/bugs/bugs_regtest.rbuild (with props) trunk/rostests/regtests/bugs/testlist.c (with props) Modified: trunk/rostests/regtests/directory.rbuild Propchange: trunk/rostests/regtests/bugs/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 24 05:20:16 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/regtests/bugs/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/regtests/bugs/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/regtests/bugs/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/regtests/bugs/bug3481.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/bugs/bug3481.c?r… ============================================================================== --- trunk/rostests/regtests/bugs/bug3481.c (added) +++ trunk/rostests/regtests/bugs/bug3481.c [iso-8859-1] Tue Aug 24 05:20:16 2010 @@ -1,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT regression tests + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rostests/regtests/crt/time.c + * PURPOSE: Test for bug 3481 + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +#define COUNT 26 + +void Test_bug3481() +{ + const char text[COUNT] = "abcdefghijklmnopqrstuvmxyz"; + WORD agi[COUNT]; + INT i, aiWidth1[COUNT], aiWidth2[COUNT]; + BOOL result; + HDC hdc; + SIZE size1, size2; + + /* Create a DC */ + hdc = CreateCompatibleDC(NULL); + + SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); + + /* Convert the charcaters into glyph indices */ + result = GetGlyphIndicesA(hdc, text, COUNT, agi, 0); + ok(result != 0, "result=%d, GetLastError()=%ld\n", result, GetLastError()); + + /* Get the size of the string */ + result = GetTextExtentPoint32A(hdc, text, COUNT, &size1); + ok(result != 0, "result=%d, GetLastError()=%ld\n", result, GetLastError()); + + /* Get the size from glyph indices */ + result = GetTextExtentPointI(hdc, agi, COUNT, &size2); + ok(result != 0, "result=%d, GetLastError()=%ld\n", result, GetLastError()); + + /* Compare sizes */ + ok(size1.cx == size2.cx, "Sizes don't match. size1.cx=%ld, size2.cx=%ld\n", size1.cx, size2.cx); + ok(size1.cy == size2.cy, "Sizes don't match. size1.cy=%ld, size2.cy=%ld\n", size1.cy, size2.cy); + + /* Get the size of the string */ + result = GetTextExtentExPointA(hdc, text, COUNT, MAXLONG, NULL, aiWidth1, &size1); + ok(result != 0, "result=%d, GetLastError()=%ld\n", result, GetLastError()); + + /* Get the size from glyph indices */ + result = GetTextExtentExPointI(hdc, agi, COUNT, MAXLONG, NULL, aiWidth2, &size2); + ok(result != 0, "result=%d, GetLastError()=%ld\n", result, GetLastError()); + + /* Compare sizes */ + ok(size1.cx == size2.cx, "Sizes don't match. size1.cx=%ld, size2.cx=%ld\n", size1.cx, size2.cx); + ok(size1.cy == size2.cy, "Sizes don't match. size1.cy=%ld, size2.cy=%ld\n", size1.cy, size2.cy); + + /* Loop all characters */ + for (i = 0; i < COUNT; i++) + { + /* Check if we got identical spacing values */ + ok(aiWidth1[i] == aiWidth2[i], "wrong spacing, i=%d, char:%d, index:%d\n", i, aiWidth1[i], aiWidth2[i]); + } + + /* Cleanup */ + DeleteDC(hdc); +} + +START_TEST(bug3481) +{ + Test_bug3481(); +} + Propchange: trunk/rostests/regtests/bugs/bug3481.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/regtests/bugs/bugs_regtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/bugs/bugs_regtes… ============================================================================== --- trunk/rostests/regtests/bugs/bugs_regtest.rbuild (added) +++ trunk/rostests/regtests/bugs/bugs_regtest.rbuild [iso-8859-1] Tue Aug 24 05:20:16 2010 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="bugs_regtest" type="win32cui" installbase="bin" installname="bugs_regtest.exe"> + <include base="bugs_regtest">.</include> + <library>wine</library> + <library>gdi32</library> + <file>testlist.c</file> + + <file>bug3481.c</file> +</module> +</group> Propchange: trunk/rostests/regtests/bugs/bugs_regtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/regtests/bugs/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/bugs/testlist.c?… ============================================================================== --- trunk/rostests/regtests/bugs/testlist.c (added) +++ trunk/rostests/regtests/bugs/testlist.c [iso-8859-1] Tue Aug 24 05:20:16 2010 @@ -1,0 +1,17 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_bug3481(void); + +const struct test winetest_testlist[] = +{ + { "bug3481", func_bug3481 }, + { 0, 0 } +}; + Propchange: trunk/rostests/regtests/bugs/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/regtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/directory.rbuild… ============================================================================== --- trunk/rostests/regtests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/regtests/directory.rbuild [iso-8859-1] Tue Aug 24 05:20:16 2010 @@ -7,4 +7,7 @@ <directory name="crt"> <xi:include href="crt/crt_regtest.rbuild" /> </directory> + <directory name="bugs"> + <xi:include href="bugs/bugs_regtest.rbuild" /> + </directory> </group>

1 0

[tkreuzer] 48614: [WINGDI.H] Add missing GetCharWidthI, GetTextExtentExPointI, GetTextExtentPointI
by tkreuzer＠svn.reactos.org 24 Aug '10

24 Aug '10

Author: tkreuzer Date: Tue Aug 24 05:19:31 2010 New Revision: 48614 URL: http://svn.reactos.org/svn/reactos?rev=48614&view=rev Log: [WINGDI.H] Add missing GetCharWidthI, GetTextExtentExPointI, GetTextExtentPointI Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Aug 24 05:19:31 2010 @@ -3022,6 +3022,7 @@ BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT); BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT); BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT); +BOOL WINAPI GetCharWidthI(HDC,UINT,UINT,LPWORD,LPINT); BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT); BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT); int WINAPI GetClipBox(HDC,LPRECT); @@ -3097,9 +3098,11 @@ int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); COLORREF WINAPI GetTextColor(HDC); BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE); -BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ); +BOOL WINAPI GetTextExtentExPointW(HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); +BOOL WINAPI GetTextExtentExPointI(HDC,LPWORD,int,int,LPINT,LPINT,LPSIZE); BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,int,LPSIZE); BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,int,LPSIZE); +BOOL WINAPI GetTextExtentPointI(HDC,LPWORD,int,LPSIZE); BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE); BOOL WINAPI GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE); int WINAPI GetTextFaceA(HDC,int,LPSTR);

1 0

[akhaldi] 48613: [CMAKE] - Add mciseq, mciwave, mmdrv, modemui, mpr, mprapi, msadp32.acm, msafd and mscms to build. - Fixed mpr resource files (should be submitted upstream).
by akhaldi＠svn.reactos.org 23 Aug '10

23 Aug '10

Author: akhaldi Date: Mon Aug 23 22:23:02 2010 New Revision: 48613 URL: http://svn.reactos.org/svn/reactos?rev=48613&view=rev Log: [CMAKE] - Add mciseq, mciwave, mmdrv, modemui, mpr, mprapi, msadp32.acm, msafd and mscms to build. - Fixed mpr resource files (should be submitted upstream). Added: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/mpr_Bg.rc branches/cmake-bringup/dll/win32/mpr/mpr_Cs.rc branches/cmake-bringup/dll/win32/mpr/mpr_Da.rc branches/cmake-bringup/dll/win32/mpr/mpr_De.rc branches/cmake-bringup/dll/win32/mpr/mpr_En.rc branches/cmake-bringup/dll/win32/mpr/mpr_Es.rc branches/cmake-bringup/dll/win32/mpr/mpr_Fr.rc branches/cmake-bringup/dll/win32/mpr/mpr_Hu.rc branches/cmake-bringup/dll/win32/mpr/mpr_It.rc branches/cmake-bringup/dll/win32/mpr/mpr_Ja.rc branches/cmake-bringup/dll/win32/mpr/mpr_Ko.rc branches/cmake-bringup/dll/win32/mpr/mpr_Lt.rc branches/cmake-bringup/dll/win32/mpr/mpr_Nl.rc branches/cmake-bringup/dll/win32/mpr/mpr_No.rc branches/cmake-bringup/dll/win32/mpr/mpr_Pl.rc branches/cmake-bringup/dll/win32/mpr/mpr_Pt.rc branches/cmake-bringup/dll/win32/mpr/mpr_Ro.rc branches/cmake-bringup/dll/win32/mpr/mpr_Ru.rc branches/cmake-bringup/dll/win32/mpr/mpr_Si.rc branches/cmake-bringup/dll/win32/mpr/mpr_Sv.rc branches/cmake-bringup/dll/win32/mpr/mpr_Tr.rc branches/cmake-bringup/dll/win32/mpr/mpr_Uk.rc branches/cmake-bringup/dll/win32/mpr/mpr_Zh.rc Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -45,5 +45,14 @@ add_subdirectory(mciavi32) add_subdirectory(mcicda) add_subdirectory(mciqtz32) +add_subdirectory(mciseq) +add_subdirectory(mciwave) +add_subdirectory(mmdrv) +add_subdirectory(modemui) +add_subdirectory(mpr) +add_subdirectory(mprapi) +add_subdirectory(msadp32.acm) +add_subdirectory(msafd) +add_subdirectory(mscms) add_subdirectory(msvcrt) add_subdirectory(user32) Added: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… ============================================================================== --- branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,21 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mciseq ${CMAKE_CURRENT_SOURCE_DIR}/mciseq.spec ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def) + +add_library(mciseq SHARED mcimidi.c) + +set_target_properties(mciseq PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(mciseq + ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def + wine + -lwinmm + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a) + +add_dependencies(mciseq mciseq_def psdk) Propchange: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… ============================================================================== --- branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,24 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_WINE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mciwave ${CMAKE_CURRENT_SOURCE_DIR}/mciwave.spec ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def) + +add_library(mciwave SHARED mciwave.c) + +set_target_properties(mciwave PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(mciwave + ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def + wine + -lwinmm + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(mciwave mciwave_def psdk) Propchange: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,26 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DNDEBUG) +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(mmdrv ${CMAKE_CURRENT_SOURCE_DIR}/mmdrv.spec ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) + +add_library(mmdrv SHARED + entry.c + mme.c + kernel.c + session.c + common.c + wave.c + wave_io.c) + +set_target_properties(mmdrv PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(mmdrv + ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + +add_dependencies(mmdrv mmdrv_def psdk) Propchange: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUNICODE -D_UNICODE) + +spec2def(modemui ${CMAKE_CURRENT_SOURCE_DIR}/modemui.spec ${CMAKE_CURRENT_BINARY_DIR}/modemui.def) + +add_library(modemui SHARED modemui.c modemui.rc) + +set_target_properties(modemui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(modemui + ${CMAKE_CURRENT_BINARY_DIR}/modemui.def + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a) + +add_dependencies(modemui modemui_def psdk) Propchange: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,29 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) +add_definitions(-D_WINE) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mpr ${CMAKE_CURRENT_SOURCE_DIR}/mpr.spec ${CMAKE_CURRENT_BINARY_DIR}/mpr.def) + +add_library(mpr SHARED + auth.c + mpr_main.c + multinet.c + nps.c + pwcache.c + wnet.c + mpr.rc) + +set_target_properties(mpr PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mpr + ${CMAKE_CURRENT_BINARY_DIR}/mpr.def + wine + mingw_common + -ladvapi32 + -luser32) + +add_dependencies(mpr mpr_def psdk) Propchange: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Bg.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Bg.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Ïîòðåáèòåë", -1, 40, 66, 50, 10 LTEXT "Ïàðîëà", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Cs.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Cs.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -40,8 +40,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Uivatel", -1, 40, 66, 50, 10 LTEXT "Heslo", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Uloit toto heslo (Není bezpeèné) ?", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Da.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Brugernavn", -1, 40, 66, 50, 10 LTEXT "Kodeord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Gem dette ko&deord (usikkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_De.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_De.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -39,8 +39,8 @@ /* LTEXT "Bereich", -1, 40, 46, 50, 10 */ LTEXT "Benutzername", -1, 40, 66, 50, 10 LTEXT "Kennwort", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Dieses Kennwort speichern (unsicher)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_En.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "User", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Save this password (Insecure)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Es.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Es.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Usuario", -1, 40, 66, 50, 10 LTEXT "Contraseña", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Guardar esta contraseña (Inseguro)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Fr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Fr.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -41,8 +41,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Utilisateur", -1, 10, 68, 45, 10 LTEXT "Mot de passe", -1, 10, 88, 45, 10 - LTEXT "" IDC_PROXY, 56, 32, 144, 14, 0 - LTEXT "" IDC_REALM, 56, 46, 144, 14, 0 + LTEXT "", IDC_PROXY, 56, 32, 144, 14, 0 + LTEXT "", IDC_REALM, 56, 46, 144, 14, 0 EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Enregistrer ce mot de passe (risquÃ©)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Hu.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Hu.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Felhasználónév", -1, 40, 66, 50, 10 LTEXT "Jelszó", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Jelszó mentése (nem biztonságos)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_It.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_It.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -38,8 +38,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Utente", -1, 40, 66, 50, 10 LTEXT "Password", -1, 40, 86, 50, 10 -LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 -LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 +LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 +LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Memorizza la password ( RISCHIOSO! )", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -40,8 +40,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "ã¦ã¼ã¶ã¼å", -1, 40, 66, 50, 10 LTEXT "ãã¹ã¯ã¼ã", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ãã¹ã¯ã¼ããä¿åãã(&S)(ã»ãã¥ã¢ã§ã¯ããã¾ãã)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -38,8 +38,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "»ç¿ëÀÚ", -1, 40, 66, 50, 10 LTEXT "¾ÏÈ£", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "¾ÏÈ£ ÀúÀå(&S) (º¸¾È¿¡ ÁÖÀÇ)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Lt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Lt.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -40,8 +40,8 @@ /* LTEXT "Sritis", -1, 40, 46, 50, 10 */ LTEXT "Naudotojas", -1, 40, 66, 50, 10 LTEXT "SlaptaÅ¾odis", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Ä®&raÅ¡yti Å¡Ä¯ slaptaÅ¾odÄ¯ (nesaugu)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Nl.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -38,8 +38,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Gebruiker", -1, 40, 66, 50, 10 LTEXT "Wachtwoord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Sla dit wachtwoord op (Onveilig)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_No.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Område", -1, 40, 46, 50, 10 */ LTEXT "Bruker", -1, 40, 66, 50, 10 LTEXT "Passord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Lagre dette pa&ssordet (usikkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Pl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Pl.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -38,8 +38,8 @@ /* LTEXT "Obszar", -1, 40, 46, 50, 10 */ LTEXT "U¿ytkownik", -1, 40, 66, 50, 10 LTEXT "Has³o", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Zapisz to has³o (niebezpieczne)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Pt.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -43,8 +43,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Salvar esta senha (Inseguro)", IDC_SAVEPASSWORD, @@ -65,8 +65,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Utilizador", -1, 40, 66, 50, 10 LTEXT "Senha", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ LTEXT "Proxy", -1, 40, 26, 50, 10 LTEXT "Utilizator", -1, 40, 66, 50, 10 LTEXT "ParolÄ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&SalveazÄ aceastÄ parolÄ (nesigur)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Ru.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -40,8 +40,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "ÐÐ¼Ñ", -1, 40, 66, 50, 10 LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾!)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Si.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Si.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -39,8 +39,8 @@ /* LTEXT "Kraljestvo", -1, 40, 46, 50, 10 */ LTEXT "UporabniÅ¡ko ime", -1, 40, 66, 50, 10 LTEXT "Geslo", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Användare", -1, 40, 66, 50, 10 LTEXT "Lösenord", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&Spara detta lösenord (osäkert)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Tr.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Tr.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -37,8 +37,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "Kullanýcý", -1, 40, 66, 50, 10 LTEXT "Parola", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "Bu parolayý &sakla (Güvensiz)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -41,8 +41,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ", -1, 40, 66, 50, 10 LTEXT "ÐÐ°ÑÐ¾Ð»Ñ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ ÑÐµÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑÐ½Ð¾)", IDC_SAVEPASSWORD, Modified: branches/cmake-bringup/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -40,8 +40,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "ç¨æ·å", -1, 40, 66, 50, 10 LTEXT "å¯ç ", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "ä¿åå¯ç (ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, @@ -67,8 +67,8 @@ /* LTEXT "Realm", -1, 40, 46, 50, 10 */ LTEXT "ç¨æ¶å", -1, 40, 66, 50, 10 LTEXT "å¯ç¢¼", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD CHECKBOX "å²åå¯ç¢¼(ä¸å®å¨)(&S)", IDC_SAVEPASSWORD, Added: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mprapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mprapi ${CMAKE_CURRENT_SOURCE_DIR}/mprapi.spec ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) + +add_library(mprapi SHARED mprapi.c) + +set_target_properties(mprapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mprapi + ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def + wine + mingw_common) + +add_dependencies(mprapi mprapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/mprapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… ============================================================================== --- branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,28 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/msadp32.acm.spec --filename msadp32.acm + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def PROPERTIES GENERATED TRUE) +add_custom_target(msadp32.acm_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def) + +add_library(msadp32.acm SHARED msadp32.c) + +set_target_properties(msadp32.acm PROPERTIES LINK_FLAGS "-Wl,-entry,0" SUFFIX "") + +target_link_libraries(msadp32.acm + ${CMAKE_CURRENT_BINARY_DIR}/msadp32.acm.def + wine + -lwinmm + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(msadp32.acm msadp32.acm_def psdk) Propchange: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/C… ============================================================================== --- branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,32 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-DUNICODE -D_UNICODE) + +include_directories(BEFORE include) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +spec2def(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.spec ${CMAKE_CURRENT_BINARY_DIR}/msafd.def) + +list(APPEND SOURCE + msafd.rc + misc/dllmain.c + misc/event.c + misc/helpers.c + misc/sndrcv.c + misc/stubs.c) + +add_library(msafd SHARED + ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch + ${SOURCE}) + +set_target_properties(msafd PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(msafd + ${CMAKE_CURRENT_BINARY_DIR}/msafd.def + -ladvapi32 + -lkernel32 + -lntdll) + +add_pch(msafd ${CMAKE_CURRENT_SOURCE_DIR}/msafd.h ${SOURCE}) +add_dependencies(msafd msafd_def psdk) Propchange: branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mscms/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Mon Aug 23 22:23:02 2010 @@ -1,0 +1,26 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mscms ${CMAKE_CURRENT_SOURCE_DIR}/mscms.spec ${CMAKE_CURRENT_BINARY_DIR}/mscms.def) + +add_library(mscms SHARED + handle.c + icc.c + mscms_main.c + profile.c + stub.c + transform.c + version.rc) + +set_target_properties(mscms PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(mscms + ${CMAKE_CURRENT_BINARY_DIR}/mscms.def + wine + mingw_common) + +add_dependencies(mscms mscms_def psdk) Propchange: branches/cmake-bringup/dll/win32/mscms/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010