January 2012 - Wine-Commits

Austin English : advapi32: Add a stub for CloseTrace.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: ce233a46e066c2433c6e9cf7b345b6982b7b3dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce233a46e066c2433c6e9cf7b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 26 14:35:08 2012 -0800 advapi32: Add a stub for CloseTrace. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 29e8a20..89e628e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -61,7 +61,7 @@ # @ stub CloseEncryptedFileRaw @ stdcall CloseEventLog (long) @ stdcall CloseServiceHandle(long) -# @ stub CloseTrace +@ stdcall CloseTrace(int64) @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) # @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 0b6634b..8e1a9da 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -908,3 +908,12 @@ ULONG WINAPI TraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHOR FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number); return ERROR_SUCCESS; } + +/****************************************************************************** + * CloseTrace [ADVAPI32.@] + */ +ULONG WINAPI CloseTrace( TRACEHANDLE handle ) +{ + FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); + return ERROR_INVALID_HANDLE; +}

1 0

Alexandre Julliard : advapi32: Fix the TraceMessage prototypes.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: b5314f50ed3ac7ce1b5de5492c9d428503246b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5314f50ed3ac7ce1b5de5492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 11:10:21 2012 +0100 advapi32: Fix the TraceMessage prototypes. --- dlls/advapi32/eventlog.c | 26 +++++++++++++++++--------- include/evntrace.h | 2 ++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index cfad001..0b6634b 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -885,18 +885,26 @@ ULONG WINAPI ProcessTrace( PTRACEHANDLE HandleArray, ULONG HandleCount, LPFILETI return ERROR_CALL_NOT_IMPLEMENTED; } -ULONG TraceMessage( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid, - USHORT MessageNumber, ...) +/****************************************************************************** + * TraceMessage [ADVAPI32.@] + */ +ULONG WINAPIV TraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, ... ) { - FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags, - debugstr_guid(MessageGuid), MessageNumber); - return ERROR_SUCCESS; + __ms_va_list valist; + ULONG ret; + + __ms_va_start( valist, number ); + ret = TraceMessageVa( handle, flags, guid, number, valist ); + __ms_va_end( valist ); + return ret; } -ULONG TraceMessageVa( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid, - USHORT MessageNumber, __ms_va_list args) +/****************************************************************************** + * TraceMessageVa [ADVAPI32.@] + */ +ULONG WINAPI TraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, + __ms_va_list args ) { - FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags, - debugstr_guid(MessageGuid), MessageNumber); + FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number); return ERROR_SUCCESS; } diff --git a/include/evntrace.h b/include/evntrace.h index 4cacc84..e0c3f21 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -222,6 +222,8 @@ ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define StartTrace WINELIB_NAME_AW(StartTrace) ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +ULONG WINAPIV TraceMessage(TRACEHANDLE,ULONG,LPGUID,USHORT,...); +ULONG WINAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE); #ifdef __cplusplus

1 0

Henri Verbeet : ddraw/tests: Add a test for SetCooperativeLevel() on a window that belongs to another thread.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: ed6461f9dacb0c163f7273b1fa5b62bdea3bd442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6461f9dacb0c163f7273b1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 23:04:20 2012 +0100 ddraw/tests: Add a test for SetCooperativeLevel() on a window that belongs to another thread. --- dlls/ddraw/tests/ddraw1.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 336 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6461f9dacb0c163f727…

1 0

Alexandre Julliard : winex11: Check for failure to convert the brush bitmap to X11.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 8eb9ab531f5de0a8f2a31980e37e205307807e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb9ab531f5de0a8f2a31980e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 11:10:38 2012 +0100 winex11: Check for failure to convert the brush bitmap to X11. --- dlls/winex11.drv/brush.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 216c142..ea41f8a 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -269,6 +269,11 @@ HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern memdc = CreateCompatibleDC( physDev->dev.hdc ); SelectObject( memdc, bitmap ); DeleteDC( memdc ); + if (!X11DRV_get_phys_bitmap( bitmap )) + { + DeleteObject( bitmap ); + return 0; + } SetDIBits( physDev->dev.hdc, bitmap, 0, abs(info->bmiHeader.biHeight), pattern->bits.ptr, info, pattern->usage );

1 0

Hans Leidekker : winhttp: Don' t attempt to read data after receiving a response to a HEAD request.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: ebc4fd146285d4f45803d52b1b9da6cddfad2058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc4fd146285d4f45803d52b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:53:50 2012 +0100 winhttp: Don't attempt to read data after receiving a response to a HEAD request. --- dlls/winhttp/request.c | 6 +++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 516ff35..a3a92ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,7 +2815,11 @@ static HRESULT request_receive( struct winhttp_request *request ) return HRESULT_FROM_WIN32( get_last_error() ); } if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err ); - + if (!strcmpW( request->verb, headW )) + { + request->state = REQUEST_STATE_RESPONSE_RECEIVED; + return S_OK; + } if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; request->buffer[0] = 0; size = total_bytes_read = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7105553..021bc93 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -46,6 +46,7 @@ static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; +static const WCHAR headW[] = {'H','E','A','D',0}; static const WCHAR slashW[] = {'/',0}; static const WCHAR http1_0[] = {'H','T','T','P','/','1','.','0',0}; static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0};

1 0

Hans Leidekker : winhttp: Only turn POST requests into GET requests when redirecting.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: afd368577986ea5c756164622b13f73b138fcc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd368577986ea5c756164622… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 27 10:53:00 2012 +0100 winhttp: Only turn POST requests into GET requests when redirecting. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fac6fac..f615f41 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1650,7 +1650,7 @@ static BOOL handle_redirect( request_t *request, DWORD status ) if ((index = get_header_index( request, attr_content_type, 0, TRUE )) >= 0) delete_header( request, index ); if ((index = get_header_index( request, attr_content_length, 0, TRUE )) >= 0 ) delete_header( request, index ); - if (status != HTTP_STATUS_REDIRECT_KEEP_VERB) + if (status != HTTP_STATUS_REDIRECT_KEEP_VERB && !strcmpW( request->verb, postW )) { heap_free( request->verb ); request->verb = strdupW( getW );

1 0

Erich Hoover : hhctrl.ocx: Add a missing Release call.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: fbc12b4a82953c0044d5a9dea21c0f615ff27815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc12b4a82953c0044d5a9dea… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 25 13:26:06 2012 -0700 hhctrl.ocx: Add a missing Release call. --- dlls/hhctrl.ocx/search.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index f81e46c..571cdd6 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -193,6 +193,7 @@ static SearchItem *SearchCHM_Storage(SearchItem *item, IStorage *pStorage, FIXME("Unhandled IStorage stream element.\n"); } } + IEnumSTATSTG_Release(elem); return item; }

1 0

Erich Hoover : itss: Enlarge buffer to include space for a concatenated value.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 88f6e898c617c6c4ffc560922c6c19ba9bebe915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f6e898c617c6c4ffc560922… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 27 09:48:47 2012 -0700 itss: Enlarge buffer to include space for a concatenated value. --- dlls/itss/storage.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 4f687c6..c53b0c2 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -406,7 +406,6 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( IStorage** ppstg) { ITSS_IStorageImpl *This = impl_from_IStorage(iface); - static const WCHAR szRoot[] = { '/', 0 }; struct chmFile *chmfile; WCHAR *path, *p; DWORD len; @@ -418,7 +417,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( if( !chmfile ) return E_FAIL; - len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; + len = strlenW( This->dir ) + strlenW( pwcsName ) + 2; /* need room for a terminating slash */ path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); strcpyW( path, This->dir ); @@ -435,10 +434,12 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( *p = '/'; } - if(*--p == '/') + /* add a terminating slash if one does not already exist */ + if(*(p-1) != '/') + { + *p++ = '/'; *p = 0; - - strcatW( path, szRoot ); + } TRACE("Resolving %s\n", debugstr_w(path));

1 0

Henri Verbeet : wined3d: Make sure transparent hardware cursors are really transparent.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 348c655b5cc670f53d3b266b3e21f61cc978faca URL: http://source.winehq.org/git/wine.git/?a=commit;h=348c655b5cc670f53d3b266b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 23:04:19 2012 +0100 wined3d: Make sure transparent hardware cursors are really transparent. Loosely based on a patch by Stefan Dösinger. --- dlls/wined3d/device.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5f3506..2d014ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5004,14 +5004,16 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) { - /* Draw a hardware cursor */ + UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; ICONINFO cursorInfo; + DWORD *maskBits; HCURSOR cursor; - /* Create and clear maskBits because it is not needed for - * 32-bit cursors. 32x32 bits split into 32-bit chunks == 32 - * chunks. */ - DWORD *maskBits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (cursor_image->resource.width * cursor_image->resource.height / 8)); + + /* 32-bit user32 cursors ignore the alpha channel if it's all + * zeroes, and use the mask instead. Fill the mask with all ones + * to ensure we still get a fully transparent cursor. */ + maskBits = HeapAlloc(GetProcessHeap(), 0, mask_size); + memset(maskBits, 0xff, mask_size); wined3d_surface_map(cursor_image, &mapped_rect, NULL, WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY); TRACE("width: %u height: %u.\n", cursor_image->resource.width, cursor_image->resource.height);

1 0

Austin English : advapi32: Add a stub for EnumerateTraceGuids.
by Alexandre Julliard Jan. 27, 2012

Jan. 27, 2012

Module: wine Branch: master Commit: 5930590ed220345695cb5111de536fa87192793e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5930590ed220345695cb5111d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 26 14:35:25 2012 -0800 advapi32: Add a stub for EnumerateTraceGuids. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ include/evntrace.h | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 89e628e..68a5384 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -214,7 +214,7 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) -# @ stub EnumerateTraceGuids +@ stdcall EnumerateTraceGuids(ptr long ptr) # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 8e1a9da..8ec5cd2 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -917,3 +917,13 @@ ULONG WINAPI CloseTrace( TRACEHANDLE handle ) FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); return ERROR_INVALID_HANDLE; } + +/****************************************************************************** + * EnumerateTraceGuids [ADVAPI32.@] + */ +ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, + ULONG arraycount, PULONG guidcount) +{ + FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); + return ERROR_INVALID_PARAMETER; +} diff --git a/include/evntrace.h b/include/evntrace.h index e0c3f21..1516485 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -49,6 +49,15 @@ typedef struct _TRACE_GUID_REGISTRATION HANDLE RegHandle; } TRACE_GUID_REGISTRATION, *PTRACE_GUID_REGISTRATION; +typedef struct _TRACE_GUID_PROPERTIES { + GUID Guid; + ULONG GuidType; + ULONG LoggerId; + ULONG EnableLevel; + ULONG EnableFlags; + BOOLEAN IsEnable; +} TRACE_GUID_PROPERTIES, *PTRACE_GUID_PROPERTIES; + typedef struct _EVENT_TRACE_HEADER { USHORT Size;

1 0