October 2007 - Wine-Commits

Hans Leidekker : pdh: Implement PdhValidatePath{, Ex}{A, W}.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 504e7c2ff7ec1c4e2ec648aa675460856c30ce7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=504e7c2ff7ec1c4e2ec648aa6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Sep 29 21:05:53 2007 +0200 pdh: Implement PdhValidatePath{, Ex}{A, W}. --- dlls/pdh/pdh.spec | 8 +++--- dlls/pdh/pdh_main.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/pdh.h | 7 +++++ include/pdhmsg.h | 1 + 4 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index c28d2a8..795a45e 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -137,10 +137,10 @@ @ stub PdhUpdateLogA @ stub PdhUpdateLogFileCatalog @ stub PdhUpdateLogW -@ stub PdhValidatePathA -@ stub PdhValidatePathExA -@ stub PdhValidatePathExW -@ stub PdhValidatePathW +@ stdcall PdhValidatePathA(str) +@ stdcall PdhValidatePathExA(ptr str) +@ stdcall PdhValidatePathExW(ptr wstr) +@ stdcall PdhValidatePathW(wstr) @ stub PdhVbAddCounter @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 5253620..e49e64e 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -700,3 +700,77 @@ PDH_STATUS WINAPI PdhSetCounterScaleFactor( PDH_HCOUNTER handle, LONG factor ) counter->scale = factor; return ERROR_SUCCESS; } + +/*********************************************************************** + * PdhValidatePathA (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathA( LPCSTR path ) +{ + PDH_STATUS ret; + WCHAR *pathW; + + TRACE("%s\n", debugstr_a(path)); + + if (!path) return PDH_INVALID_ARGUMENT; + if (!(pathW = pdh_strdup_aw( path ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhValidatePathW( pathW ); + + pdh_free( pathW ); + return ret; +} + +static PDH_STATUS validate_path( LPCWSTR path ) +{ + if (!path || !*path) return PDH_INVALID_ARGUMENT; + if (*path++ != '\\' || !strchrW( path, '\\' )) return PDH_CSTATUS_BAD_COUNTERNAME; + return ERROR_SUCCESS; + } + +/*********************************************************************** + * PdhValidatePathW (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) +{ + PDH_STATUS ret; + unsigned int i; + + TRACE("%s\n", debugstr_w(path)); + + if ((ret = validate_path( path ))) return ret; + + for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + if (pdh_match_path( counter_sources[i].path, path )) return ERROR_SUCCESS; + + return PDH_CSTATUS_NO_COUNTER; +} + +/*********************************************************************** + * PdhValidatePathExA (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathExA( PDH_HLOG source, LPCSTR path ) +{ + TRACE("%p %s\n", source, debugstr_a(path)); + + if (source) + { + FIXME("log file data source not supported\n"); + return ERROR_SUCCESS; + } + return PdhValidatePathA( path ); +} + +/*********************************************************************** + * PdhValidatePathExW (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathExW( PDH_HLOG source, LPCWSTR path ) +{ + TRACE("%p %s\n", source, debugstr_w(path)); + + if (source) + { + FIXME("log file data source not supported\n"); + return ERROR_SUCCESS; + } + return PdhValidatePathW( path ); +} diff --git a/include/pdh.h b/include/pdh.h index a392096..3aff6db 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -35,6 +35,7 @@ extern "C" { typedef LONG PDH_STATUS; typedef HANDLE PDH_HQUERY; typedef HANDLE PDH_HCOUNTER; +typedef HANDLE PDH_HLOG; #define PDH_MAX_SCALE 7 #define PDH_MIN_SCALE (-7) @@ -190,6 +191,12 @@ PDH_STATUS WINAPI PdhOpenQueryW(LPCWSTR, DWORD_PTR, PDH_HQUERY *); #define PdhOpenQuery WINELIB_NAME_AW(PdhOpenQuery) PDH_STATUS WINAPI PdhRemoveCounter(PDH_HCOUNTER); PDH_STATUS WINAPI PdhSetCounterScaleFactor(PDH_HCOUNTER, LONG); +PDH_STATUS WINAPI PdhValidatePathA(LPCSTR); +PDH_STATUS WINAPI PdhValidatePathW(LPCWSTR); +#define PdhValidatePath WINELIB_NAME_AW(PdhValidatePath) +PDH_STATUS WINAPI PdhValidatePathExA(PDH_HLOG, LPCSTR); +PDH_STATUS WINAPI PdhValidatePathExW(PDH_HLOG, LPCWSTR); +#define PdhValidatePathEx WINELIB_NAME_AW(PdhValidatePathEx) #ifdef __cplusplus } diff --git a/include/pdhmsg.h b/include/pdhmsg.h index 00563a0..bee466e 100644 --- a/include/pdhmsg.h +++ b/include/pdhmsg.h @@ -30,6 +30,7 @@ #define PDH_MEMORY_ALLOCATION_FAILURE 0xc0000bbb #define PDH_INVALID_HANDLE 0xc0000bbc #define PDH_INVALID_ARGUMENT 0xc0000bbd +#define PDH_CSTATUS_BAD_COUNTERNAME 0xc0000bc0 #define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 #define PDH_INVALID_DATA 0xc0000bc6 #define PDH_STRING_NOT_FOUND 0xc0000bd4

1 0

Hans Leidekker : pdh: Add tests for PdhValidatePath{, Ex}{A, W}.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 9209582048edd1e60833cdb6fd183e217a019847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9209582048edd1e60833cdb6f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Sep 29 21:06:07 2007 +0200 pdh: Add tests for PdhValidatePath{, Ex}{A, W}. --- dlls/pdh/tests/pdh.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 104589e..85b0853 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -32,6 +32,8 @@ static HMODULE pdh; static PDH_STATUS (WINAPI *pPdhAddEnglishCounterA)(PDH_HQUERY, LPCSTR, DWORD_PTR, PDH_HCOUNTER *); static PDH_STATUS (WINAPI *pPdhAddEnglishCounterW)(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *); static PDH_STATUS (WINAPI *pPdhCollectQueryDataWithTime)(PDH_HQUERY, LONGLONG *); +static PDH_STATUS (WINAPI *pPdhValidatePathExA)(PDH_HLOG, LPCSTR); +static PDH_STATUS (WINAPI *pPdhValidatePathExW)(PDH_HLOG, LPCWSTR); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func ); @@ -41,6 +43,8 @@ static void init_function_ptrs( void ) GETFUNCPTR( PdhAddEnglishCounterA ) GETFUNCPTR( PdhAddEnglishCounterW ) GETFUNCPTR( PdhCollectQueryDataWithTime ) + GETFUNCPTR( PdhValidatePathExA ) + GETFUNCPTR( PdhValidatePathExW ) } static const WCHAR processor_time[] = @@ -695,6 +699,104 @@ static void test_PdhLookupPerfNameByIndexW( void ) ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); } +static void test_PdhValidatePathA( void ) +{ + PDH_STATUS ret; + + ret = PdhValidatePathA( NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathA failed 0x%08x\n", ret); + + ret = PdhValidatePathA( "" ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathA failed 0x%08x\n", ret); + + ret = PdhValidatePathA( "\\System" ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathA failed 0x%08x\n", ret); + + ret = PdhValidatePathA( "System Up Time" ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathA failed 0x%08x\n", ret); + + ret = PdhValidatePathA( "\\System\\System Down Time" ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathA failed 0x%08x\n", ret); + + ret = PdhValidatePathA( "\\System\\System Up Time" ); + ok(ret == ERROR_SUCCESS, "PdhValidatePathA failed 0x%08x\n", ret); +} + +static void test_PdhValidatePathW( void ) +{ + PDH_STATUS ret; + + static const WCHAR empty[] = {0}; + static const WCHAR system[] = {'\\','S','y','s','t','e','m',0}; + + ret = PdhValidatePathW( NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathW failed 0x%08x\n", ret); + + ret = PdhValidatePathW( empty ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathW failed 0x%08x\n", ret); + + ret = PdhValidatePathW( system ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n", ret); + + ret = PdhValidatePathW( uptime ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n", ret); + + ret = PdhValidatePathW( system_downtime ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathW failed 0x%08x\n", ret); + + ret = PdhValidatePathW( system_uptime ); + ok(ret == ERROR_SUCCESS, "PdhValidatePathW failed 0x%08x\n", ret); +} + +static void test_PdhValidatePathExA( void ) +{ + PDH_STATUS ret; + + ret = pPdhValidatePathExA( NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathExA failed 0x%08x\n", ret); + + ret = pPdhValidatePathExA( NULL, "" ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathExA failed 0x%08x\n", ret); + + ret = pPdhValidatePathExA( NULL, "\\System" ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExA failed 0x%08x\n", ret); + + ret = pPdhValidatePathExA( NULL, "System Up Time" ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExA failed 0x%08x\n", ret); + + ret = pPdhValidatePathExA( NULL, "\\System\\System Down Time" ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathExA failed 0x%08x\n", ret); + + ret = pPdhValidatePathExA( NULL, "\\System\\System Up Time" ); + ok(ret == ERROR_SUCCESS, "PdhValidatePathExA failed 0x%08x\n", ret); +} + +static void test_PdhValidatePathExW( void ) +{ + PDH_STATUS ret; + + static const WCHAR empty[] = {0}; + static const WCHAR system[] = {'\\','S','y','s','t','e','m',0}; + + ret = pPdhValidatePathExW( NULL, NULL ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathExW failed 0x%08x\n", ret); + + ret = pPdhValidatePathExW( NULL, empty ); + ok(ret == PDH_INVALID_ARGUMENT, "PdhValidatePathExW failed 0x%08x\n", ret); + + ret = pPdhValidatePathExW( NULL, system ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed 0x%08x\n", ret); + + ret = pPdhValidatePathExW( NULL, uptime ); + ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed 0x%08x\n", ret); + + ret = pPdhValidatePathExW( NULL, system_downtime ); + ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathExW failed 0x%08x\n", ret); + + ret = pPdhValidatePathExW( NULL, system_uptime ); + ok(ret == ERROR_SUCCESS, "PdhValidatePathExW failed 0x%08x\n", ret); +} + START_TEST(pdh) { init_function_ptrs(); @@ -722,4 +824,10 @@ START_TEST(pdh) test_PdhLookupPerfNameByIndexA(); test_PdhLookupPerfNameByIndexW(); + + test_PdhValidatePathA(); + test_PdhValidatePathW(); + + if (pPdhValidatePathExA) test_PdhValidatePathExA(); + if (pPdhValidatePathExW) test_PdhValidatePathExW(); }

1 0

Hans Leidekker : pdh: Implement PdhCalculateCounterFromRawValue.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: a83509c7d36b15cb084f47b6761f13192ffe413f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83509c7d36b15cb084f47b67… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Sep 29 21:06:49 2007 +0200 pdh: Implement PdhCalculateCounterFromRawValue. --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 109 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 73 insertions(+), 38 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 8735c0f..ad46f40 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -11,7 +11,7 @@ @ stub PdhBrowseCountersHA @ stub PdhBrowseCountersHW @ stub PdhBrowseCountersW -@ stub PdhCalculateCounterFromRawValue +@ stdcall PdhCalculateCounterFromRawValue(ptr long ptr ptr ptr) @ stub PdhCloseLog @ stdcall PdhCloseQuery(ptr) @ stdcall PdhCollectQueryData(ptr) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 479fe3b..a97ee9b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -96,6 +96,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +union value +{ + LONG longvalue; + double doublevalue; + LONGLONG largevalue; +}; + struct counter { DWORD magic; /* signature */ @@ -110,18 +117,8 @@ struct counter LONGLONG base; /* samples per second */ FILETIME stamp; /* time stamp */ void (CALLBACK *collect)( struct counter * ); /* collect callback */ - union - { - LONG longvalue; - double doublevalue; - LONGLONG largevalue; - } one; /* first value */ - union - { - LONG longvalue; - double doublevalue; - LONGLONG largevalue; - } two; /* second value */ + union value one; /* first value */ + union value two; /* second value */ }; #define PDH_MAGIC_COUNTER 0x50444831 /* 'PDH1' */ @@ -319,6 +316,64 @@ PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, return PdhAddCounterW( query, path, userdata, counter ); } +/* caller must hold counter lock */ +static PDH_STATUS format_value( struct counter *counter, DWORD format, union value *raw1, + union value *raw2, PDH_FMT_COUNTERVALUE *value ) +{ + LONG factor; + + factor = counter->scale ? counter->scale : counter->defaultscale; + if (format & PDH_FMT_LONG) + { + if (format & PDH_FMT_1000) value->u.longValue = raw2->longvalue * 1000; + else value->u.longValue = raw2->longvalue * pow( 10, factor ); + } + else if (format & PDH_FMT_LARGE) + { + if (format & PDH_FMT_1000) value->u.largeValue = raw2->largevalue * 1000; + else value->u.largeValue = raw2->largevalue * pow( 10, factor ); + } + else if (format & PDH_FMT_DOUBLE) + { + if (format & PDH_FMT_1000) value->u.doubleValue = raw2->doublevalue * 1000; + else value->u.doubleValue = raw2->doublevalue * pow( 10, factor ); + } + else + { + WARN("unknown format %x\n", format); + return PDH_INVALID_ARGUMENT; + } + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhCalculateCounterFromRawValue (PDH.@) + */ +PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD format, + PPDH_RAW_COUNTER raw1, PPDH_RAW_COUNTER raw2, + PPDH_FMT_COUNTERVALUE value ) +{ + PDH_STATUS ret; + struct counter *counter = handle; + + TRACE("%p 0x%08x %p %p %p\n", handle, format, raw1, raw2, value); + + if (!value) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + ret = format_value( counter, format, (union value *)&raw1->SecondValue, + (union value *)&raw2->SecondValue, value ); + + LeaveCriticalSection( &pdh_handle_cs ); + return ret; +} + /* caller must hold query lock */ static void shutdown_query_thread( struct query *query ) { @@ -630,7 +685,7 @@ PDH_STATUS WINAPI PdhGetCounterTimeBase( PDH_HCOUNTER handle, LONGLONG *base ) PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format, LPDWORD type, PPDH_FMT_COUNTERVALUE value ) { - LONG factor; + PDH_STATUS ret; struct counter *counter = handle; TRACE("%p %x %p %p\n", handle, format, type, value); @@ -648,34 +703,14 @@ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format LeaveCriticalSection( &pdh_handle_cs ); 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.largeValue = 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.doubleValue = counter->two.doublevalue * 1000; - else value->u.doubleValue = counter->two.doublevalue * pow( 10, factor ); - } - else + if (!(ret = format_value( counter, format, &counter->one, &counter->two, value ))) { - WARN("unknown format %x\n", format); - LeaveCriticalSection( &pdh_handle_cs ); - return PDH_INVALID_ARGUMENT; + value->CStatus = ERROR_SUCCESS; + if (type) *type = counter->type; } - value->CStatus = ERROR_SUCCESS; - if (type) *type = counter->type; LeaveCriticalSection( &pdh_handle_cs ); - return ERROR_SUCCESS; + return ret; } /***********************************************************************

1 0

Roderick Colenbrander : wined3d: Only call ENTER_GL for the parts in ActivateContext that actually need it.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 9ad3807c15bbaf3e593f097c98af362c68613bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad3807c15bbaf3e593f097c9… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 29 17:12:35 2007 +0200 wined3d: Only call ENTER_GL for the parts in ActivateContext that actually need it. --- dlls/wined3d/context.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 776b20d..23569fa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -851,7 +851,6 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - ENTER_GL(); if(This->lastActiveRenderTarget != target || tid != This->lastThread) { context = FindContext(This, target, tid); This->lastActiveRenderTarget = target; @@ -865,15 +864,15 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(context != This->activeContext) { BOOL ret; TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - LEAVE_GL(); ret = pwglMakeCurrent(context->hdc, context->glCtx); - ENTER_GL(); if(ret == FALSE) { ERR("Failed to activate the new context\n"); } This->activeContext = context; } + /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */ + ENTER_GL(); switch(usage) { case CTXUSAGE_RESOURCELOAD: /* This does not require any special states to be set up */

1 0

Andrew Talbot : msvfw32: Fix a memory leak.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 1a36ccc0a8d719480174043449aa226d3450c4cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a36ccc0a8d71948017404344… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 28 21:24:53 2007 +0100 msvfw32: Fix a memory leak. --- dlls/msvfw32/mciwnd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index 1e9a4f3..6d252d9 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -1185,6 +1185,8 @@ end_of_mci_open: if (!mwi->lasterror) SendDlgItemMessageW(hWnd, CTL_TRACKBAR, TBM_SETRANGEMAX, 1, SendMessageW(hWnd, MCIWNDM_GETLENGTH, 0, 0)); + + HeapFree(GetProcessHeap(), 0, cmdW); } if (wMsg == MCIWNDM_SETTIMEFORMATA)

1 0

Roderick Colenbrander : wined3d: CreateContext should not be called between ENTER_GL/LEAVE_GL.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 001f380ac96aaca280f37c29d8e320a6054f10ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=001f380ac96aaca280f37c29d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 29 16:58:44 2007 +0200 wined3d: CreateContext should not be called between ENTER_GL/LEAVE_GL. --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/device.c | 3 --- dlls/wined3d/swapchain.c | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 403acdf..776b20d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -324,6 +324,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar goto out; } + ENTER_GL(); TRACE("Setting up the screen\n"); /* Clear the screen */ glClearColor(1.0, 0.0, 0.0, 0.0); @@ -389,6 +390,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); } } + LEAVE_GL(); if(oldDrawable && oldCtx) { pwglMakeCurrent(oldDrawable, oldCtx); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9cf8ab1..082a13f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1456,10 +1456,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic return E_OUTOFMEMORY; object->num_contexts = 1; - ENTER_GL(); object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */, pPresentationParameters); - LEAVE_GL(); - if (!object->context[0]) { ERR("Failed to create a new context\n"); hr = WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4ecab95..e302f56 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -132,7 +132,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO ActivateContext(This->wineD3DDevice, This->backBuffer[0], CTXUSAGE_RESOURCELOAD); - ENTER_GL(); /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ if(This->wineD3DDevice->bCursorVisible && This->wineD3DDevice->cursorTexture) { @@ -244,7 +243,9 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO #if defined(SHOW_FRAME_MAKEUP) FIXME("Singe Frame snapshots Starting\n"); isDumpingFrames = TRUE; + ENTER_GL(); glClear(GL_COLOR_BUFFER_BIT); + LEAVE_GL(); #endif #if defined(SINGLE_FRAME_DEBUGGING) @@ -272,8 +273,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } #endif - LEAVE_GL(); - if (This->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { TRACE("Clearing the color buffer with pink color\n");

1 0

Vitaliy Margolen : dinput: Fix typo.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 355b39cd71216a6f78a3f0b2520fc60e0c618c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355b39cd71216a6f78a3f0b25… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Sep 29 10:23:11 2007 -0600 dinput: Fix typo. --- dlls/dinput/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 170d8fd..68f61ec 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ BOOL get_app_key(HKEY *defkey, HKEY *appkey) if ((p = strrchr(appname, '\\'))) appname = p + 1; strcat(appname, "\\DirectInput"); - if (RegOpenKeyA(tmpkey, appname, appkey)) appkey = 0; + if (RegOpenKeyA(tmpkey, appname, appkey)) *appkey = 0; RegCloseKey(tmpkey); } }

1 0

Jacek Caban : mshtml: Use GetWineURL in before_async_open.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 47c91d4d18614abda813cb09219722eb2e24fc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c91d4d18614abda813cb092… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 29 03:41:10 2007 +0200 mshtml: Use GetWineURL in before_async_open. --- dlls/mshtml/nsio.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 61a6386..7bccce1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -93,13 +93,20 @@ static BOOL exec_shldocvw_67(HTMLDocument *doc, LPCWSTR url) return TRUE; } -static BOOL handle_uri(NSContainer *container, nsChannel *channel, LPCWSTR uri) +static BOOL before_async_open(nsChannel *channel, NSContainer *container) { IServiceProvider *service_provider; HTMLDocument *doc = container->doc; DWORD hlnf = 0; + LPCWSTR uri; HRESULT hres; + nsIWineURI_GetWineURL(channel->uri, &uri); + if(!uri) { + ERR("GetWineURL returned NULL\n"); + return TRUE; + } + if(!doc) { NSContainer *container_iter = container; @@ -131,29 +138,6 @@ static BOOL handle_uri(NSContainer *container, nsChannel *channel, LPCWSTR uri) return TRUE; } -static BOOL before_async_open(nsChannel *channel, NSContainer *container) -{ - nsACString uri_str; - const char *uria; - LPWSTR uri; - DWORD len; - BOOL ret; - - nsACString_Init(&uri_str, NULL); - nsIWineURI_GetSpec(channel->uri, &uri_str); - nsACString_GetData(&uri_str, &uria, NULL); - len = MultiByteToWideChar(CP_ACP, 0, uria, -1, NULL, 0); - uri = mshtml_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, uria, -1, uri, len); - nsACString_Finish(&uri_str); - - ret = handle_uri(container, channel, uri); - - mshtml_free(uri); - - return ret; -} - #define NSCHANNEL_THIS(iface) DEFINE_THIS(nsChannel, HttpChannel, iface) static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef riid, nsQIResult result)

1 0

Roderick Colenbrander : wined3d: CreateFakeGLContxt/ ReleaseFakeGLContext doesn't need ENTER_GL/ LEAVE_GL and they are making GDI calls.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 46f33f4f38b6106ada3d7ed65a329e2b55c9df4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f33f4f38b6106ada3d7ed65… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Sep 29 16:38:11 2007 +0200 wined3d: CreateFakeGLContxt/ReleaseFakeGLContext doesn't need ENTER_GL/LEAVE_GL and they are making GDI calls. The removal of ENTER_GL from the fake context code, requires the addition of ENTER_GL/LEAVE_GL to FillGLCaps which was protected by the fake context code before. --- dlls/wined3d/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eef40b8..1f9f1a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -192,13 +192,11 @@ static void WineD3D_ReleaseFakeGLContext(void) { assert(wined3d_fake_gl_context_ref >= 0); LeaveCriticalSection(&wined3d_fake_gl_context_cs); - LEAVE_GL(); } static BOOL WineD3D_CreateFakeGLContext(void) { HGLRC glCtx = NULL; - ENTER_GL(); EnterCriticalSection(&wined3d_fake_gl_context_cs); TRACE("getting context...\n"); @@ -273,7 +271,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { wined3d_fake_gl_context_hwnd = NULL; if(glCtx) pwglDeleteContext(glCtx); LeaveCriticalSection(&wined3d_fake_gl_context_cs); - LEAVE_GL(); return FALSE; } @@ -419,6 +416,8 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("(%p)\n", gl_info); + ENTER_GL(); + gl_string = (const char *) glGetString(GL_RENDERER); if (NULL == gl_string) gl_string = "None"; @@ -1130,6 +1129,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } } } + LEAVE_GL(); return return_value; }

1 0

Juan Lang : wintrust: Don't warn for generic cert verify action.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 07979b9975b77b349b2212bfa1185f342282ff86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07979b9975b77b349b2212bfa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 13:05:18 2007 -0700 wintrust: Don't warn for generic cert verify action. --- dlls/wintrust/wintrust_main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 44d2dc8..aa51a98 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -222,6 +222,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; static const GUID published_software = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE; static const GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; + static const GUID generic_cert_verify = WINTRUST_ACTION_GENERIC_CERT_VERIFY; LONG err = ERROR_SUCCESS; WINTRUST_DATA *actionData = (WINTRUST_DATA *)ActionData; @@ -234,7 +235,8 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) { /* Check known actions to warn of possible problems */ if (!IsEqualGUID(ActionID, &unknown) && - !IsEqualGUID(ActionID, &generic_verify_v2)) + !IsEqualGUID(ActionID, &generic_verify_v2) && + !IsEqualGUID(ActionID, &generic_cert_verify)) WARN("unknown action %s, default behavior may not be right\n", debugstr_guid(ActionID)); switch (actionData->dwStateAction)

1 0