October 2015 - Wine-Commits

Matteo Bruni : wined3d: Store supported varyings count in d3d_limits.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 93db8e97da2690c62a5d4586d6214632a98df344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db8e97da2690c62a5d4586d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:19 2015 +0200 wined3d: Store supported varyings count in d3d_limits. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a321db..b1d9869 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5161,6 +5161,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } + caps->varying_count = 0; caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6801bcc..6d51432 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3707,6 +3707,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->d3d_info.limits.ps_version = shader_caps.ps_version; adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; + adapter->d3d_info.limits.varying_count = shader_caps.varying_count; adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c85b334..54f004f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7632,6 +7632,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = gl_info->limits.glsl_vs_float_constants; caps->ps_uniform_count = gl_info->limits.glsl_ps_float_constants; + caps->varying_count = gl_info->limits.glsl_varyings; /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement. diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2d80877..8574881 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1989,6 +1989,7 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = 0; caps->ps_uniform_count = 0; caps->ps_1x_max_value = 0.0f; + caps->varying_count = 0; caps->wined3d_caps = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d57899..fe3f97d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -774,6 +774,7 @@ struct shader_caps DWORD vs_uniform_count; DWORD ps_uniform_count; float ps_1x_max_value; + DWORD varying_count; DWORD wined3d_caps; }; @@ -1748,6 +1749,7 @@ struct wined3d_d3d_limits UINT vs_version, gs_version, ps_version; DWORD vs_uniform_count; DWORD ps_uniform_count; + UINT varying_count; UINT ffp_textures; UINT ffp_blend_stages; UINT ffp_vertex_blend_matrices;

1 0

Riccardo Bortolato : d3d8: Make use of wined3d_texture_unmap in d3d8_volume_UnlockBox.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: d49ad6c608c3e5effa0915527d87a5d13c6b4d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49ad6c608c3e5effa0915527… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:50 2015 +0200 d3d8: Make use of wined3d_texture_unmap in d3d8_volume_UnlockBox. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 52562ad..81cd40e 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_volume_unmap(volume->wined3d_volume); + hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); wined3d_mutex_unlock(); return hr;

1 0

Dmitry Timoshkov : oleview: Remove useless check for hPrevInst.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 65187a0b9997a8251b5853e1df9dff418282a42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65187a0b9997a8251b5853e1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:37 2015 +0800 oleview: Remove useless check for hPrevInst. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/oleview.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 5a11888..350f6ad 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -558,12 +558,9 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int { MSG msg; HANDLE hAccelTable; - - if(!hPrevInst) - { - if(!InitApplication(hInst)) - return FALSE; - } + + if(!InitApplication(hInst)) + return FALSE; if(!InitInstance(hInst, nCmdShow)) return FALSE;

1 0

Dmitry Timoshkov : oleview: Correctly set window' s class background and cursor.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: e10db2f22e50b6f575b921f6d3e2d363c2af46b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10db2f22e50b6f575b921f6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:30 2015 +0800 oleview: Correctly set window's class background and cursor. Otherwise background of some windows doesn't match current theme, and mouse cursor sometimes gets stuck after moving over vertical splitter. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/details.c | 3 ++- programs/oleview/oleview.c | 1 + programs/oleview/pane.c | 3 ++- programs/oleview/tree.c | 2 ++ programs/oleview/typelib.c | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 9fdd9f3..49d3dc4 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -397,7 +397,8 @@ HWND CreateDetailsWindow(HINSTANCE hInst) memset(&wcd, 0, sizeof(WNDCLASSW)); wcd.lpfnWndProc = DetailsProc; wcd.lpszClassName = wszDetailsClass; - wcd.hbrBackground = (HBRUSH)COLOR_WINDOW; + wcd.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcd.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); if(!RegisterClassW(&wcd)) return NULL; diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 69f4f9e..5a11888 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -499,6 +499,7 @@ static BOOL InitApplication(HINSTANCE hInst) memset(&wc, 0, sizeof(WNDCLASSW)); wc.lpfnWndProc = WndProc; wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MENU); wc.lpszClassName = wszAppName; diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index a96da4d..9e4cd28 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -135,7 +135,8 @@ BOOL PaneRegisterClassW(void) memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = PaneProc; - wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW); + wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcc.lpszClassName = wszPaneClass; if(!RegisterClassW(&wcc)) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 17844bf..4a16081 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -703,6 +703,8 @@ HWND CreateTreeWindow(HINSTANCE hInst) memset(&wct, 0, sizeof(WNDCLASSW)); wct.lpfnWndProc = TreeProc; wct.lpszClassName = wszTreeClass; + wct.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wct.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); if(!RegisterClassW(&wct)) return NULL; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index d07dd3c..3a60348 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1628,6 +1628,7 @@ BOOL TypeLibRegisterClassW(void) memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = TypeLibProc; wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcc.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wcc.lpszMenuName = MAKEINTRESOURCEW(IDM_TYPELIB); wcc.lpszClassName = wszTypeLib;

1 0

Dmitry Timoshkov : oleview: Fix compilation with PSDK.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: edb35ff096db2b5c4a2c5c5188963a0947f01028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb35ff096db2b5c4a2c5c518… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:23 2015 +0800 oleview: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/oleview.c | 2 +- programs/oleview/typelib.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 3a379b4..69f4f9e 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -422,7 +422,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, sizeof(filter_typelib)/sizeof(WCHAR)); LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); - snprintfW( filter, MAX_PATH, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); + wsprintfW( filter, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); InitOpenFileName(hWnd, &ofn, filter, wszTitle, wszName); if(GetOpenFileNameW(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); break; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 21e9d96..d07dd3c 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "main.h" #include "wine/debug.h"

1 0

Alex Henrie : kernel32: Make TERM_dbkey_init const.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 1eef1299f595703acc7fe01a5a834d2eae3923bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eef1299f595703acc7fe01a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:06:21 2015 -0600 kernel32: Make TERM_dbkey_init const. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/term.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 814b937..171476a 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -227,7 +227,7 @@ struct dbkey_init struct dbkey_descr descr; }; -static struct dbkey_init TERM_dbkey_init[] = { +static const struct dbkey_init TERM_dbkey_init[] = { {"kcud1", "kDN", {dbk_complex, 0x50, 0x28, 0}}, {"kcuu1", "kUP", {dbk_complex, 0x48, 0x26, 0}}, {"kcub1", "kLFT", {dbk_complex, 0x4b, 0x25, 0}}, @@ -342,7 +342,7 @@ static int TERM_dbkey_cmp(const void* p1, const void* p2) return strcmp(kp1->string, kp2->string); } -static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) +static BOOL TERM_AddKeyDescr(const char* string, const struct dbkey_descr* descr) { if (!string || string == (const char*)-1) return TRUE; if (!TERM_dbkey)

1 0

Piotr Caban : comctl32: Test TrackMouseEvent flags when LVS_EX_ONECLICKACTIVATE style is used.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: aa39614e77ebdb21aeb97714c634fbbacc687b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa39614e77ebdb21aeb97714c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 6 16:25:15 2015 +0200 comctl32: Test TrackMouseEvent flags when LVS_EX_ONECLICKACTIVATE style is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8573318..118b4a2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5745,11 +5745,28 @@ static void test_header_proc(void) DestroyWindow(hwnd); } +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + static void test_oneclickactivate(void) { + TRACKMOUSEEVENT track; char item1[] = "item1"; LVITEMA item; HWND hwnd, fg; + RECT rect; INT r; hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, @@ -5775,6 +5792,18 @@ static void test_oneclickactivate(void) r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.left+5, rect.top+5); + flush_events(); + r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0); + expect(0, r); + + track.cbSize = sizeof(track); + track.dwFlags = TME_QUERY; + _TrackMouseEvent(&track); + ok(track.hwndTrack == hwnd, "hwndTrack != hwnd\n"); + ok(track.dwFlags == TME_LEAVE, "dwFlags = %x\n", track.dwFlags); + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(0, r); r = SendMessageA(hwnd, WM_MOUSEHOVER, MAKELONG(1, 1), 0);

1 0

Sebastian Lackner : ntdll/tests: Limit number of pool threads to avoid random test failures.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: f97a18f8c033a4c4080e5a7aae5b28b3a41079b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97a18f8c033a4c4080e5a7aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:23:54 2015 +0200 ntdll/tests: Limit number of pool threads to avoid random test failures. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 9197660..a262ecb 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -228,6 +228,7 @@ static void test_tp_simple(void) /* test cancellation of pending simple callbacks */ userdata = 0; + pTpSetPoolMaxThreads(pool, 10); memset(&environment, 0, sizeof(environment)); environment.Version = 1; environment.Pool = pool;

1 0

Sebastian Lackner : vcomp: Implement _vcomp_get_thread_num.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 0410cf9cbe143720f12c0f8f48e7526a4769cae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0410cf9cbe143720f12c0f8f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 05:46:25 2015 +0200 vcomp: Implement _vcomp_get_thread_num. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/tests/vcomp.c | 7 +++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index d442155..5aa0343 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -480,6 +480,12 @@ int CDECL omp_get_thread_num(void) return vcomp_init_thread_data()->thread_num; } +int CDECL _vcomp_get_thread_num(void) +{ + TRACE("()\n"); + return vcomp_init_thread_data()->thread_num; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 83125e1..4f030d3 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -65,6 +65,7 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static int (CDECL *p_vcomp_get_thread_num)(void); static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); @@ -254,6 +255,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_get_thread_num); VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); @@ -306,6 +308,8 @@ static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, thread_num = pomp_get_thread_num(); ok(thread_num >= 0 && thread_num < num_threads, "expected thread_num in range [0, %d], got %d\n", num_threads - 1, thread_num); + ok(thread_num == p_vcomp_get_thread_num(), + "expected _vcomp_get_thread_num to return the same value\n"); is_parallel = pomp_in_parallel(); ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); @@ -344,6 +348,9 @@ static void test_omp_get_num_threads(BOOL nested) int is_nested, is_parallel, max_threads, num_threads, thread_num; LONG thread_count; + ok(pomp_get_thread_num != p_vcomp_get_thread_num, + "expected omp_get_thread_num != _vcomp_get_thread_num\n"); + pomp_set_nested(nested); is_nested = pomp_get_nested(); ok(is_nested == nested, "expected %d, got %d\n", nested, is_nested); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 52b929f..7703e2e 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() @ cdecl _vcomp_leave_critsect(ptr) @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 4b646eb..849125f 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 1ee7fba..87a7205 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -66,7 +66,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 4b646eb..849125f 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin

1 0

Piotr Caban : comctl32: Don' t use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified.
by Alexandre Julliard Oct. 7, 2015

Oct. 7, 2015

Module: wine Branch: master Commit: 9c87c7e76dbb860884308c7f609fb3588d3e686d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c87c7e76dbb860884308c7f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 7 10:17:14 2015 +0200 comctl32: Don't use uninitialized LVITEM fields in LISTVIEW_InsertItemT when LVS_EX_CHECKBOXES was specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listview.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c0956ad..a76935a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7851,10 +7851,18 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, item.iItem = nItem; if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) { - item.mask |= LVIF_STATE; - item.stateMask |= LVIS_STATEIMAGEMASK; - item.state &= ~LVIS_STATEIMAGEMASK; - item.state |= INDEXTOSTATEIMAGEMASK(1); + if (item.mask & LVIF_STATE) + { + item.stateMask |= LVIS_STATEIMAGEMASK; + item.state &= ~LVIS_STATEIMAGEMASK; + item.state |= INDEXTOSTATEIMAGEMASK(1); + } + else + { + item.mask |= LVIF_STATE; + item.stateMask = LVIS_STATEIMAGEMASK; + item.state = INDEXTOSTATEIMAGEMASK(1); + } } if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo;

1 0