January 2013 - Wine-Commits

Jason Edmeades : cmd: Avoid division by zero in set /a with %.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 3735bf6af56ea9e15997dd7e07887666b066472a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3735bf6af56ea9e15997dd7e0… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sun Jan 6 20:23:53 2013 +0000 cmd: Avoid division by zero in set /a with %. --- programs/cmd/builtins.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4590769..0937dcd 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3661,6 +3661,7 @@ static int WCMD_reduce(OPSTACK **opstack, VARSTACK **varstack) { WCMD_pushnumber(NULL, var2&var1, varstack); break; case '%': var2 = WCMD_popnumber(varstack); + if (var1 == 0) return WCMD_DIVIDEBYZERO; WCMD_pushnumber(NULL, var2%var1, varstack); break; case '^': var2 = WCMD_popnumber(varstack);

1 0

André Hentschel : winedbg: Add shifted register dataprocessing operators to Thumb2 disassembler.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 2b9555fba8caf5585836283fff017b4fe7a60cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9555fba8caf5585836283ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 6 18:05:56 2013 +0100 winedbg: Add shifted register dataprocessing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 9f6c824..d313ce0 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1206,6 +1206,100 @@ static UINT thumb2_disasm_dataprocessingmod(UINT inst, ADDRESS64 *addr) } } +static UINT thumb2_disasm_dataprocessingshift(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 21) & 0x0f; + WORD sf = (inst >> 20) & 0x01; + WORD imm5 = ((inst >> 10) & 0x1c) + ((inst >> 6) & 0x03); + WORD type = (inst >> 4) & 0x03; + + if (!imm5 && (type == 1 || type == 2)) imm5 = 32; + else if (!imm5 && type == 3) type = 4; + + switch (op) + { + case 0: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\ttst\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\tand%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 1: + dbg_printf("\n\tbic%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 2: + if (get_nibble(inst, 4) == 15) + { + if (type == 4) + dbg_printf("\n\trrx%s\t%s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + else if (!type && !imm5) + dbg_printf("\n\tmov%s\t%s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\t%s%s\t%s, %s, #%u", tbl_shifts[type], sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)], imm5); + return 0; + } + else + dbg_printf("\n\torr%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 3: + if (get_nibble(inst, 4) == 15) + dbg_printf("\n\tmvn%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\torn%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 4: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tteq\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\teor%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 8: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmn\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\tadd%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 10: + dbg_printf("\n\tadc%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 11: + dbg_printf("\n\tsbc%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 13: + if (get_nibble(inst, 2) == 15) + dbg_printf("\n\tcmp\t%s, %s", tbl_regs[get_nibble(inst, 4)], + tbl_regs[get_nibble(inst, 0)]); + else + dbg_printf("\n\tsub%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + case 14: + dbg_printf("\n\trsb%s\t%s, %s, %s", sf ? "s" : "", tbl_regs[get_nibble(inst, 2)], + tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + break; + default: + return inst; + } + + if (type == 4) + dbg_printf(", rrx"); + else if (type || imm5) + dbg_printf(", %s #%u", tbl_shifts[type], imm5); + return 0; +} + static UINT thumb2_disasm_coprocdat(UINT inst, ADDRESS64 *addr) { WORD opc2 = (inst >> 5) & 0x07; @@ -1444,6 +1538,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xfe500000, 0xf8100000, thumb2_disasm_ldrnonword }, { 0xfa008000, 0xf2000000, thumb2_disasm_dataprocessing }, { 0xfa008000, 0xf0000000, thumb2_disasm_dataprocessingmod }, + { 0xfe008000, 0xea000000, thumb2_disasm_dataprocessingshift }, { 0xef000010, 0xee000000, thumb2_disasm_coprocdat }, { 0xef000010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0xefe00000, 0xec400000, thumb2_disasm_coprocmov2 },

1 0

Henri Verbeet : wined3d: Get rid of the user_stream field from wined3d_state.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 3e7c800e9c1c2b021021dddbda9178303c63ebb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7c800e9c1c2b021021dddbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:08 2013 +0100 wined3d: Get rid of the user_stream field from wined3d_state. All remaining uses are equivalent to "device->up_strided". (Which should of course eventually go away as well.) --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 -- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c0b66b1..9dfb3a9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2298,7 +2298,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de device_preload_textures(device); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) device_update_stream_info(device, context->gl_info); - if (state->index_buffer && !state->user_stream) + if (state->index_buffer && !device->up_strided) { if (device->strided_streams.all_vbo) wined3d_buffer_preload(state->index_buffer); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78997f0..d718b04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4162,12 +4162,10 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic prev_idx_format = device->stateBlock->state.index_format; device->stateBlock->state.index_format = index_data_format_id; - device->stateBlock->state.user_stream = TRUE; device->stateBlock->state.base_vertex_index = 0; device->up_strided = strided_data; draw_primitive(device, 0, index_count, 0, 0, TRUE, index_data); device->up_strided = NULL; - device->stateBlock->state.user_stream = FALSE; device->stateBlock->state.index_format = prev_idx_format; device_invalidate_state(device, STATE_VDECL); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 67f84a5..ed32ee2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -676,7 +676,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (indexed) { - if (!state->user_stream) + if (!device->up_strided) { struct wined3d_buffer *index_buffer = state->index_buffer; if (!index_buffer->buffer_object || !stream_info->all_vbo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09055f7..a045f7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,7 +2296,6 @@ struct wined3d_state struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_stream_output stream_output[MAX_STREAM_OUT]; struct wined3d_stream_state streams[MAX_STREAMS + 1 /* tesselated pseudo-stream */]; - BOOL user_stream; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; INT base_vertex_index;

1 0

Henri Verbeet : wined3d: Remove a redundant condition in the indexbuffer() state handler.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 5b42297a319fc051814314e79ca09e922bce130f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b42297a319fc051814314e79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 6 14:44:07 2013 +0100 wined3d: Remove a redundant condition in the indexbuffer() state handler. Strided draws don't use VBOs. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a193fbd..6d97981 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4897,7 +4897,7 @@ static void indexbuffer(struct wined3d_context *context, const struct wined3d_st const struct wined3d_stream_info *stream_info = &context->swapchain->device->strided_streams; const struct wined3d_gl_info *gl_info = context->gl_info; - if (state->user_stream || !state->index_buffer || !stream_info->all_vbo) + if (!state->index_buffer || !stream_info->all_vbo) { GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); }

1 0

Francois Gouget : netstat: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: ca9ceddd5ddf4aa549db5f0288420128eec62995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ceddd5ddf4aa549db5f028… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 5 16:17:30 2013 +0100 netstat: Fix compilation on systems that don't support nameless unions. --- programs/netstat/netstat.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index a3f584c..4f29788 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION #include "netstat.h" #include <winsock2.h> #include <iphlpapi.h> @@ -178,9 +179,9 @@ static void NETSTAT_tcp_table(void) for (i = 0; i < table->dwNumEntries; i++) { - if ((table->table[i].dwState == MIB_TCP_STATE_CLOSE_WAIT) || - (table->table[i].dwState == MIB_TCP_STATE_ESTAB) || - (table->table[i].dwState == MIB_TCP_STATE_TIME_WAIT)) + if ((table->table[i].u.dwState == MIB_TCP_STATE_CLOSE_WAIT) || + (table->table[i].u.dwState == MIB_TCP_STATE_ESTAB) || + (table->table[i].u.dwState == MIB_TCP_STATE_TIME_WAIT)) { NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); @@ -189,7 +190,7 @@ static void NETSTAT_tcp_table(void) sprintfW(Host, fmtcolon, HostIp, HostPort); sprintfW(Remote, fmtcolon, RemoteIp, RemotePort); - NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, NETSTAT_load_message(table->table[i].dwState)); + NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, NETSTAT_load_message(table->table[i].u.dwState)); } } HeapFree(GetProcessHeap(), 0, table);

1 0

Daniel Jelinski : comctl32/tests: Add tests for listview header image list.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 19641457136f1b531db43afadfb6403de06000ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=19641457136f1b531db43afad… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Jan 6 15:32:38 2013 +0100 comctl32/tests: Add tests for listview header image list. --- dlls/comctl32/tests/listview.c | 97 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0a42dad..01b90ae 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -339,6 +339,17 @@ static const struct message parent_header_divider_dclick_seq[] = { { 0 } }; +static const struct message listview_set_imagelist[] = { + { LVM_SETIMAGELIST, sent|id, 0, 0, LISTVIEW_ID }, + { 0 } +}; + +static const struct message listview_header_set_imagelist[] = { + { LVM_SETIMAGELIST, sent|id, 0, 0, LISTVIEW_ID }, + { HDM_SETIMAGELIST, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -5195,6 +5206,91 @@ static void test_LVM_SETITEMTEXT(void) DestroyWindow(hwnd); } +static void test_imagelists(void) +{ + HWND hwnd, header; + HIMAGELIST himl1, himl2, himl3; + LRESULT ret; + + himl1 = ImageList_Create(40, 40, 0, 4, 4); + himl2 = ImageList_Create(40, 40, 0, 4, 4); + himl3 = ImageList_Create(40, 40, 0, 4, 4); + ok(himl1 != NULL, "Failed to create imagelist\n"); + ok(himl2 != NULL, "Failed to create imagelist\n"); + ok(himl3 != NULL, "Failed to create imagelist\n"); + + hwnd = create_listview_control(LVS_REPORT | LVS_SHAREIMAGELISTS); + header = subclass_header(hwnd); + + ok(header != NULL, "Expected header\n"); + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl1); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set normal image list", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl2); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set state image list", TRUE); + + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl3); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_header_set_imagelist, + "set small image list", FALSE); + + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok((HIMAGELIST)ret == himl3, "Expected imagelist %p, got %p\n", himl3, (HIMAGELIST)ret); + DestroyWindow(hwnd); + + hwnd = create_listview_control(WS_VISIBLE | LVS_ICON); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl1); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set normal image list", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl2); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set state image list", FALSE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageW(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl3); + ok(ret == 0, "Expected no imagelist, got %p\n", (HIMAGELIST)ret); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_set_imagelist, + "set small image list", FALSE); + + header = ListView_GetHeader(hwnd); + ok(header == NULL, "Expected no header, got %p\n", header); + + SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | LVS_REPORT); + + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(header != NULL, "Expected header, got NULL\n"); + + ret = SendMessage(header, HDM_GETIMAGELIST, 0, 0); + ok((HIMAGELIST)ret == himl3, "Expected imagelist %p, got %p\n", himl3, (HIMAGELIST)ret); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5261,6 +5357,7 @@ START_TEST(listview) test_createdragimage(); test_dispinfo(); test_LVM_SETITEMTEXT(); + test_imagelists(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Daniel Jelinski : comctl32/listview: Support header images.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: bad62c02671ce9ee366ef3b923af7dac86f18da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad62c02671ce9ee366ef3b92… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jan 5 23:17:25 2013 +0100 comctl32/listview: Support header images. --- dlls/comctl32/listview.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d670a9b..3076249 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1670,6 +1670,10 @@ static INT LISTVIEW_CreateHeader(LISTVIEW_INFO *infoPtr) /* set header font */ SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, TRUE); + /* set header image list */ + if (infoPtr->himlSmall) + SendMessageW(infoPtr->hwndHeader, HDM_SETIMAGELIST, 0, (LPARAM)infoPtr->himlSmall); + LISTVIEW_UpdateSize(infoPtr); return 0; @@ -8631,6 +8635,8 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG himlOld = infoPtr->himlSmall; infoPtr->himlSmall = himl; if (infoPtr->uView != LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, TRUE); + if (infoPtr->hwndHeader) + SendMessageW(infoPtr->hwndHeader, HDM_SETIMAGELIST, 0, (LPARAM)himl); break; case LVSIL_STATE:

1 0

Daniel Jelinski : comctl32/listview: Update item height when changing font.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 9b8e3ca4101cf84c953a2a924fa8e0bd194353f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8e3ca4101cf84c953a2a924… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jan 5 21:18:12 2013 +0100 comctl32/listview: Update item height when changing font. --- dlls/comctl32/listview.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1ebd7e..a67b637 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10750,6 +10750,7 @@ static LRESULT LISTVIEW_SetFocus(LISTVIEW_INFO *infoPtr, HWND hwndLoseFocus) static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedraw) { HFONT oldFont = infoPtr->hFont; + INT oldHeight = infoPtr->nItemHeight; TRACE("(hfont=%p,redraw=%hu)\n", hFont, fRedraw); @@ -10758,12 +10759,16 @@ static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedra LISTVIEW_SaveTextMetrics(infoPtr); + infoPtr->nItemHeight = LISTVIEW_CalculateItemHeight(infoPtr); + if (infoPtr->uView == LV_VIEW_DETAILS) { SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(fRedraw, 0)); LISTVIEW_UpdateSize(infoPtr); LISTVIEW_UpdateScroll(infoPtr); } + else if (infoPtr->nItemHeight != oldHeight) + LISTVIEW_UpdateScroll(infoPtr); if (fRedraw) LISTVIEW_InvalidateList(infoPtr);

1 0

Daniel Jelinski : comctl32/listview: Redraw items after insert/delete.
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: 7b1fd9e527b92bd779b1771cfa0705ab056199c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1fd9e527b92bd779b1771cf… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Jan 5 16:09:48 2013 +0100 comctl32/listview: Redraw items after insert/delete. --- dlls/comctl32/listview.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index dfa8d6e..f1ebd7e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5621,9 +5621,8 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) TRACE("rcScroll=%s, dx=%d\n", wine_dbgstr_rect(&rcScroll), dir * infoPtr->nItemHeight); if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList)) { - TRACE("Scrolling rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList)); - ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, - &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE); + TRACE("Invalidating rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList)); + InvalidateRect(infoPtr->hwndSelf, &rcScroll, TRUE); } /* report has only that column, so we're done */ @@ -5636,8 +5635,7 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) rcScroll.bottom = nPerCol * infoPtr->nItemHeight; OffsetRect(&rcScroll, Origin.x, Origin.y); if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList)) - ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight, - &rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE); + InvalidateRect(infoPtr->hwndSelf, &rcScroll, TRUE); } /***

1 0

Ludger Sprenker : windowscodecs: Test conversions of the 24bpp PixelFormats .
by Alexandre Julliard Jan. 7, 2013

Jan. 7, 2013

Module: wine Branch: master Commit: dbdec221d151e66f8ee3790f5862a0bf64d36c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdec221d151e66f8ee3790f5… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Fri Jan 4 20:21:18 2013 +0100 windowscodecs: Test conversions of the 24bpp PixelFormats. --- dlls/windowscodecs/tests/converter.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index de44709..89d3b49 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -277,6 +277,12 @@ static const BYTE bits_24bppBGR[] = { static const struct bitmap_data testdata_24bppBGR = { &GUID_WICPixelFormat24bppBGR, 24, bits_24bppBGR, 4, 2, 96.0, 96.0}; +static const BYTE bits_24bppRGB[] = { + 0,0,255, 0,255,0, 255,0,0, 0,0,0, + 255,255,0, 255,0,255, 0,255,255, 255,255,255}; +static const struct bitmap_data testdata_24bppRGB = { + &GUID_WICPixelFormat24bppRGB, 24, bits_24bppRGB, 4, 2, 96.0, 96.0}; + static const BYTE bits_32bppBGR[] = { 255,0,0,80, 0,255,0,80, 0,0,255,80, 0,0,0,80, 0,255,255,80, 255,0,255,80, 255,255,0,80, 255,255,255,80}; @@ -499,6 +505,16 @@ START_TEST(converter) test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", 0); test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", 0); test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", 0); + + test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", 0); + test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", 0); + + test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB -> 24bppRGB", 0); + test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB -> 24bppBGR", 0); + + test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", 0); + test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", 0); + test_invalid_conversion(); test_default_converter();

1 0