April 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : shell32: Cleanup IShellItem creation calls.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 17339f4f94b9e76d52957e10a636627a56ab2517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17339f4f94b9e76d52957e10a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 12:55:48 2015 +0300 shell32: Cleanup IShellItem creation calls. --- dlls/shell32/shellitem.c | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d8cb6a8..a410381 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -548,7 +548,6 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, IShellFolder *psfParent, LPCITEMIDLIST pidl, IShellItem **ppsi) { - ShellItem *This; LPITEMIDLIST new_pidl; HRESULT ret; @@ -597,16 +596,9 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, return E_OUTOFMEMORY; } - ret = IShellItem_Constructor(NULL, &IID_IShellItem, (void**)&This); - if (This) - { - *ppsi = (IShellItem*)&This->IShellItem2_iface; - This->pidl = new_pidl; - } - else - { - ILFree(new_pidl); - } + ret = SHCreateItemFromIDList(new_pidl, &IID_IShellItem, (void**)ppsi); + ILFree(new_pidl); + return ret; } @@ -621,37 +613,34 @@ HRESULT WINAPI SHCreateItemFromParsingName(PCWSTR pszPath, ret = SHParseDisplayName(pszPath, pbc, &pidl, 0, NULL); if(SUCCEEDED(ret)) { - ShellItem *This; - ret = IShellItem_Constructor(NULL, riid, (void**)&This); - - if(SUCCEEDED(ret)) - { - This->pidl = pidl; - *ppv = (void*)This; - } - else - { - ILFree(pidl); - } + ret = SHCreateItemFromIDList(pidl, riid, ppv); + ILFree(pidl); } return ret; } HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv) { - ShellItem *psiimpl; + IPersistIDList *persist; HRESULT ret; if(!pidl) return E_INVALIDARG; - ret = IShellItem_Constructor(NULL, riid, ppv); - if(SUCCEEDED(ret)) + *ppv = NULL; + ret = IShellItem_Constructor(NULL, &IID_IPersistIDList, (void**)&persist); + if(FAILED(ret)) + return ret; + + ret = IPersistIDList_SetIDList(persist, pidl); + if(FAILED(ret)) { - psiimpl = (ShellItem*)*ppv; - psiimpl->pidl = ILClone(pidl); + IPersistIDList_Release(persist); + return ret; } + ret = IPersistIDList_QueryInterface(persist, riid, ppv); + IPersistIDList_Release(persist); return ret; }

1 0

Sebastian Lackner : wined3d: Fix typo in init_output_registers.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 3a14df3b9a9c5fbb6b9d292d4e5e748946587971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a14df3b9a9c5fbb6b9d292d4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 20:07:56 2015 +0200 wined3d: Fix typo in init_output_registers. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d4d5e1..091ae1d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4166,7 +4166,7 @@ static void init_output_registers(const struct wined3d_shader *shader, for (j = 0; j < ps_input_sig->element_count; ++j) { - const struct wined3d_shader_signature_element *input = &ps_input_sig->elements[i]; + const struct wined3d_shader_signature_element *input = &ps_input_sig->elements[j]; if (!input->semantic_name) continue;

1 0

Bruno Jesus : gdi32: Support negative count values in GetBitmapBits.
by Alexandre Julliard 08 Apr '15

08 Apr '15

Module: wine Branch: master Commit: 5c323a540c2892fdd4ca98e2b51da82a66e30f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c323a540c2892fdd4ca98e2b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 7 23:19:44 2015 -0300 gdi32: Support negative count values in GetBitmapBits. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/tests/bitmap.c | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 79374a0..6d1bed9 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -253,7 +253,7 @@ LONG WINAPI GetBitmapBits( dst_stride = get_bitmap_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel ); ret = max = dst_stride * bmp->dib.dsBm.bmHeight; if (!bits) goto done; - if (count > max) count = max; + if (count < 0 || count > max) count = max; ret = count; src.visrect.left = 0; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 84f843f..e19c552 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -56,8 +56,9 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE { BITMAP bm; BITMAP bma[2]; - INT ret, width_bytes; + INT ret, width_bytes, i; BYTE buf[512], buf_cmp[512]; + INT test_size[] = {0 /*first value will be changed */, 0, -1, -1000, ~0, sizeof(buf)}; ret = GetObjectW(hbm, sizeof(bm), &bm); ok(ret == sizeof(bm), "GetObject returned %d\n", ret); @@ -75,17 +76,28 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE assert(sizeof(buf) == sizeof(buf_cmp)); SetLastError(0xdeadbeef); - ret = GetBitmapBits(hbm, 0, NULL); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + test_size[0] = bm.bmWidthBytes * bm.bmHeight; + /* NULL output buffer with different count values */ + for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + { + ret = GetBitmapBits(hbm, test_size[i], NULL); + ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); + } memset(buf_cmp, 0xAA, sizeof(buf_cmp)); memset(buf_cmp, 0, bm.bmWidthBytes * bm.bmHeight); - memset(buf, 0xAA, sizeof(buf)); - ret = GetBitmapBits(hbm, sizeof(buf), buf); - ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), - "buffers do not match, depth %d\n", bmih->biBitCount); + /* Correct output buffer with different count values */ + for (i = 0; i < sizeof(test_size) / sizeof(test_size[0]); i++) + { + int expect = i == 1 ? 0 : bm.bmWidthBytes * bm.bmHeight; + memset(buf, 0xAA, sizeof(buf)); + ret = GetBitmapBits(hbm, test_size[i], buf); + ok(ret == expect, "Test[%d]: %d != %d\n", i, ret, expect); + if (expect) + ok(!memcmp(buf, buf_cmp, sizeof(buf)), + "Test[%d]: buffers do not match, depth %d\n", i, bmih->biBitCount); + } /* test various buffer sizes for GetObject */ ret = GetObjectW(hbm, sizeof(*bma) * 2, bma);

1 0

Bruno Jesus : netapi32: Better stub NetStatisticsGet().
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 4eff187961e99fc58f0812d37bc9fac79406c330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eff187961e99fc58f0812d37… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Apr 6 22:01:13 2015 -0300 netapi32: Better stub NetStatisticsGet(). --- dlls/netapi32/netapi32.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f9bfb48..33c0c17 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1083,8 +1083,51 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, DWORD level, DWORD options, LPBYTE *bufptr) { - TRACE("(%p, %p, %d, %d, %p)\n", server, service, level, options, bufptr); - return NERR_InternalError; + int res; + static const WCHAR SERVICE_WORKSTATION[] = { + 'L', 'a', 'n', 'm', 'a', 'n', + 'W', 'o', 'r', 'k', 's', 't', 'a', 't', 'i', 'o', 'n', '\0'}; + static const WCHAR SERVICE_SERVER[] = { + 'L', 'a', 'n', 'm', 'a', 'n', + 'S', 'e', 'r', 'v', 'e', 'r', '\0'}; + union + { + STAT_WORKSTATION_0 workst; + STAT_SERVER_0 server; + } *stat; + void *dataptr; + + TRACE("(server %s, service %s, level %d, options %d, buffer %p): stub\n", + debugstr_w(server), debugstr_w(service), level, options, bufptr); + + res = NetApiBufferAllocate(sizeof(*stat), &dataptr); + if (res != NERR_Success) return res; + + res = NERR_InternalError; + stat = dataptr; + switch (level) + { + case 0: + if (!lstrcmpW(service, SERVICE_WORKSTATION)) + { + /* Fill the struct STAT_WORKSTATION_0 properly */ + memset(&stat->workst, 0, sizeof(stat->workst)); + res = NERR_Success; + } + else if (!lstrcmpW(service, SERVICE_SERVER)) + { + /* Fill the struct STAT_SERVER_0 properly */ + memset(&stat->server, 0, sizeof(stat->server)); + res = NERR_Success; + } + break; + } + if (res != NERR_Success) + NetApiBufferFree(dataptr); + else + *bufptr = dataptr; + + return res; } NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize,

1 0

Sebastian Lackner : user32: Move key state cache into a separate struct.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 325c061bbd6fcd7ebaa60e62a69e52b000b61cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=325c061bbd6fcd7ebaa60e62a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 02:33:28 2015 +0200 user32: Move key state cache into a separate struct. --- dlls/user32/hook.c | 5 ++++- dlls/user32/input.c | 23 +++++++++++++++-------- dlls/user32/message.c | 7 ++++--- dlls/user32/user_private.h | 9 +++++++-- dlls/user32/winstation.c | 3 ++- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 2f6b42c..f19949c 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -437,7 +437,10 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - get_user_thread_info()->key_state_time = 0; /* force refreshing the key state cache */ + { + struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; + if (key_state_info) key_state_info->time = 0; /* force refreshing the key state cache */ + } return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b6eecbe..6ea2c2f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -368,7 +368,7 @@ static void check_for_events( UINT flags ) */ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -377,24 +377,31 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) { - if (thread_info->key_state && - !(thread_info->key_state[key] & 0xc0) && - GetTickCount() - thread_info->key_state_time < 50) + if (key_state_info && + !(key_state_info->state[key] & 0xc0) && + GetTickCount() - key_state_info->time < 50) + { + /* use cached value */ return 0; - - if (!thread_info->key_state) thread_info->key_state = HeapAlloc( GetProcessHeap(), 0, 256 ); + } + else if (!key_state_info) + { + key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); + get_user_thread_info()->key_state = key_state_info; + } ret = 0; SERVER_START_REQ( get_key_state ) { req->tid = 0; req->key = key; - if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); + if (key_state_info) wine_server_set_reply( req, key_state_info->state, + sizeof(key_state_info->state) ); if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; - thread_info->key_state_time = GetTickCount(); + if (key_state_info) key_state_info->time = GetTickCount(); } } SERVER_END_REQ; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eac4e4d..fbc11da 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3290,7 +3290,7 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO */ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) { - struct user_thread_info *thread_info = get_user_thread_info(); + struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; int prev_x, prev_y, new_x, new_y; NTSTATUS ret; @@ -3329,7 +3329,8 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) req->input.hw.lparam = MAKELONG( input->u.hi.wParamL, input->u.hi.wParamH ); break; } - if (thread_info->key_state) wine_server_set_reply( req, thread_info->key_state, 256 ); + if (key_state_info) wine_server_set_reply( req, key_state_info->state, + sizeof(key_state_info->state) ); ret = wine_server_call( req ); wait = reply->wait; prev_x = reply->prev_x; @@ -3341,7 +3342,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (!ret) { - if (thread_info->key_state) thread_info->key_state_time = GetTickCount(); + if (key_state_info) key_state_info->time = GetTickCount(); if ((flags & SEND_HWMSG_INJECTED) && (prev_x != new_x || prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 919540d..9e3a373 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -184,8 +184,7 @@ struct user_thread_info DWORD GetMessagePosVal; /* Value for GetMessagePos */ ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ UINT active_hooks; /* Bitmap of active hooks */ - UINT key_state_time; /* Time of last key state refresh */ - BYTE *key_state; /* Cache of global key state */ + struct user_key_state_info *key_state; /* Cache of global key state */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ RAWINPUT *rawinput; @@ -193,6 +192,12 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +struct user_key_state_info +{ + UINT time; /* Time of last key state refresh */ + BYTE state[256]; /* State for each key */ +}; + struct hook_extra_info { HHOOK handle; diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 12b9edc..d1353b4 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -399,9 +399,10 @@ BOOL WINAPI SetThreadDesktop( HDESK handle ) if (ret) /* reset the desktop windows */ { struct user_thread_info *thread_info = get_user_thread_info(); + struct user_key_state_info *key_state_info = thread_info->key_state; thread_info->top_window = 0; thread_info->msg_window = 0; - thread_info->key_state_time = 0; + if (key_state_info) key_state_info->time = 0; } return ret; }

1 0

Sebastian Lackner : user32: Invalidate key state cache globally after running LL hooks.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: d3be42ab96cf8925bb2abd5c26b8ffa67c8b910c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3be42ab96cf8925bb2abd5c2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 02:53:06 2015 +0200 user32: Invalidate key state cache globally after running LL hooks. --- dlls/user32/hook.c | 5 +---- dlls/user32/input.c | 9 ++++++++- dlls/user32/message.c | 7 ++++++- dlls/user32/user_private.h | 3 +++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f19949c..281b88e 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -437,10 +437,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - { - struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; - if (key_state_info) key_state_info->time = 0; /* force refreshing the key state cache */ - } + interlocked_xchg_add( &global_key_state_counter, 1 ); /* force refreshing the key state cache */ return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 6ea2c2f..57594a7 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -52,6 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); +INT global_key_state_counter = 0; /*********************************************************************** * get_key_state @@ -369,6 +370,7 @@ static void check_for_events( UINT flags ) SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; + INT counter = global_key_state_counter; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -379,6 +381,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { if (key_state_info && !(key_state_info->state[key] & 0xc0) && + key_state_info->counter == counter && GetTickCount() - key_state_info->time < 50) { /* use cached value */ @@ -401,7 +404,11 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; - if (key_state_info) key_state_info->time = GetTickCount(); + if (key_state_info) + { + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; + } } } SERVER_END_REQ; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fbc11da..2b544de 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3293,6 +3293,7 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; struct send_message_info info; int prev_x, prev_y, new_x, new_y; + INT counter = global_key_state_counter; NTSTATUS ret; BOOL wait; @@ -3342,7 +3343,11 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) if (!ret) { - if (key_state_info) key_state_info->time = GetTickCount(); + if (key_state_info) + { + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; + } if ((flags & SEND_HWMSG_INJECTED) && (prev_x != new_x || prev_y != new_y)) USER_Driver->pSetCursorPos( new_x, new_y ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 9e3a373..445fd40 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -192,9 +192,12 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +extern INT global_key_state_counter DECLSPEC_HIDDEN; + struct user_key_state_info { UINT time; /* Time of last key state refresh */ + INT counter; /* Counter to invalidate the key state */ BYTE state[256]; /* State for each key */ };

1 0

Sebastian Lackner : kernel32: Add stub for PowerCreateRequest.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 966dd5074dd51cc56afb4859de471ab144ae6750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966dd5074dd51cc56afb4859d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 15 01:44:12 2015 +0100 kernel32: Add stub for PowerCreateRequest. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 130affc..5258819 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1135,7 +1135,7 @@ @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall PostQueuedCompletionStatus(long long ptr ptr) # @ stub PowerClearRequest -# @ stub PowerCreateRequest +@ stdcall PowerCreateRequest(ptr) # @ stub PowerSetRequest @ stdcall PrepareTape(ptr long long) @ stub PrivCopyFileExW diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 6d4336d..74ec397 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -100,3 +100,14 @@ EXECUTION_STATE WINAPI SetThreadExecutionState(EXECUTION_STATE flags) current = flags; return old; } + +/*********************************************************************** + * PowerCreateRequest (KERNEL32.@) + */ +HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) +{ + FIXME("(%p): stub\n", context); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; +}

1 0

Sebastian Lackner : kernel32: Add stub for PowerSetRequest.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 25505995aff73a62cde60353269ec7aaa6c86c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25505995aff73a62cde603532… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 03:18:58 2015 +0200 kernel32: Add stub for PowerSetRequest. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 11 +++++++++++ include/winbase.h | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5258819..6e28b90 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1136,7 +1136,7 @@ @ stdcall PostQueuedCompletionStatus(long long ptr ptr) # @ stub PowerClearRequest @ stdcall PowerCreateRequest(ptr) -# @ stub PowerSetRequest +@ stdcall PowerSetRequest(long long) @ stdcall PrepareTape(ptr long long) @ stub PrivCopyFileExW @ stub PrivMoveFileIdentityW diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 74ec397..43e086e 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -111,3 +111,14 @@ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return INVALID_HANDLE_VALUE; } + +/*********************************************************************** + * PowerSetRequest (KERNEL32.@) + */ +BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) +{ + FIXME("(%p, %u): stub\n", request, type); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/winbase.h b/include/winbase.h index 82220c2..f845082 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -865,6 +865,12 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; +typedef enum _POWER_REQUEST_TYPE +{ + PowerRequestDisplayRequired, + PowerRequestSystemRequired, + PowerRequestAwayModeRequired +} POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; typedef struct _SYSTEM_INFO {

1 0

Sebastian Lackner : kernel32: Add stub for PowerClearRequest.
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: 4ae0ef44d2c2634d9d580a526c2a64ddd41bd61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae0ef44d2c2634d9d580a526… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 7 03:19:41 2015 +0200 kernel32: Add stub for PowerClearRequest. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/powermgnt.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6e28b90..bb72041 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1134,7 +1134,7 @@ @ stdcall PeekConsoleInputW(ptr ptr long ptr) @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall PostQueuedCompletionStatus(long long ptr ptr) -# @ stub PowerClearRequest +@ stdcall PowerClearRequest(long long) @ stdcall PowerCreateRequest(ptr) @ stdcall PowerSetRequest(long long) @ stdcall PrepareTape(ptr long long) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 43e086e..b5bd0d9 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -122,3 +122,14 @@ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * PowerClearRequest (KERNEL32.@) + */ +BOOL WINAPI PowerClearRequest(HANDLE request, POWER_REQUEST_TYPE type) +{ + FIXME("(%p, %u): stub\n", request, type); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Marcus Meissner : comctl32: Avoid integer overflow (Coverity).
by Alexandre Julliard 07 Apr '15

07 Apr '15

Module: wine Branch: master Commit: b4ec41220306a3504a7bbcf815bf802c7f4a37b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ec41220306a3504a7bbcf81… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 7 07:09:28 2015 +0200 comctl32: Avoid integer overflow (Coverity). --- dlls/comctl32/dsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 32f9926..a73a54a 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -488,5 +488,5 @@ ULONGLONG WINAPI DSA_GetSize(HDSA hdsa) if (!hdsa) return 0; - return sizeof(*hdsa) + hdsa->nMaxCount*hdsa->nItemSize; + return sizeof(*hdsa) + (ULONGLONG)hdsa->nMaxCount*hdsa->nItemSize; }

1 0