July 2007 - Wine-commits - list.winehq.org

Detlef Riekenberg : setupapi: Avoid crash in SetupCloseInfFile.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 8be4e8537c74a655ac535699eefe8c65a2f6445a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be4e8537c74a655ac535699e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 9 19:31:23 2007 +0200 setupapi: Avoid crash in SetupCloseInfFile. --- dlls/setupapi/parser.c | 2 +- dlls/setupapi/tests/parser.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 6ddc1f2..ea410f8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1231,7 +1231,7 @@ void WINAPI SetupCloseInfFile( HINF hinf ) struct inf_file *file = hinf; unsigned int i; - if (!file) return; + if (!hinf || (hinf == INVALID_HANDLE_VALUE)) return; for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); HeapFree( GetProcessHeap(), 0, file->filename ); diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 2bb493e..2585f6d 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -405,6 +405,11 @@ static void test_close_inf_file(void) SetLastError(0xdeadbeef); SetupCloseInfFile(NULL); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + SetupCloseInfFile(INVALID_HANDLE_VALUE); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", GetLastError()); + } static const char *contents = "[Version]\n"

1 0

Detlef Riekenberg : advpack+setupapi: Remove unneeded checks before SetupCloseInfFile.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 6a95b93ec3abcea468397217822df29d5cda19f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a95b93ec3abcea4683972178… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 9 19:38:59 2007 +0200 advpack+setupapi: Remove unneeded checks before SetupCloseInfFile. --- dlls/advpack/install.c | 3 +-- dlls/setupapi/tests/parser.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index b7e997c..c5a5df0 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -512,8 +512,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, /* release the install instance information */ static void install_release(const ADVInfo *info) { - if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(info->hinf); + SetupCloseInfFile(info->hinf); HeapFree(GetProcessHeap(), 0, info->inf_path); HeapFree(GetProcessHeap(), 0, info->inf_filename); diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 2585f6d..2aaaa5e 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -167,7 +167,7 @@ static void test_invalid_files(void) ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i ); ok( err == 0, "file %u: Error code set to %u\n", i, err ); } - if (hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile( hinf ); + SetupCloseInfFile( hinf ); } }

1 0

Hans Leidekker : pdh: Add an uptime counter source based on GetTickCount.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: bdb218abcb5348e6e8aff62cdcc0d74d23a7224e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb218abcb5348e6e8aff62cd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 9 20:54:48 2007 +0200 pdh: Add an uptime counter source based on GetTickCount. --- dlls/pdh/pdh_main.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index b21391a..f4b8b15 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -150,10 +150,22 @@ struct source LONGLONG base; /* samples per second */ }; +static const WCHAR path_uptime[] = + {'\\','S','y','s','t','e','m', '\\', 'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; + +static void CALLBACK collect_uptime( struct counter *counter ) +{ + counter->two.largevalue = GetTickCount(); /* FIXME */ + counter->status = PDH_CSTATUS_VALID_DATA; +} + +#define TYPE_UPTIME \ + (PERF_SIZE_LARGE | PERF_TYPE_COUNTER | PERF_COUNTER_ELAPSED | PERF_OBJECT_TIMER | PERF_DISPLAY_SECONDS) + /* counter source registry */ static const struct source counter_sources[] = { - { NULL, NULL, 0, 0, 0 } + { path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } }; /***********************************************************************

1 0

Hans Leidekker : pdh: Add tests for Pdh{Add, Remove}Counter and PdhCollectQueryData.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 5dfc2ead8074e14b61135dd5f6aea95f60003ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfc2ead8074e14b61135dd5f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 9 20:55:02 2007 +0200 pdh: Add tests for Pdh{Add, Remove}Counter and PdhCollectQueryData. --- dlls/pdh/tests/pdh.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 872f2a1..f6d6921 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -48,7 +48,55 @@ static void test_open_close_query( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_add_remove_counter( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + + ret = PdhOpenQueryA( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( NULL, "\\System\\System Up Time", 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( NULL, "\\System\\System Up Time", 0, &counter ); + ok(ret == PDH_INVALID_HANDLE, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, NULL, 0, &counter ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Down Time", 0, &counter ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret); + ok(!counter, "PdhAddCounterA failed %p\n", counter); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( counter ); + ok(ret == PDH_INVALID_HANDLE, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( query ); + ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhRemoveCounter( NULL ); + ok(ret == PDH_INVALID_HANDLE, "PdhRemoveCounter failed 0x%08x\n", ret); + + ret = PdhRemoveCounter( counter ); + ok(ret == ERROR_SUCCESS, "PdhRemoveCounter failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + START_TEST(pdh) { test_open_close_query(); + test_add_remove_counter(); }

1 0

Hans Leidekker : pdh: Implement and test PdhSetCounterScaleFactor and PdhGetFormattedCounterValue .
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 0d516c5377bcce2410db0457bd063f76640bd4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d516c5377bcce2410db0457b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 9 20:55:13 2007 +0200 pdh: Implement and test PdhSetCounterScaleFactor and PdhGetFormattedCounterValue. --- dlls/pdh/pdh.spec | 4 +- dlls/pdh/pdh_main.c | 60 +++++++++++++++++++++++++++++++++++ dlls/pdh/tests/pdh.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 42a66ed..6dfc73d 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -57,7 +57,7 @@ @ stub PdhGetDllVersion @ stub PdhGetFormattedCounterArrayA @ stub PdhGetFormattedCounterArrayW -@ stub PdhGetFormattedCounterValue +@ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) @ stub PdhGetLogFileSize @ stub PdhGetLogFileTypeA @ stub PdhGetLogFileTypeW @@ -123,7 +123,7 @@ @ stdcall PdhRemoveCounter(ptr) @ stub PdhSelectDataSourceA @ stub PdhSelectDataSourceW -@ stub PdhSetCounterScaleFactor +@ stdcall PdhSetCounterScaleFactor(ptr long) @ stub PdhSetDefaultRealTimeDataSource @ stub PdhSetLogSetRunID @ stub PdhSetQueryTimeRange diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index f4b8b15..f89493e 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <math.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -283,6 +284,49 @@ PDH_STATUS WINAPI PdhCollectQueryData( PDH_HQUERY handle ) } /*********************************************************************** + * PdhGetFormattedCounterValue (PDH.@) + */ +PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format, + LPDWORD type, PPDH_FMT_COUNTERVALUE value ) +{ + LONG factor; + struct counter *counter = handle; + + TRACE("%p %x %p %p\n", handle, format, type, value); + + if (!value) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_HANDLE; + + if (counter->status) return PDH_INVALID_DATA; + + factor = counter->scale ? counter->scale : counter->defaultscale; + if (format & PDH_FMT_LONG) + { + if (format & PDH_FMT_1000) value->u.longValue = counter->two.longvalue * 1000; + else value->u.longValue = counter->two.longvalue * pow( 10, factor ); + } + else if (format & PDH_FMT_LARGE) + { + if (format & PDH_FMT_1000) value->u.longValue = counter->two.largevalue * 1000; + else value->u.largeValue = counter->two.largevalue * pow( 10, factor ); + } + else if (format & PDH_FMT_DOUBLE) + { + if (format & PDH_FMT_1000) value->u.longValue = counter->two.doublevalue * 1000; + else value->u.doubleValue = counter->two.doublevalue * pow( 10, factor ); + } + else + { + WARN("unknown format %x\n", format); + return PDH_INVALID_ARGUMENT; + } + value->CStatus = ERROR_SUCCESS; + + if (type) *type = counter->type; + return ERROR_SUCCESS; +} + +/*********************************************************************** * PdhOpenQueryA (PDH.@) */ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY *query ) @@ -344,3 +388,19 @@ PDH_STATUS WINAPI PdhRemoveCounter( PDH_HCOUNTER handle ) return ERROR_SUCCESS; } + +/*********************************************************************** + * PdhSetCounterScaleFactor (PDH.@) + */ +PDH_STATUS WINAPI PdhSetCounterScaleFactor( PDH_HCOUNTER handle, LONG factor ) +{ + struct counter *counter = handle; + + TRACE("%p\n", handle); + + if (!counter) return PDH_INVALID_HANDLE; + if (factor < PDH_MIN_SCALE || factor > PDH_MAX_SCALE) return PDH_INVALID_ARGUMENT; + + counter->scale = factor; + return ERROR_SUCCESS; +} diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f6d6921..084fefc 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -95,8 +95,94 @@ static void test_add_remove_counter( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhGetFormattedCounterValue( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + PDH_FMT_COUNTERVALUE value; + + ret = PdhOpenQueryA( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( NULL, PDH_FMT_LARGE, NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( NULL, PDH_FMT_LARGE, NULL, &value ); + ok(ret == PDH_INVALID_HANDLE, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhCollectQueryData( query ); + ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE | PDH_FMT_NOSCALE, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE | PDH_FMT_NOCAP100, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE | PDH_FMT_1000, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( counter, 2 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhGetFormattedCounterValue( counter, PDH_FMT_LARGE, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetFormattedCounterValue failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + +static void test_PdhSetCounterScaleFactor( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + + ret = PdhOpenQueryA( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( NULL, 8 ); + ok(ret == PDH_INVALID_HANDLE, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( NULL, 1 ); + ok(ret == PDH_INVALID_HANDLE, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( counter, 8 ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( counter, -8 ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( counter, 7 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhSetCounterScaleFactor( counter, 0 ); + ok(ret == ERROR_SUCCESS, "PdhSetCounterScaleFactor failed 0x%08x\n", ret); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + START_TEST(pdh) { test_open_close_query(); test_add_remove_counter(); + test_PdhGetFormattedCounterValue(); + test_PdhSetCounterScaleFactor(); }

1 0

Hans Leidekker : pdh: Implement and test PdhGetRawCounterValue.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 754ac8c478cd7c149a4bf88a5c1a9212bc9811f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754ac8c478cd7c149a4bf88a5… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jul 9 20:55:25 2007 +0200 pdh: Implement and test PdhGetRawCounterValue. --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 24 ++++++++++++++++++++++++ dlls/pdh/tests/pdh.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 6dfc73d..7ed4207 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -64,7 +64,7 @@ @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW -@ stub PdhGetRawCounterValue +@ stdcall PdhGetRawCounterValue(ptr ptr ptr) @ stub PdhIsRealTimeQuery @ stub PdhListLogFileHeaderA @ stub PdhListLogFileHeaderW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index f89493e..a04d1eb 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -327,6 +327,30 @@ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format } /*********************************************************************** + * PdhGetRawCounterValue (PDH.@) + */ +PDH_STATUS WINAPI PdhGetRawCounterValue( PDH_HCOUNTER handle, LPDWORD type, + PPDH_RAW_COUNTER value ) +{ + struct counter *counter = handle; + + TRACE("%p %p %p\n", handle, type, value); + + if (!value) return PDH_INVALID_ARGUMENT; + if (!counter) return PDH_INVALID_HANDLE; + + value->CStatus = counter->status; + value->TimeStamp.dwLowDateTime = counter->stamp.dwLowDateTime; + value->TimeStamp.dwHighDateTime = counter->stamp.dwHighDateTime; + value->FirstValue = counter->one.largevalue;; + value->SecondValue = counter->two.largevalue; + value->MultiCount = 1; /* FIXME */ + + if (type) *type = counter->type; + return ERROR_SUCCESS; +} + +/*********************************************************************** * PdhOpenQueryA (PDH.@) */ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY *query ) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 084fefc..6ddb097 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -145,6 +145,40 @@ static void test_PdhGetFormattedCounterValue( void ) ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); } +static void test_PdhGetRawCounterValue( void ) +{ + PDH_STATUS ret; + PDH_HQUERY query; + PDH_HCOUNTER counter; + PDH_RAW_COUNTER value; + + ret = PdhOpenQueryA( NULL, 0, &query ); + ok(ret == ERROR_SUCCESS, "PdhOpenQueryA failed 0x%08x\n", ret); + + ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); + ok(ret == ERROR_SUCCESS, "PdhAddCounterA failed 0x%08x\n", ret); + + ret = PdhGetRawCounterValue( NULL, NULL, &value ); + ok(ret == PDH_INVALID_HANDLE, "PdhGetRawCounterValue failed 0x%08x\n", ret); + + ret = PdhGetRawCounterValue( counter, NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhGetRawCounterValue failed 0x%08x\n", ret); + + ret = PdhGetRawCounterValue( counter, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetRawCounterValue failed 0x%08x\n", ret); + ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x", value.CStatus); + + ret = PdhCollectQueryData( query ); + ok(ret == ERROR_SUCCESS, "PdhCollectQueryData failed 0x%08x\n", ret); + + ret = PdhGetRawCounterValue( counter, NULL, &value ); + ok(ret == ERROR_SUCCESS, "PdhGetRawCounterValue failed 0x%08x\n", ret); + ok(value.CStatus == ERROR_SUCCESS, "expected ERROR_SUCCESS got %x", value.CStatus); + + ret = PdhCloseQuery( query ); + ok(ret == ERROR_SUCCESS, "PdhCloseQuery failed 0x%08x\n", ret); +} + static void test_PdhSetCounterScaleFactor( void ) { PDH_STATUS ret; @@ -184,5 +218,6 @@ START_TEST(pdh) test_open_close_query(); test_add_remove_counter(); test_PdhGetFormattedCounterValue(); + test_PdhGetRawCounterValue(); test_PdhSetCounterScaleFactor(); }

1 0

Stefan Dösinger : wined3d: Add CTXUSAGE_CLEAR context usage.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: fdadf26c207dc62e2885bd4042e86d852830f2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdadf26c207dc62e2885bd404… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 9 16:57:58 2007 +0200 wined3d: Add CTXUSAGE_CLEAR context usage. --- dlls/wined3d/context.c | 13 +++++++++++++ dlls/wined3d/device.c | 7 +------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2707407..80f2f31 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -842,6 +842,19 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* This does not require any special states to be set up */ break; + case CTXUSAGE_CLEAR: + if(context->last_was_blit && GL_SUPPORT(NV_TEXTURE_SHADER2)) { + glEnable(GL_TEXTURE_SHADER_NV); + checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); + } + + glEnable(GL_SCISSOR_TEST); + checkGLcall("glEnable GL_SCISSOR_TEST"); + context->last_was_blit = FALSE; + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + Context_MarkStateDirty(context, STATE_SCISSORRECT); + break; + case CTXUSAGE_DRAWPRIM: /* This needs all dirty states applied */ if(context->last_was_blit && GL_SUPPORT(NV_TEXTURE_SHADER2)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bcca5d7..520a4b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4463,12 +4463,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun apply_fbo_state(iface); } - ActivateContext(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); - - glEnable(GL_SCISSOR_TEST); - checkGLcall("glEnable GL_SCISSOR_TEST"); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + ActivateContext(This, This->render_targets[0], CTXUSAGE_CLEAR); if (Count > 0 && pRects) { curRect = pRects; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86cad0b..1169310 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -527,6 +527,7 @@ typedef enum ContextUsage { CTXUSAGE_RESOURCELOAD = 1, /* Only loads textures: No State is applied */ CTXUSAGE_DRAWPRIM = 2, /* OpenGL states are set up for blitting DirectDraw surfacs */ CTXUSAGE_BLIT = 3, /* OpenGL states are set up 3D drawing */ + CTXUSAGE_CLEAR = 4, /* Drawable and states are set up for clearing */ } ContextUsage; void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage);

1 0

Stefan Dösinger : wined3d: Make ActivateContext a bit smaller.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 1fb168f018c440e6d90c4756ea5367b991db7b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb168f018c440e6d90c4756e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 9 00:48:53 2007 +0200 wined3d: Make ActivateContext a bit smaller. --- dlls/wined3d/context.c | 317 +++++++++++++++++++++++++----------------------- 1 files changed, 168 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fb168f018c440e6d90c4…

1 0

Stefan Dösinger : wined3d: Store the last active thread.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 9dedfd71e0211b46d58f1a0b17b1c3e8ca1eb0d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dedfd71e0211b46d58f1a0b1… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 9 17:27:39 2007 +0200 wined3d: Store the last active thread. --- dlls/wined3d/context.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b7834a2..32791b7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -840,6 +840,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(This->lastActiveRenderTarget != target || tid != This->lastThread) { context = FindContext(This, target, tid); This->lastActiveRenderTarget = target; + This->lastThread = tid; } else { /* Stick to the old context */ context = This->activeContext;

1 0

Alexandre Julliard : configure: Make the libXi soname check depend on the header check.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: d68d4335af77b44695b51dd4b0288998591867e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d68d4335af77b44695b51dd4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:42:49 2007 +0200 configure: Make the libXi soname check depend on the header check. --- configure | 160 +++++++++++++++++++++++---------------------- configure.ac | 7 ++- dlls/winex11.drv/wintab.c | 10 +-- 3 files changed, 91 insertions(+), 86 deletions(-) diff --git a/configure b/configure index 94908b1..12b2634 100755 --- a/configure +++ b/configure @@ -9185,6 +9185,88 @@ fi fi + if test "$ac_cv_header_X11_extensions_XInput_h" = "yes" + then + { echo "$as_me:$LINENO: checking for -lXi" >&5 +echo $ECHO_N "checking for -lXi... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_Xi+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lXi $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XOpenDevice (); +int +main () +{ +return XOpenDevice (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_Xi=`otool -L conftest$ac_exeext | grep "libXi\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXi\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_Xi=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXi\\.$LIBEXT" | sed -e "s/^.*$libXi\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_Xi" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_Xi" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBXI "$ac_cv_lib_soname_Xi" +_ACEOF + + +fi + + fi + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then { echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5 @@ -15339,84 +15421,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for -lXi" >&5 -echo $ECHO_N "checking for -lXi... $ECHO_C" >&6; } -if test "${ac_cv_lib_soname_Xi+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lXi $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XOpenDevice (); -int -main () -{ -return XOpenDevice (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - case "$LIBEXT" in - dll) ;; - dylib) ac_cv_lib_soname_Xi=`otool -L conftest$ac_exeext | grep "libXi\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXi\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_Xi=`$ac_cv_path_LDD conftest$ac_exeext | grep "libXi\\.$LIBEXT" | sed -e "s/^.*$libXi\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; - esac -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_Xi" = "x"; then - { echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6; } - -else - { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xi" >&5 -echo "${ECHO_T}$ac_cv_lib_soname_Xi" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBXI "$ac_cv_lib_soname_Xi" -_ACEOF - - -fi - { echo "$as_me:$LINENO: checking for -lfreetype" >&5 echo $ECHO_N "checking for -lfreetype... $ECHO_C" >&6; } if test "${ac_cv_lib_soname_freetype+set}" = set; then diff --git a/configure.ac b/configure.ac index 963adb1..c6dd1dd 100644 --- a/configure.ac +++ b/configure.ac @@ -514,6 +514,12 @@ then WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) fi + dnl *** Check for X input extension + if test "$ac_cv_header_X11_extensions_XInput_h" = "yes" + then + WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) + fi + dnl *** Check for X Shm extension if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then @@ -1153,7 +1159,6 @@ AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shar WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]) -WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 842945c..eece156 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -213,7 +213,7 @@ typedef struct tagWTPACKET { } WTPACKET, *LPWTPACKET; -#ifdef HAVE_X11_EXTENSIONS_XINPUT_H +#ifdef SONAME_LIBXI #include <X11/Xlib.h> #include <X11/extensions/XInput.h> @@ -239,10 +239,6 @@ static WTI_CURSORS_INFO gSysCursor[CURSORMAX]; static INT gNumCursors; -#ifndef SONAME_LIBXI -#define SONAME_LIBXI "libXi" SONAME_EXT -#endif - /* XInput stuff */ static void *xinput_handle; @@ -1168,7 +1164,7 @@ UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) return rc; } -#else /* HAVE_X11_EXTENSIONS_XINPUT_H */ +#else /* SONAME_LIBXI */ /*********************************************************************** * AttachEventQueueToTablet (X11DRV.@) @@ -1201,4 +1197,4 @@ UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput) return 0; } -#endif /* HAVE_X11_EXTENSIONS_XINPUT_H */ +#endif /* SONAME_LIBXI */

1 0