October 2009 - Wine-Commits

Dmitry Timoshkov : user32: Make sure that focus_rect is always initialized.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 523d8ceefc084081cb7a30af67918e4bac8c7454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523d8ceefc084081cb7a30af6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 12 17:20:40 2009 +0900 user32: Make sure that focus_rect is always initialized. --- dlls/user32/button.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 1681949..fbe4c82 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -826,15 +826,18 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) hOldBrush = SelectObject(hDC,GetSysColorBrush(COLOR_BTNFACE)); oldBkMode = SetBkMode(hDC, TRANSPARENT); - /* completely skip the drawing if only focus has changed */ - if (action == ODA_FOCUS) goto draw_focus; - if (get_button_type(style) == BS_DEFPUSHBUTTON) { - Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom); + if (action != ODA_FOCUS) + Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom); InflateRect( &rc, -1, -1 ); } + focus_rect = rc; + + /* completely skip the drawing if only focus has changed */ + if (action == ODA_FOCUS) goto draw_focus; + uState = DFCS_BUTTONPUSH | DFCS_ADJUSTRECT; if (style & BS_FLAT) @@ -852,8 +855,6 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) DrawFrameControl( hDC, &rc, DFC_BUTTON, uState ); - focus_rect = rc; - /* draw button label */ r = rc; dtFlags = BUTTON_CalcLabelRect(hwnd, hDC, &r);

1 0

Detlef Riekenberg : include: Add typedef for WNODE_HEADER.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: da73583bc3c60a7a42aa9c02c6f9ed7b738696a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da73583bc3c60a7a42aa9c02c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 11 17:08:12 2009 +0200 include: Add typedef for WNODE_HEADER. --- include/wmistr.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/wmistr.h b/include/wmistr.h index 480aed6..5a806b6 100644 --- a/include/wmistr.h +++ b/include/wmistr.h @@ -33,4 +33,28 @@ typedef enum WMI_EXECUTE_METHOD = 9, } WMIDPREQUESTCODE; +typedef struct _WNODE_HEADER +{ + ULONG BufferSize; + ULONG ProvicerId; + union + { + ULONG64 HistoricalContext; + struct + { + ULONG Version; + ULONG Linkage; + } DUMMYSTRUCTNAME; + + } DUMMYUNIONNAME; + union + { + HANDLE KernelHandle; + LARGE_INTEGER TimeStamp; + } DUMMYUNIONNAME2; + GUID Guid; + ULONG ClientContext; + ULONG Flags; +} WNODE_HEADER, *PWNODE_HEADER; + #endif /* _WMISTR_ */

1 0

Detlef Riekenberg : advapi32: Add stubs for StartTrace[A|W].
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 6648d267442f97341ece7e99f88781b59ec8fe77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6648d267442f97341ece7e99f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 11 17:38:21 2009 +0200 advapi32: Add stubs for StartTrace[A|W]. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a61051e..b29c921 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -592,8 +592,8 @@ @ stdcall StartServiceCtrlDispatcherA(ptr) @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) -# @ stub StartTraceA -# @ stub StartTraceW +@ stdcall StartTraceA(ptr str ptr) +@ stdcall StartTraceW(ptr wstr ptr) # @ stub StopTraceA # @ stub StopTraceW @ stdcall SynchronizeWindows31FilesAndWindowsNTRegistry(long long long long) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 7998039..dc6fba9 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -519,6 +519,32 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, } /****************************************************************************** + * StartTraceW [ADVAPI32.@] + * + * Register and start an event trace session + * + */ +ULONG WINAPI StartTraceW( PTRACEHANDLE pSessionHandle, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_w(SessionName), Properties); + if (pSessionHandle) *pSessionHandle = 0xcafe4242; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * StartTraceA [ADVAPI32.@] + * + * See StartTraceW. + * + */ +ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + FIXME("(%p, %s, %p) stub\n", pSessionHandle, debugstr_a(SessionName), Properties); + if (pSessionHandle) *pSessionHandle = 0xcafe4242; + return ERROR_SUCCESS; +} + +/****************************************************************************** * TraceEvent [ADVAPI32.@] */ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace )

1 0

Detlef Riekenberg : advapi32: Add stub for EnableTrace.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 75794304b498bb1f33f178ad5c2e1b6e5dfb1a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=75794304b498bb1f33f178ad5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 11 20:02:13 2009 +0200 advapi32: Add stub for EnableTrace. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index b29c921..fde7f06 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -200,7 +200,7 @@ @ stub ElfRegisterEventSourceW # @ stub ElfReportEventA @ stub ElfReportEventW -# @ stub EnableTrace +@ stdcall EnableTrace(long long long ptr double) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) # @ stub EncryptedFileKeyInfo diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index dc6fba9..f84e15f 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -134,6 +134,17 @@ BOOL WINAPI DeregisterEventSource( HANDLE hEventLog ) } /****************************************************************************** + * EnableTrace [ADVAPI32.@] + */ +ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) +{ + FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, + debugstr_guid(guid), wine_dbgstr_longlong(hSession)); + + return ERROR_SUCCESS; +} + +/****************************************************************************** * GetNumberOfEventLogRecords [ADVAPI32.@] * * Retrieves the number of records in an event log.

1 0

Henri Verbeet : d3d9: Only run the vertex/ pixel shader constant apply tests when the implementation supports them.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 8f91327b893f5c0a0b0208d5c9a7ce1aa0b0550e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f91327b893f5c0a0b0208d5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:23 2009 +0200 d3d9: Only run the vertex/pixel shader constant apply tests when the implementation supports them. --- dlls/d3d9/tests/stateblock.c | 191 ++++++++++++++++++++++++----------------- 1 files changed, 112 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f91327b893f5c0a0b020…

1 0

Detlef Riekenberg : advapi32: Add stubs for QueryAllTraces[A|W].
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 4f7fc1b0512c239331fc1000d73ad6f93b2e1200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7fc1b0512c239331fc1000d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 11 17:19:29 2009 +0200 advapi32: Add stubs for QueryAllTraces[A|W]. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 4f3e693..a61051e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -445,8 +445,8 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) # @ stub ProcessIdleTasks # @ stub ProcessTrace -# @ stub QueryAllTracesA -# @ stub QueryAllTracesW +@ stdcall QueryAllTracesA(ptr long ptr) +@ stdcall QueryAllTracesW(ptr long ptr) # @ stub QueryRecoveryAgentsOnEncryptedFile @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 15cf4d5..7998039 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -264,6 +264,33 @@ HANDLE WINAPI OpenEventLogW( LPCWSTR uncname, LPCWSTR source ) } /****************************************************************************** + * QueryAllTracesW [ADVAPI32.@] + * + * Query informations for started event trace sessions + * + */ +ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) +{ + FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); + + if (psessioncount) *psessioncount = 0; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * QueryAllTracesA [ADVAPI32.@] + * + * See QueryAllTracesW. + */ +ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) +{ + FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); + + if (psessioncount) *psessioncount = 0; + return ERROR_SUCCESS; +} + +/****************************************************************************** * ReadEventLogA [ADVAPI32.@] * * Reads a whole number of entries from an event log.

1 0

Detlef Riekenberg : advapi32: Add stubs for ControlTrace[A|W].
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 61d6a6bf8873ba8068e6962d81ab74461f914a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d6a6bf8873ba8068e6962d8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 11 21:01:36 2009 +0200 advapi32: Add stubs for ControlTrace[A|W]. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index fde7f06..058760d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -65,8 +65,8 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) # @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -# @ stub ControlTraceA -# @ stub ControlTraceW +@ stdcall ControlTraceA(double str ptr long) +@ stdcall ControlTraceW(double wstr ptr long) # @ stub ConvertAccessToSecurityDescriptorA # @ stub ConvertAccessToSecurityDescriptorW # @ stub ConvertSDToStringSDRootDomainA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f84e15f..118bd11 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -116,6 +116,30 @@ BOOL WINAPI CloseEventLog( HANDLE hEventLog ) } /****************************************************************************** + * ControlTraceW [ADVAPI32.@] + * + * Control a givel event trace session + * + */ +ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * ControlTraceA [ADVAPI32.@] + * + * See ControlTraceW. + * + */ +ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** * DeregisterEventSource [ADVAPI32.@] * * Closes a write handle to an event log

1 0

Detlef Riekenberg : include: Add typedef for EVENT_TRACE_PROPERTIES.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: bc9421ad1b0315aa8a3cf38637cc353f442ebd8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9421ad1b0315aa8a3cf3863… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 11 17:09:04 2009 +0200 include: Add typedef for EVENT_TRACE_PROPERTIES. --- include/evntrace.h | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/evntrace.h b/include/evntrace.h index 093696b..8f94cd2 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -176,6 +176,27 @@ struct _EVENT_TRACE_LOGFILEA PVOID Context; }; +typedef struct _EVENT_TRACE_PROPERTIES +{ + WNODE_HEADER Wnode; + ULONG BufferSize; + ULONG MinimumBuffers; + ULONG MaximumBuffers; + ULONG MaximumFileSize; + ULONG LogFileMode; + ULONG FlushTimer; + LONG AgeLimit; + ULONG NumberOfBuffers; + ULONG FreeBuffers; + ULONG EventsLost; + ULONG BuffersWritten; + ULONG LogBuffersLost; + ULONG RealTimeBuffersLost; + HANDLE LoggerThreadId; + ULONG LoggerFileNameOffset; + ULONG LoggerNameOffset; +} EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; + ULONG WINAPI CloseTrace(TRACEHANDLE); ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE);

1 0

Jeffrey Morlan : netapi32: Fix heap buffer overflows.
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: d5f2172c093e0b4cef04fd3d99639c0b7300907c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f2172c093e0b4cef04fd3d9… Author: Jeffrey Morlan <mrnobo1024(a)yahoo.com> Date: Sun Oct 11 13:02:40 2009 -0700 netapi32: Fix heap buffer overflows. --- dlls/netapi32/access.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 8a3b8f4..0044035 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -112,7 +112,7 @@ static BOOL NETAPI_IsCurrentUser(LPCWSTR username) BOOL ret = FALSE; dwSize = LM20_UNLEN+1; - curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize); + curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); if(!curr_user) { ERR("Failed to allocate memory for user name.\n"); @@ -431,7 +431,7 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, return status; size = UNLEN + 1; - NetApiBufferAllocate(size, (LPVOID*)&currentuser); + NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser); GetUserNameW(currentuser, &size); if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) @@ -640,7 +640,7 @@ NetQueryDisplayInformation( /* get data */ dwSize = UNLEN + 1; - NetApiBufferAllocate(dwSize, (LPVOID *) &name); + NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &name); if (!GetUserNameW(name, &dwSize)) { NetApiBufferFree(name);

1 0

Ken Thomases : winecoreaudio: Fix an error check (bad copy-paste).
by Alexandre Julliard Oct. 12, 2009

Oct. 12, 2009

Module: wine Branch: master Commit: 687db1c680dd30cb3adb230d32b6dfcc7f93aed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687db1c680dd30cb3adb230d3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 11 14:14:03 2009 -0500 winecoreaudio: Fix an error check (bad copy-paste). --- dlls/winecoreaudio.drv/audiounit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 9314ef3..f69b03d 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -85,7 +85,7 @@ int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au) return 0; err = OpenAComponent(comp, au); - if (comp == NULL) + if (err != noErr || *au == NULL) return 0; callbackStruct.inputProc = CoreAudio_woAudioUnitIOProc;

1 0