May 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Implement GdipSetLineSigmaBlend.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 1860b3261813166452efe5cdd4773c9804ad1704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860b3261813166452efe5cdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 4 17:53:48 2009 -0500 gdiplus: Implement GdipSetLineSigmaBlend. --- dlls/gdiplus/brush.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 74e7764..60d5970 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1193,15 +1193,57 @@ GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line, GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient *line, REAL focus, REAL scale) { - static int calls; + REAL factors[33]; + REAL positions[33]; + int num_points = 0; + int i; + const int precision = 16; + REAL erf_range; /* we use values erf(-erf_range) through erf(+erf_range) */ + REAL min_erf; + REAL scale_erf; + + TRACE("(%p, %0.2f, %0.2f)\n", line, focus, scale); if(!line || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* we want 2 standard deviations */ + erf_range = 2.0 / sqrt(2); - return NotImplemented; + /* calculate the constants we need to normalize the error function to be + between 0.0 and scale over the range we need */ + min_erf = erf(-erf_range); + scale_erf = scale / (-2.0 * min_erf); + + if (focus != 0.0) + { + positions[0] = 0.0; + factors[0] = 0.0; + for (i=1; i<precision; i++) + { + positions[i] = focus * i / precision; + factors[i] = scale_erf * (erf(2 * erf_range * i / precision - erf_range) - min_erf); + } + num_points += precision; + } + + positions[num_points] = focus; + factors[num_points] = scale; + num_points += 1; + + if (focus != 1.0) + { + for (i=1; i<precision; i++) + { + positions[i+num_points-1] = (focus + ((1.0-focus) * i / precision)); + factors[i+num_points-1] = scale_erf * (erf(erf_range - 2 * erf_range * i / precision) - min_erf); + } + num_points += precision; + positions[num_points-1] = 1.0; + factors[num_points-1] = 0.0; + } + + return GdipSetLineBlend(line, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line,

1 0

Henri Verbeet : wined3d: Store the SM 1-3 opcode information tables in the SM 1-3 frontend.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 2a5a6a34390e255740828b7cb5147728ef13022d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5a6a34390e255740828b7cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Store the SM 1-3 opcode information tables in the SM 1-3 frontend. --- dlls/wined3d/arb_program_shader.c | 8 +- dlls/wined3d/baseshader.c | 36 +++--- dlls/wined3d/device.c | 4 +- dlls/wined3d/glsl_shader.c | 8 +- dlls/wined3d/pixelshader.c | 106 ++--------------- dlls/wined3d/shader_sm1.c | 234 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/shader_sm4.c | 28 ++++- dlls/wined3d/vertexshader.c | 87 ++------------ dlls/wined3d/wined3d_private.h | 44 +++---- 9 files changed, 314 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a5a6a34390e255740828…

1 0

Vitaliy Margolen : xinput1_3: Better match native export order.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 6f60208401a2d7eb6bc43a229eaebec1a25c7678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f60208401a2d7eb6bc43a229… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon May 4 11:35:18 2009 -0600 xinput1_3: Better match native export order. --- dlls/xinput1_3/xinput1_3.spec | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index be1f411..5b7f1b9 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,7 +1,8 @@ -@ stdcall XInputEnable(long) -@ stdcall XInputSetState(long ptr) -@ stdcall XInputGetState(long ptr) -@ stdcall XInputGetKeystroke(long long ptr) -@ stdcall XInputGetCapabilities(long long ptr) -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) -@ stdcall XInputGetBatteryInformation(long ptr ptr) +1 stdcall DllMain(long long ptr) +2 stdcall XInputGetState(long ptr) +3 stdcall XInputSetState(long ptr) +4 stdcall XInputGetCapabilities(long long ptr) +5 stdcall XInputEnable(long) +6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +7 stdcall XInputGetBatteryInformation(long ptr ptr) +8 stdcall XInputGetKeystroke(long long ptr)

1 0

Henri Verbeet : wined3d: Handle reading the shader header in the frontend.
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: 868f5bfc7c21431fff41c0b4c1dc4d03f56e0109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868f5bfc7c21431fff41c0b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Handle reading the shader header in the frontend. In SM 1-3 this is just the version, in SM4 this also includes the token count. --- dlls/wined3d/baseshader.c | 26 ++++++-------------------- dlls/wined3d/shader_sm1.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9c466fc..75cf2d5 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -342,13 +342,8 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); - /* The version token is supposed to be the first token */ - if (!shader_is_version_token(*pToken)) - { - FIXME("First token is not a version token, invalid shader.\n"); - return WINED3DERR_INVALIDCALL; - } - reg_maps->shader_version = shader_version = *pToken++; + fe->shader_read_header(&pToken, &shader_version); + reg_maps->shader_version = shader_version; pshader = shader_is_pshader_version(shader_version); while (!fe->shader_is_end(&pToken)) @@ -868,7 +863,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ const SHADER_OPCODE *opcode_table = This->baseShader.shader_ins; const SHADER_HANDLER *handler_table = device->shader_backend->shader_instruction_handler_table; - DWORD shader_version = reg_maps->shader_version; struct wined3d_shader_src_param src_rel_addr[4]; struct wined3d_shader_src_param src_param[4]; struct wined3d_shader_src_param dst_rel_addr; @@ -877,6 +871,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, struct wined3d_shader_context ctx; const DWORD *pToken = pFunction; SHADER_HANDLER hw_fct; + DWORD shader_version; DWORD i; /* Initialize current parsing state */ @@ -889,11 +884,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ins.src = src_param; This->baseShader.parse_state.current_row = 0; - if (!shader_is_version_token(*pToken++)) - { - ERR("First token is not a version token, invalid shader.\n"); - return; - } + fe->shader_read_header(&pToken, &shader_version); while (!fe->shader_is_end(&pToken)) { @@ -995,13 +986,8 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, TRACE("Parsing %p\n", pFunction); - /* The version token is supposed to be the first token */ - if (!shader_is_version_token(*pToken)) - { - FIXME("First token is not a version token, invalid shader.\n"); - return; - } - shader_version = *pToken++; + fe->shader_read_header(&pToken, &shader_version); + TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version) ? "ps": "vs", WINED3DSHADER_VERSION_MAJOR(shader_version), WINED3DSHADER_VERSION_MINOR(shader_version)); diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 225f632..7e2484d 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -221,6 +221,12 @@ static int shader_skip_unrecognized(const DWORD *ptr, DWORD shader_version) return tokens_read; } +static void shader_sm1_read_header(const DWORD **ptr, DWORD *shader_version) +{ + TRACE("version: 0x%08x\n", **ptr); + *shader_version = *(*ptr)++; +} + static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -318,6 +324,7 @@ static BOOL shader_sm1_is_end(const DWORD **ptr) const struct wined3d_shader_frontend sm1_shader_frontend = { + shader_sm1_read_header, shader_sm1_read_opcode, shader_sm1_read_src_param, shader_sm1_read_dst_param, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ba66123..c2d7729 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -23,6 +23,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) +{ + TRACE("version: 0x%08x\n", **ptr); + *shader_version = *(*ptr)++; + TRACE("token count: %u\n", **ptr); + ++(*ptr); +} + static void shader_sm4_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -63,6 +71,7 @@ static BOOL shader_sm4_is_end(const DWORD **ptr) const struct wined3d_shader_frontend sm4_shader_frontend = { + shader_sm4_read_header, shader_sm4_read_opcode, shader_sm4_read_src_param, shader_sm4_read_dst_param, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c08e4d7..db691d9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -674,6 +674,7 @@ struct wined3d_shader_semantic struct wined3d_shader_frontend { + void (*shader_read_header)(const DWORD **ptr, DWORD *shader_version); void (*shader_read_opcode)(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version); void (*shader_read_src_param)(const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Detlef Riekenberg : msi/tests: Run tests again with older msi versions ( MsiApplyMultiplePatchesA).
by Alexandre Julliard May 5, 2009

May 5, 2009

Module: wine Branch: master Commit: a31e9a1bfa509bbd96c0c4fc4be95c7412e9766e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31e9a1bfa509bbd96c0c4fc4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 4 23:08:52 2009 +0200 msi/tests: Run tests again with older msi versions (MsiApplyMultiplePatchesA). --- dlls/msi/tests/package.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 82b7110..a7e5261 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -32,6 +32,8 @@ static const char msifile[] = "winetest.msi"; char CURR_DIR[MAX_PATH]; +static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); + static void get_user_sid(LPSTR *usersid) { HANDLE token; @@ -11537,13 +11539,18 @@ static void test_MsiApplyMultiplePatches(void) { UINT r, type = GetDriveType(NULL); - r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); + if (!pMsiApplyMultiplePatchesA) { + win_skip("MsiApplyMultiplePatchesA not found\n"); + return; + } + + r = pMsiApplyMultiplePatchesA(NULL, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = MsiApplyMultiplePatchesA("", NULL, NULL); + r = pMsiApplyMultiplePatchesA("", NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = MsiApplyMultiplePatchesA(";", NULL, NULL); + r = pMsiApplyMultiplePatchesA(";", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11554,7 +11561,7 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); + r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11565,7 +11572,7 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA(";;", NULL, NULL); + r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11576,10 +11583,10 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); + r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); + r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11590,15 +11597,19 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); + r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = MsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); + r = pMsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } START_TEST(package) { + HMODULE hmsi = GetModuleHandleA("msi.dll"); + + pMsiApplyMultiplePatchesA = (void *)GetProcAddress(hmsi, "MsiApplyMultiplePatchesA"); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); test_createpackage();

1 0

Rein Klazes : user32: Combine horizontal and vertical window scroll bar info in a single structure .
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 1b1e0027db96374cc55e4f5de9128246fc9e9704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1e0027db96374cc55e4f5de… Author: Rein Klazes <wijn(a)online.nl> Date: Sun May 3 19:39:30 2009 +0200 user32: Combine horizontal and vertical window scroll bar info in a single structure. --- dlls/user32/defwnd.c | 5 +-- dlls/user32/scroll.c | 44 ++++++++++++++++++++++++--------- dlls/user32/tests/scroll.c | 57 ++++++++++++++++++++++++++++++++++++------- dlls/user32/win.c | 3 +- dlls/user32/win.h | 3 +- 5 files changed, 83 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1e0027db96374cc55e4…

1 0

Nikolay Sivov : comctl32/listview: Test WM_ERASEBKGND forwarding to parent on CL_NONE background.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 1fac98d3c1f28346f1e4c273c4dacfb12cca12d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fac98d3c1f28346f1e4c273c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:12:50 2009 +0400 comctl32/listview: Test WM_ERASEBKGND forwarding to parent on CL_NONE background. --- dlls/comctl32/tests/listview.c | 47 +++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6b575dc..42bb189 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -26,9 +26,10 @@ #include "wine/test.h" #include "msg.h" -#define PARENT_SEQ_INDEX 0 -#define LISTVIEW_SEQ_INDEX 1 -#define NUM_MSG_SEQUENCES 2 +#define PARENT_SEQ_INDEX 0 +#define PARENT_FULL_SEQ_INDEX 1 +#define LISTVIEW_SEQ_INDEX 2 +#define NUM_MSG_SEQUENCES 3 #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -162,6 +163,11 @@ static const struct message empty_seq[] = { { 0 } }; +static const struct message forward_erasebkgnd_parent_seq[] = { + { WM_ERASEBKGND, sent }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -173,6 +179,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP LRESULT ret; struct message msg; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + /* log system messages, except for painting */ if (message < WM_USER && message != WM_PAINT && @@ -185,13 +197,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP { trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; - msg.flags = sent|wparam|lparam; - if (defwndproc_counter) msg.flags |= defwinproc; - msg.wParam = wParam; - msg.lParam = lParam; add_message(sequences, PARENT_SEQ_INDEX, &msg); } + add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); @@ -1058,6 +1066,8 @@ static void test_create(void) static void test_redraw(void) { HWND hwnd, hwndheader; + HDC hdc; + BOOL res; hwnd = create_listview_control(0); hwndheader = subclass_header(hwnd); @@ -1071,6 +1081,27 @@ static void test_redraw(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* forward WM_ERASEBKGND to parent on CLR_NONE background color */ + res = ListView_SetBkColor(hwnd, CLR_NONE); + expect(TRUE, res); + + hdc = GetWindowDC(hwndparent); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, forward_erasebkgnd_parent_seq, + "forward WM_ERASEBKGND on CLR_NONE", TRUE); + + res = ListView_SetBkColor(hwnd, CLR_DEFAULT); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, empty_seq, + "don't forward WM_ERASEBKGND on non-CLR_NONE", FALSE); + + ReleaseDC(hwndparent, hdc); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Additional test for LVS_EX_HEADERDRAGDROP.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 59b08cc1e3e0d6d3810a50e9cfb5cb1f44bb4e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b08cc1e3e0d6d3810a50e9c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:12:12 2009 +0400 comctl32/listview: Additional test for LVS_EX_HEADERDRAGDROP. --- dlls/comctl32/tests/listview.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ee5eb7f..6b575dc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1020,6 +1020,7 @@ static void test_create(void) /* setting LVS_EX_HEADERDRAGDROP creates header */ hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(!IsWindow(hHeader), "Header shouldn't be created\n"); ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); @@ -1028,6 +1029,13 @@ static void test_create(void) ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + /* not report style accepts LVS_EX_HEADERDRAGDROP too */ + hList = create_custom_listview_control(0); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); + r = SendMessage(hList, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + ok(r & LVS_EX_HEADERDRAGDROP, "Expected LVS_EX_HEADERDRAGDROP to be set\n"); + DestroyWindow(hList); + /* requesting header info with LVM_GETSUBITEMRECT doesn't create it */ hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0);

1 0

Nikolay Sivov : comctl32/listview: Forward WM_ERASEBKGND to parent on CLR_NONE.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 50c3b530f7e167cfe31579a5213ede6677bff110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c3b530f7e167cfe31579a52… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:14:44 2009 +0400 comctl32/listview: Forward WM_ERASEBKGND to parent on CLR_NONE. --- dlls/comctl32/listview.c | 5 +++-- dlls/comctl32/tests/listview.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 75556e6..0f163ef 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -36,8 +36,6 @@ * -- EN_KILLFOCUS should be handled in WM_COMMAND * -- WM_CREATE: create the icon and small icon image lists at this point only if * the LVS_SHAREIMAGELISTS style is not specified. - * -- WM_ERASEBKGND: forward this message to the parent window if the bkgnd - * color is CLR_NONE. * -- WM_WINDOWPOSCHANGED: arrange the list items if the current view is icon * or small icon and the LVS_AUTOARRANGE style is specified. * -- WM_TIMER @@ -8290,6 +8288,9 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (!GetClipBox(hdc, &rc)) return FALSE; + if (infoPtr->clrBk == CLR_NONE) + return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + /* for double buffered controls we need to do this during refresh */ if (infoPtr->dwLvExStyle & LVS_EX_DOUBLEBUFFER) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 42bb189..b6cbd47 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1068,6 +1068,7 @@ static void test_redraw(void) HWND hwnd, hwndheader; HDC hdc; BOOL res; + DWORD r; hwnd = create_listview_control(0); hwndheader = subclass_header(hwnd); @@ -1082,21 +1083,45 @@ static void test_redraw(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* forward WM_ERASEBKGND to parent on CLR_NONE background color */ + /* 1. Without backbuffer */ res = ListView_SetBkColor(hwnd, CLR_NONE); expect(TRUE, res); hdc = GetWindowDC(hwndparent); flush_sequences(sequences, NUM_MSG_SEQUENCES); - SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok(r != 0, "Expected not zero result\n"); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, forward_erasebkgnd_parent_seq, + "forward WM_ERASEBKGND on CLR_NONE", FALSE); + + res = ListView_SetBkColor(hwnd, CLR_DEFAULT); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok(r != 0, "Expected not zero result\n"); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, empty_seq, + "don't forward WM_ERASEBKGND on non-CLR_NONE", FALSE); + + /* 2. With backbuffer */ + SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_DOUBLEBUFFER, + LVS_EX_DOUBLEBUFFER); + res = ListView_SetBkColor(hwnd, CLR_NONE); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok(r != 0, "Expected not zero result\n"); ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, forward_erasebkgnd_parent_seq, - "forward WM_ERASEBKGND on CLR_NONE", TRUE); + "forward WM_ERASEBKGND on CLR_NONE", FALSE); res = ListView_SetBkColor(hwnd, CLR_DEFAULT); expect(TRUE, res); flush_sequences(sequences, NUM_MSG_SEQUENCES); - SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + todo_wine ok(r != 0, "Expected not zero result\n"); ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, empty_seq, "don't forward WM_ERASEBKGND on non-CLR_NONE", FALSE);

1 0

Michael Stefaniuc : msctf/tests: Move 'inline' right after the storage specifier.
by Alexandre Julliard May 4, 2009

May 4, 2009

Module: wine Branch: master Commit: 2d8f252def312f596f97d1eefbf546e3dcdd17ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8f252def312f596f97d1eef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 4 14:54:44 2009 +0200 msctf/tests: Move 'inline' right after the storage specifier. --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index be53391..9f2900a 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -447,7 +447,7 @@ static void test_Activate(void) todo_wine ok(SUCCEEDED(hr),"Failed to Activate text service\n"); } -static int inline check_context_refcount(ITfContext *iface) +static inline int check_context_refcount(ITfContext *iface) { IUnknown_AddRef(iface); return IUnknown_Release(iface);

1 0