marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/tests: Fix system parameters tests compilation with __WINESRC__ defined.

oldstable
Dmitry Timoshkov 2013-10-23 14:54:16 +09:00 committed by Alexandre Julliard
parent 371824fb85
commit c4ec0ed2d6
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dlls/user32/tests/sysparams.c
View File

@ -727,8 +727,8 @@ static BOOL test_setborder(UINT curr_val, int usesetborder, int dpi)
INT frame; INT frame;
NONCLIENTMETRICSA ncm; NONCLIENTMETRICSA ncm;
ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);
rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError());
if( usesetborder) { if( usesetborder) {
rc=SystemParametersInfoA( SPI_SETBORDER, curr_val, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); rc=SystemParametersInfoA( SPI_SETBORDER, curr_val, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE );
@ -752,7 +752,7 @@ static BOOL test_setborder(UINT curr_val, int usesetborder, int dpi)
/* minimum border width is 1 */ /* minimum border width is 1 */
if (curr_val == 0) curr_val = 1; if (curr_val == 0) curr_val = 1;
/* should be the same as the non client metrics */ /* should be the same as the non client metrics */
rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError());
eq( (UINT)ncm.iBorderWidth, curr_val, "NonClientMetric.iBorderWidth", "%d"); eq( (UINT)ncm.iBorderWidth, curr_val, "NonClientMetric.iBorderWidth", "%d");
/* and from SPI_GETBORDER */ /* and from SPI_GETBORDER */
@ -772,12 +772,12 @@ static void test_SPI_SETBORDER( void ) /* 6 */
{ {
BOOL rc; BOOL rc;
UINT old_border; UINT old_border;
NONCLIENTMETRICS ncmsave; NONCLIENTMETRICSA ncmsave;
INT CaptionWidth, INT CaptionWidth,
PaddedBorderWidth; PaddedBorderWidth;
ncmsave.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); ncmsave.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);
rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0);
if( !rc) { if( !rc) {
win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); win_skip("SPI_GETNONCLIENTMETRICS is not available\n");
return; return;
@ -1468,7 +1468,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */
trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n"); trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n");
change_counter = 0; change_counter = 0;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, FALSE ); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmorig, FALSE );
if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS"))
return; return;
Ncmstart = Ncmorig; Ncmstart = Ncmorig;
@ -1516,7 +1516,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */
ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError());
test_change_message( SPI_SETNONCLIENTMETRICS, 1 ); test_change_message( SPI_SETNONCLIENTMETRICS, 1 );
/* get them back */ /* get them back */
rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmcur, FALSE ); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE );
ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError());
/* test registry entries */ /* test registry entries */
TEST_NONCLIENTMETRICS_REG( Ncmcur) TEST_NONCLIENTMETRICS_REG( Ncmcur)
@ -1541,7 +1541,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */
/* raw values are in registry */ /* raw values are in registry */
TEST_NONCLIENTMETRICS_REG( Ncmnew) TEST_NONCLIENTMETRICS_REG( Ncmnew)
/* get them back */ /* get them back */
rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmcur, FALSE ); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE );
ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError());
/* cooked values are returned */ /* cooked values are returned */
expect = max( Ncmnew.iMenuHeight, 2 + get_tmheight( &Ncmnew.lfMenuFont, 1)); expect = max( Ncmnew.iMenuHeight, 2 + get_tmheight( &Ncmnew.lfMenuFont, 1));
@ -1565,7 +1565,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */
/* test the system metrics with these settings */ /* test the system metrics with these settings */
test_GetSystemMetrics(); test_GetSystemMetrics();
/* restore */ /* restore */
rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA),
&Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); &Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
test_change_message( SPI_SETNONCLIENTMETRICS, 0 ); test_change_message( SPI_SETNONCLIENTMETRICS, 0 );
ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError());
@ -2447,7 +2447,7 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */
static void test_WM_DISPLAYCHANGE(void) static void test_WM_DISPLAYCHANGE(void)
{ {
DEVMODE mode, startmode; DEVMODEA mode, startmode;
int start_bpp, last_set_bpp = 0; int start_bpp, last_set_bpp = 0;
int test_bpps[] = {8, 16, 24, 32}, i; int test_bpps[] = {8, 16, 24, 32}, i;
LONG change_ret; LONG change_ret;
@ -2463,10 +2463,10 @@ static void test_WM_DISPLAYCHANGE(void)
memset(&startmode, 0, sizeof(startmode)); memset(&startmode, 0, sizeof(startmode));
startmode.dmSize = sizeof(startmode); startmode.dmSize = sizeof(startmode);
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &startmode); EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &startmode);
start_bpp = startmode.dmBitsPerPel; start_bpp = startmode.dmBitsPerPel;
displaychange_sem = CreateSemaphore(NULL, 0, 1, NULL); displaychange_sem = CreateSemaphoreW(NULL, 0, 1, NULL);
for(i = 0; i < sizeof(test_bpps)/sizeof(test_bpps[0]); i++) { for(i = 0; i < sizeof(test_bpps)/sizeof(test_bpps[0]); i++) {
last_bpp = -1; last_bpp = -1;
@ -2658,37 +2658,37 @@ static void test_GetSystemMetrics( void)
UINT IconSpacing, IconVerticalSpacing; UINT IconSpacing, IconVerticalSpacing;
BOOL rc; BOOL rc;
HDC hdc = CreateIC( "Display", 0, 0, 0); HDC hdc = CreateICA( "Display", 0, 0, 0);
UINT avcwCaption; UINT avcwCaption;
INT CaptionWidthfromreg; INT CaptionWidthfromreg;
MINIMIZEDMETRICS minim; MINIMIZEDMETRICS minim;
NONCLIENTMETRICS ncm; NONCLIENTMETRICSA ncm;
SIZE screen; SIZE screen;
assert(sizeof(ncm) == 344); assert(sizeof(ncm) == 344);
ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);
rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
ok(rc, "SystemParametersInfoA failed\n"); ok(rc, "SystemParametersInfoA failed\n");
ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth) - 1; ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth) - 1;
rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
ok(!rc, "SystemParametersInfoA should fail\n"); ok(!rc, "SystemParametersInfoA should fail\n");
ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth) + 1; ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth) + 1;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
ok(!rc, "SystemParametersInfoA should fail\n"); ok(!rc, "SystemParametersInfoA should fail\n");
ncm.cbSize = sizeof(ncm); /* Vista added padding */ ncm.cbSize = sizeof(ncm); /* Vista added padding */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n"); ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n");
minim.cbSize = sizeof( minim); minim.cbSize = sizeof( minim);
ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);
SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); SystemParametersInfoA( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0);
rc = SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); rc = SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0);
if( !rc) { if( !rc) {
win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); win_skip("SPI_GETNONCLIENTMETRICS is not available\n");
return; return;
@ -2837,14 +2837,14 @@ static void test_GetSystemMetrics( void)
static void test_EnumDisplaySettings(void) static void test_EnumDisplaySettings(void)
{ {
DEVMODE devmode; DEVMODEA devmode;
DWORD val; DWORD val;
HDC hdc; HDC hdc;
DWORD num; DWORD num;
memset(&devmode, 0, sizeof(devmode)); memset(&devmode, 0, sizeof(devmode));
/* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */
EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode);
hdc = GetDC(0); hdc = GetDC(0);
val = GetDeviceCaps(hdc, BITSPIXEL); val = GetDeviceCaps(hdc, BITSPIXEL);
@ -2865,7 +2865,7 @@ static void test_EnumDisplaySettings(void)
num = 1; num = 1;
while (1) { while (1) {
SetLastError (0xdeadbeef); SetLastError (0xdeadbeef);
if (!EnumDisplaySettings(NULL, num++, &devmode)) { if (!EnumDisplaySettingsA(NULL, num++, &devmode)) {
DWORD le = GetLastError(); DWORD le = GetLastError();
ok(le == ERROR_NO_MORE_FILES || ok(le == ERROR_NO_MORE_FILES ||
le == 0xdeadbeef, /* XP, 2003 */ le == 0xdeadbeef, /* XP, 2003 */
@ -2935,8 +2935,8 @@ START_TEST(sysparams)
wc.lpfnWndProc = SysParamsTestWndProc; wc.lpfnWndProc = SysParamsTestWndProc;
wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW; wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
wc.hInstance = hInstance; wc.hInstance = hInstance;
wc.hIcon = LoadIconA( 0, IDI_APPLICATION ); wc.hIcon = LoadIconA( 0, (LPCSTR)IDI_APPLICATION );
wc.hCursor = LoadCursorA( 0, IDC_ARROW ); wc.hCursor = LoadCursorA( 0, (LPCSTR)IDC_ARROW );
wc.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); wc.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 );
wc.lpszMenuName = 0; wc.lpszMenuName = 0;
wc.cbClsExtra = 0; wc.cbClsExtra = 0;