February 2019 - Wine-Commits

Zebediah Figura : wined3d: Store blend factor in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 44441feb3e9ae1cff5d9e0a66032b498e7ba6d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44441feb3e9ae1cff5d9e0a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 6 19:38:27 2019 -0600 wined3d: Store blend factor in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 ++++++--- dlls/wined3d/stateblock.c | 24 +++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c1d86ab..aec876f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1991,13 +1991,17 @@ static void resolve_depth_buffer(struct wined3d_device *device) void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor) { - struct wined3d_state *state = device->update_state; + struct wined3d_state *state = &device->state; struct wined3d_blend_state *prev; TRACE("device %p, blend_state %p, blend_factor %s.\n", device, blend_state, debug_color(blend_factor)); + device->update_stateblock_state->blend_factor = *blend_factor; if (device->recording) + { device->recording->changed.blend_state = TRUE; + return; + } prev = state->blend_state; if (prev == blend_state && !memcmp(blend_factor, &state->blend_factor, sizeof(*blend_factor))) @@ -2007,8 +2011,7 @@ void CDECL wined3d_device_set_blend_state(struct wined3d_device *device, wined3d_blend_state_incref(blend_state); state->blend_state = blend_state; state->blend_factor = *blend_factor; - if (!device->recording) - wined3d_cs_emit_set_blend_state(device->cs, blend_state, blend_factor); + wined3d_cs_emit_set_blend_state(device->cs, blend_state, blend_factor); if (prev) wined3d_blend_state_decref(prev); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ebff906..fe307ae 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -859,18 +859,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.blend_state - && (src_state->blend_state != stateblock->state.blend_state - || memcmp(&src_state->blend_factor, &stateblock->state.blend_factor, - sizeof(stateblock->state.blend_factor)))) + && memcmp(&state->blend_factor, &stateblock->stateblock_state.blend_factor, + sizeof(stateblock->stateblock_state.blend_factor))) { - TRACE("Updating blend state.\n"); + TRACE("Updating blend factor.\n"); - if (src_state->blend_state) - wined3d_blend_state_incref(src_state->blend_state); - if (stateblock->state.blend_state) - wined3d_blend_state_decref(stateblock->state.blend_state); - stateblock->state.blend_state = src_state->blend_state; - stateblock->state.blend_factor = src_state->blend_factor; + stateblock->stateblock_state.blend_factor = state->blend_factor; } map = stateblock->changed.streamSource; @@ -1162,7 +1156,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } if (stateblock->changed.blend_state) - wined3d_device_set_blend_state(device, stateblock->state.blend_state, &stateblock->state.blend_factor); + { + state->blend_factor = stateblock->stateblock_state.blend_factor; + wined3d_device_set_blend_state(device, NULL, &stateblock->stateblock_state.blend_factor); + } map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) @@ -1473,6 +1470,11 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state } init_default_sampler_states(state->sampler_states); + + state->blend_factor.r = 1.0f; + state->blend_factor.g = 1.0f; + state->blend_factor.b = 1.0f; + state->blend_factor.a = 1.0f; } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 11a0f69..13fdb1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2986,6 +2986,7 @@ struct wined3d_stateblock_state BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; + struct wined3d_color blend_factor; struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1];

1 0

Zebediah Figura : wined3d: Store stream state in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 1867b095a0e48ff8619457c703f69b5acc715ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=1867b095a0e48ff8619457c7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 6 19:38:28 2019 -0600 wined3d: Store stream state in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 38 +++++++++++++++++------- dlls/wined3d/stateblock.c | 67 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 72 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aec876f..1b2f7e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1379,11 +1379,21 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI return WINED3DERR_INVALIDCALL; } - stream = &device->update_state->streams[stream_idx]; + stream = &device->state.streams[stream_idx]; prev_buffer = stream->buffer; + if (buffer) + wined3d_buffer_incref(buffer); + if (device->update_stateblock_state->streams[stream_idx].buffer) + wined3d_buffer_decref(device->update_stateblock_state->streams[stream_idx].buffer); + device->update_stateblock_state->streams[stream_idx].buffer = buffer; + device->update_stateblock_state->streams[stream_idx].stride = stride; + if (device->recording) + { device->recording->changed.streamSource |= 1u << stream_idx; + return WINED3D_OK; + } if (prev_buffer == buffer && stream->stride == stride @@ -1398,9 +1408,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; if (buffer) wined3d_buffer_incref(buffer); - - if (!device->recording) - wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); + wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); if (prev_buffer) wined3d_buffer_decref(prev_buffer); @@ -1432,8 +1440,8 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider) { + UINT old_flags, old_freq, flags, freq; struct wined3d_stream_state *stream; - UINT old_flags, old_freq; TRACE("device %p, stream_idx %u, divider %#x.\n", device, stream_idx, divider); @@ -1454,16 +1462,24 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - stream = &device->update_state->streams[stream_idx]; + stream = &device->state.streams[stream_idx]; old_flags = stream->flags; old_freq = stream->frequency; - stream->flags = divider & (WINED3DSTREAMSOURCE_INSTANCEDATA | WINED3DSTREAMSOURCE_INDEXEDDATA); - stream->frequency = divider & 0x7fffff; + flags = divider & (WINED3DSTREAMSOURCE_INSTANCEDATA | WINED3DSTREAMSOURCE_INDEXEDDATA); + freq = divider & 0x7fffff; + device->update_stateblock_state->streams[stream_idx].flags = flags; + device->update_stateblock_state->streams[stream_idx].frequency = freq; if (device->recording) + { device->recording->changed.streamFreq |= 1u << stream_idx; - else if (stream->frequency != old_freq || stream->flags != old_flags) + return WINED3D_OK; + } + + stream->flags = flags; + stream->frequency = freq; + if (stream->frequency != old_freq || stream->flags != old_flags) wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags); return WINED3D_OK; @@ -5239,11 +5255,11 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso device->state.streams[i].buffer = NULL; } - if (device->recording && &device->update_state->streams[i].buffer->resource == resource) + if (device->recording && &device->update_stateblock_state->streams[i].buffer->resource == resource) { ERR("Buffer resource %p is still in use by stateblock %p, stream %u.\n", resource, device->recording, i); - device->update_state->streams[i].buffer = NULL; + device->update_stateblock_state->streams[i].buffer = NULL; } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index fe307ae..4f16c99 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -535,6 +535,15 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_vertex_declaration_decref(decl); } + for (i = 0; i < MAX_STREAMS; ++i) + { + if ((buffer = state->streams[i].buffer)) + { + state->streams[i].buffer = NULL; + wined3d_buffer_decref(buffer); + } + } + if ((buffer = state->index_buffer)) { state->index_buffer = NULL; @@ -872,19 +881,19 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { if (!(map & 1)) continue; - if (stateblock->state.streams[i].stride != src_state->streams[i].stride - || stateblock->state.streams[i].buffer != src_state->streams[i].buffer) + if (stateblock->stateblock_state.streams[i].stride != state->streams[i].stride + || stateblock->stateblock_state.streams[i].buffer != state->streams[i].buffer) { TRACE("Updating stream source %u to %p, stride to %u.\n", - i, src_state->streams[i].buffer, - src_state->streams[i].stride); - - stateblock->state.streams[i].stride = src_state->streams[i].stride; - if (src_state->streams[i].buffer) - wined3d_buffer_incref(src_state->streams[i].buffer); - if (stateblock->state.streams[i].buffer) - wined3d_buffer_decref(stateblock->state.streams[i].buffer); - stateblock->state.streams[i].buffer = src_state->streams[i].buffer; + i, state->streams[i].buffer, + state->streams[i].stride); + + stateblock->stateblock_state.streams[i].stride = state->streams[i].stride; + if (state->streams[i].buffer) + wined3d_buffer_incref(state->streams[i].buffer); + if (stateblock->stateblock_state.streams[i].buffer) + wined3d_buffer_decref(stateblock->stateblock_state.streams[i].buffer); + stateblock->stateblock_state.streams[i].buffer = state->streams[i].buffer; } } @@ -893,14 +902,14 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { if (!(map & 1)) continue; - if (stateblock->state.streams[i].frequency != src_state->streams[i].frequency - || stateblock->state.streams[i].flags != src_state->streams[i].flags) + if (stateblock->stateblock_state.streams[i].frequency != state->streams[i].frequency + || stateblock->stateblock_state.streams[i].flags != state->streams[i].flags) { TRACE("Updating stream frequency %u to %u flags to %#x.\n", - i, src_state->streams[i].frequency, src_state->streams[i].flags); + i, state->streams[i].frequency, state->streams[i].flags); - stateblock->state.streams[i].frequency = src_state->streams[i].frequency; - stateblock->state.streams[i].flags = src_state->streams[i].flags; + stateblock->stateblock_state.streams[i].frequency = state->streams[i].frequency; + stateblock->stateblock_state.streams[i].flags = state->streams[i].flags; } } @@ -1164,18 +1173,30 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { - if (map & 1) - wined3d_device_set_stream_source(device, i, - stateblock->state.streams[i].buffer, - 0, stateblock->state.streams[i].stride); + if (!(map & 1)) continue; + + state->streams[i].stride = stateblock->stateblock_state.streams[i].stride; + if (stateblock->stateblock_state.streams[i].buffer) + wined3d_buffer_incref(stateblock->stateblock_state.streams[i].buffer); + if (state->streams[i].buffer) + wined3d_buffer_decref(state->streams[i].buffer); + state->streams[i].buffer = stateblock->stateblock_state.streams[i].buffer; + + wined3d_device_set_stream_source(device, i, + stateblock->stateblock_state.streams[i].buffer, + 0, stateblock->stateblock_state.streams[i].stride); } map = stateblock->changed.streamFreq; for (i = 0; map; map >>= 1, ++i) { - if (map & 1) - wined3d_device_set_stream_source_freq(device, i, - stateblock->state.streams[i].frequency | stateblock->state.streams[i].flags); + if (!(map & 1)) continue; + + state->streams[i].frequency = stateblock->stateblock_state.streams[i].frequency; + state->streams[i].flags = stateblock->stateblock_state.streams[i].flags; + + wined3d_device_set_stream_source_freq(device, i, + stateblock->stateblock_state.streams[i].frequency | stateblock->stateblock_state.streams[i].flags); } map = stateblock->changed.textures; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13fdb1c..479aaf2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2971,6 +2971,7 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { struct wined3d_vertex_declaration *vertex_declaration; + struct wined3d_stream_state streams[MAX_STREAMS + 1]; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; int base_vertex_index;

1 0

Michael Stefaniuc : odbc32: Print the debug strings and not the pointers.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 83af47e602f632c70fe4c9ef9a009d6e89cf3d18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83af47e602f632c70fe4c9ef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 7 22:37:05 2019 +0100 odbc32: Print the debug strings and not the pointers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d4949b5..041d4db 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -951,7 +951,7 @@ SQLRETURN WINAPI ODBC32_SQLConnect(SQLHDBC ConnectionHandle, SQLCHAR *ServerName { SQLRETURN ret; - TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %p," + TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %s," " NameLength3 %d)\n", ConnectionHandle, debugstr_an((const char *)ServerName, NameLength1), NameLength1, debugstr_an((const char *)UserName, NameLength2), NameLength2, @@ -2328,7 +2328,7 @@ SQLRETURN WINAPI ODBC32_SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, { SQLRETURN ret; - TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %p," + TRACE("(ConnectionHandle %p, ServerName %s, NameLength1 %d, UserName %s, NameLength2 %d, Authentication %s," " NameLength3 %d)\n", ConnectionHandle, debugstr_wn(ServerName, NameLength1), NameLength1, debugstr_wn(UserName, NameLength2), NameLength2, debugstr_wn(Authentication, NameLength3), NameLength3);

1 0

Hans Leidekker : crypt32/tests: Show that PFXImportCertStore doesn' t set CERT_KEY_PROV_INFO_PROP_ID.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: cf9b492fec1963cc7e4250faf277dc5fb725cd2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf9b492fec1963cc7e4250fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 7 14:35:01 2019 +0100 crypt32/tests: Show that PFXImportCertStore doesn't set CERT_KEY_PROV_INFO_PROP_ID. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index f3fb420..b8d0ad6 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3286,6 +3286,7 @@ static void test_PFXImportCertStore(void) CRYPT_DATA_BLOB pfx; const CERT_CONTEXT *cert; CERT_KEY_CONTEXT key; + CRYPT_KEY_PROV_INFO keyprov; CERT_INFO *info; DWORD count, size; BOOL ret; @@ -3323,6 +3324,11 @@ static void test_PFXImportCertStore(void) ok( key.hCryptProv, "hCryptProv not set\n" ); ok( key.dwKeySpec == AT_KEYEXCHANGE, "got %u\n", key.dwKeySpec ); + size = sizeof(keyprov); + SetLastError( 0xdeadbeef ); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_PROV_INFO_PROP_ID, &keyprov, &size ); + ok( !ret && GetLastError() == CRYPT_E_NOT_FOUND, "got %08x\n", GetLastError() ); + CertCloseStore( store, 0 ); }

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for LB_INITSTORAGE.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: f69a1807e8e023d3b196102098eee0fd450cf6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69a1807e8e023d3b1961020… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 7 15:12:24 2019 +0200 comctl32/tests: Add tests for LB_INITSTORAGE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index e789483..68e4073 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1906,6 +1906,69 @@ static void test_GetListBoxInfo(void) DestroyWindow(parent); } +static void test_init_storage( void ) +{ + static const DWORD styles[] = + { + LBS_HASSTRINGS, + LBS_NODATA | LBS_OWNERDRAWFIXED, + }; + HWND parent, listbox; + LONG ret, items_size; + int i, j; + + parent = create_parent(); + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + listbox = CreateWindowA(WC_LISTBOXA, "TestList", styles[i] | WS_CHILD, + 0, 0, 100, 100, parent, (HMENU)ID_LISTBOX, NULL, 0); + + items_size = SendMessageA(listbox, LB_INITSTORAGE, 100, 0); + ok(items_size >= 100, "expected at least 100, got %d\n", items_size); + + ret = SendMessageA(listbox, LB_INITSTORAGE, 0, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* it doesn't grow since the space was already reserved */ + ret = SendMessageA(listbox, LB_INITSTORAGE, items_size, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* it doesn't shrink the reserved space */ + ret = SendMessageA(listbox, LB_INITSTORAGE, 42, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* now populate almost all of it so it's not reserved anymore */ + if (styles[i] & LBS_NODATA) + { + ret = SendMessageA(listbox, LB_SETCOUNT, items_size - 1, 0); + ok(ret == 0, "unexpected return value %d\n", ret); + } + else + { + for (j = 0; j < items_size - 1; j++) + { + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)""); + ok(ret == j, "expected %d, got %d\n", j, ret); + } + } + + /* we still have one more reserved slot, so it doesn't grow yet */ + ret = SendMessageA(listbox, LB_INITSTORAGE, 1, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + + /* fill the slot and check again, it should grow this time */ + ret = SendMessageA(listbox, LB_INSERTSTRING, -1, (LPARAM)""); + ok(ret == items_size - 1, "expected %d, got %d\n", items_size - 1, ret); + ret = SendMessageA(listbox, LB_INITSTORAGE, 0, 0); + ok(ret == items_size, "expected %d, got %d\n", items_size, ret); + ret = SendMessageA(listbox, LB_INITSTORAGE, 1, 0); + ok(ret > items_size, "expected it to grow past %d, got %d\n", items_size, ret); + + DestroyWindow(listbox); + } + DestroyWindow(parent); +} + static void test_missing_lbuttonup(void) { HWND listbox, parent, capture; @@ -2425,6 +2488,7 @@ START_TEST(listbox) test_listbox_LB_DIR(); test_listbox_dlgdir(); test_set_count(); + test_init_storage(); test_GetListBoxInfo(); test_missing_lbuttonup(); test_extents();

1 0

Gabriel Ivăncescu : comctl32/listbox: Shrink the item array with resize_storage.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: ff873840485861b31d2923d4988826de295072da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff873840485861b31d2923d4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 7 15:12:22 2019 +0200 comctl32/listbox: Shrink the item array with resize_storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ec10189..4289aaa 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1669,7 +1669,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { LB_ITEMDATA *item; - INT max_items; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; @@ -1689,20 +1688,8 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - /* Shrink the item array if possible */ + resize_storage(descr, descr->nb_items); - max_items = descr->items_size; - if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) - { - max_items -= LB_ARRAY_GRANULARITY; - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - if (item) - { - descr->items_size = max_items; - descr->items = item; - } - } /* Repaint the items */ LISTBOX_UpdateScroll( descr );

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to expand the item array.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 3afbda2ae27d456df671829649979a49fa1a5609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3afbda2ae27d456df6718296… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 7 15:12:21 2019 +0200 comctl32/listbox: Use a helper to expand the item array. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 64 +++++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 9e6d8ea..ec10189 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -36,12 +36,13 @@ #include "wine/unicode.h" #include "wine/exception.h" #include "wine/debug.h" +#include "wine/heap.h" #include "comctl32.h" WINE_DEFAULT_DEBUG_CHANNEL(listbox); -/* Items array granularity */ +/* Items array granularity (must be power of 2) */ #define LB_ARRAY_GRANULARITY 16 /* Scrolling timeout in ms */ @@ -126,6 +127,26 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL resize_storage(LB_DESCR *descr, UINT items_size) +{ + LB_ITEMDATA *items; + + if (items_size > descr->items_size || + items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) + { + items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items_size = items_size; + descr->items = items; + } + return TRUE; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { return descr->items[index].selected; @@ -684,27 +705,10 @@ static void LISTBOX_DrawFocusRect( LB_DESCR *descr, BOOL on ) */ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { - LB_ITEMDATA *item; - - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); - if (descr->items) { - nb_items += descr->items_size; - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); - } - else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); - } + UINT new_size = descr->nb_items + nb_items; - if (!item) - { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); + if (new_size > descr->items_size && !resize_storage(descr, new_size)) return LB_ERRSPACE; - } - descr->items_size = nb_items; - descr->items = item; return LB_OKAY; } @@ -1525,29 +1529,11 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, LPWSTR str, ULONG_PTR data ) { LB_ITEMDATA *item; - INT max_items; INT oldfocus = descr->focus_item; if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (descr->nb_items == descr->items_size) - { - /* We need to grow the array */ - max_items = descr->items_size + LB_ARRAY_GRANULARITY; - if (descr->items) - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - max_items * sizeof(LB_ITEMDATA) ); - else - item = HeapAlloc( GetProcessHeap(), 0, - max_items * sizeof(LB_ITEMDATA) ); - if (!item) - { - SEND_NOTIFICATION( descr, LBN_ERRSPACE ); - return LB_ERRSPACE; - } - descr->items_size = max_items; - descr->items = item; - } + if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; /* Insert the item structure */

1 0

Zebediah Figura : wined3d: Store vertex declaration in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 61cc88675fea2ad616c781883349b20651dce196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61cc88675fea2ad616c78188… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 6 19:38:26 2019 -0600 wined3d: Store vertex declaration in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++++---- dlls/wined3d/stateblock.c | 32 +++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3100991..c1d86ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2199,21 +2199,29 @@ void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { - struct wined3d_vertex_declaration *prev = device->update_state->vertex_declaration; + struct wined3d_vertex_declaration *prev = device->state.vertex_declaration; TRACE("device %p, declaration %p.\n", device, declaration); + if (declaration) + wined3d_vertex_declaration_incref(declaration); + if (device->update_stateblock_state->vertex_declaration) + wined3d_vertex_declaration_decref(device->update_stateblock_state->vertex_declaration); + device->update_stateblock_state->vertex_declaration = declaration; + if (device->recording) + { device->recording->changed.vertexDecl = TRUE; + return; + } if (declaration == prev) return; if (declaration) wined3d_vertex_declaration_incref(declaration); - device->update_state->vertex_declaration = declaration; - if (!device->recording) - wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); + device->state.vertex_declaration = declaration; + wined3d_cs_emit_set_vertex_declaration(device->cs, declaration); if (prev) wined3d_vertex_declaration_decref(prev); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index fe2ff29..ebff906 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -523,11 +523,18 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { + struct wined3d_vertex_declaration *decl; struct wined3d_texture *texture; struct wined3d_buffer *buffer; struct wined3d_shader *shader; unsigned int i; + if ((decl = state->vertex_declaration)) + { + state->vertex_declaration = NULL; + wined3d_vertex_declaration_decref(decl); + } + if ((buffer = state->index_buffer)) { state->index_buffer = NULL; @@ -814,16 +821,16 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->stateblock_state.index_format = state->index_format; } - if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration != src_state->vertex_declaration) + if (stateblock->changed.vertexDecl && stateblock->stateblock_state.vertex_declaration != state->vertex_declaration) { TRACE("Updating vertex declaration from %p to %p.\n", - stateblock->state.vertex_declaration, src_state->vertex_declaration); + stateblock->stateblock_state.vertex_declaration, state->vertex_declaration); - if (src_state->vertex_declaration) - wined3d_vertex_declaration_incref(src_state->vertex_declaration); - if (stateblock->state.vertex_declaration) - wined3d_vertex_declaration_decref(stateblock->state.vertex_declaration); - stateblock->state.vertex_declaration = src_state->vertex_declaration; + if (state->vertex_declaration) + wined3d_vertex_declaration_incref(state->vertex_declaration); + if (stateblock->stateblock_state.vertex_declaration) + wined3d_vertex_declaration_decref(stateblock->stateblock_state.vertex_declaration); + stateblock->stateblock_state.vertex_declaration = state->vertex_declaration; } if (stateblock->changed.material @@ -1124,8 +1131,15 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_base_vertex_index(device, stateblock->stateblock_state.base_vertex_index); } - if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration) - wined3d_device_set_vertex_declaration(device, stateblock->state.vertex_declaration); + if (stateblock->changed.vertexDecl && stateblock->stateblock_state.vertex_declaration) + { + if (stateblock->stateblock_state.vertex_declaration) + wined3d_vertex_declaration_incref(stateblock->stateblock_state.vertex_declaration); + if (state->vertex_declaration) + wined3d_vertex_declaration_decref(state->vertex_declaration); + state->vertex_declaration = stateblock->stateblock_state.vertex_declaration; + wined3d_device_set_vertex_declaration(device, stateblock->stateblock_state.vertex_declaration); + } if (stateblock->changed.material) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1b2b7a..11a0f69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2970,6 +2970,7 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { + struct wined3d_vertex_declaration *vertex_declaration; struct wined3d_buffer *index_buffer; enum wined3d_format_id index_format; int base_vertex_index;

1 0

Jacek Caban : mshtml: Add style.borderCollapse property implementation.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 957a1f0216995c14c3a3fe737358578a506af707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=957a1f0216995c14c3a3fe73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 7 18:32:22 2019 +0100 mshtml: Add style.borderCollapse property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 27 +++++++++++++++++++-------- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7b82349..d260db1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -63,6 +63,8 @@ static const WCHAR border_bottom_styleW[] = {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0}; static const WCHAR border_bottom_widthW[] = {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','w','i','d','t','h',0}; +static const WCHAR border_collapseW[] = + {'b','o','r','d','e','r','-','c','o','l','l','a','p','s','e',0}; static const WCHAR border_colorW[] = {'b','o','r','d','e','r','-','c','o','l','o','r',0}; static const WCHAR border_leftW[] = @@ -416,6 +418,11 @@ static const style_tbl_entry_t style_tbl[] = { ATTR_FIX_PX }, { + border_collapseW, + DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLLAPSE, + DISPID_IHTMLSTYLE2_BORDERCOLLAPSE + }, + { border_colorW, DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLOR, DISPID_IHTMLSTYLE_BORDERCOLOR @@ -3629,15 +3636,19 @@ static HRESULT WINAPI HTMLStyle2_get_tableLayout(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_borderCollapse(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_property(This, STYLEID_BORDER_COLLAPSE, v); } static HRESULT WINAPI HTMLStyle2_get_borderCollapse(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_property(This, STYLEID_BORDER_COLLAPSE, p); } static HRESULT WINAPI HTMLStyle2_put_direction(IHTMLStyle2 *iface, BSTR v) @@ -6258,15 +6269,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_tableLayout(IHTMLCSSStyleDecla static HRESULT WINAPI HTMLCSSStyleDeclaration_put_borderCollapse(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BORDER_COLLAPSE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_borderCollapse(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BORDER_COLLAPSE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_direction(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 8cc1b3b..971a3dc 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -49,6 +49,7 @@ typedef enum { STYLEID_BORDER_BOTTOM_COLOR, STYLEID_BORDER_BOTTOM_STYLE, STYLEID_BORDER_BOTTOM_WIDTH, + STYLEID_BORDER_COLLAPSE, STYLEID_BORDER_COLOR, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_COLOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ae3b2a4..44e4c83 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -516,6 +516,22 @@ static void test_style2(IHTMLStyle2 *style2) ok(hres == S_OK, "get_tableLayout failed: %08x\n", hres); ok(!strcmp_wa(str, "fixed"), "tableLayout = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + /* borderCollapse */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_borderCollapse(style2, &str); + ok(hres == S_OK, "get_borderCollapse failed: %08x\n", hres); + ok(!str, "borderCollapse = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("separate"); + hres = IHTMLStyle2_put_borderCollapse(style2, str); + ok(hres == S_OK, "put_borderCollapse failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle2_get_borderCollapse(style2, &str); + ok(hres == S_OK, "get_borderCollapse failed: %08x\n", hres); + ok(!strcmp_wa(str, "separate"), "borderCollapse = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style)

1 0

Ken Thomases : winemac: Fix failure to render OpenGL on macOS 10.14 ( Mojave).
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 654b27823d6b1aa23ca22290cb1d88194cb980d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=654b27823d6b1aa23ca22290… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 7 13:57:22 2019 -0600 winemac: Fix failure to render OpenGL on macOS 10.14 (Mojave). For programs linked against the macOS 10.14 SDK, Mojave makes all view hierarchies layer-backed. For views to which OpenGL contexts have been attached this caused a regression where they sometimes failed to render and just remain black. Updating the OpenGL context after the framework has assigned a layer to our view works around the problem. Thanks to Elviss Strazdins on Stack Overflow for the solution <https://stackoverflow.com/a/52938517/1312143>. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e405cda..f43b26b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -747,6 +747,12 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [super willRemoveSubview:subview]; } + - (void) setLayer:(CALayer*)newLayer + { + [super setLayer:newLayer]; + [self updateGLContexts]; + } + /* * ---------- NSTextInputClient methods ---------- */

1 0