October 2019 - Wine-devel - list.winehq.org

[PATCH] msi/tests: Add missing UnpublishFeatures actions.
by Hans Leidekker 28 Oct '19

28 Oct '19

Reported by Sven Baars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47992 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 22 ++++++++++++++++++++-- dlls/msi/tests/install.c | 16 +++++++++++----- dlls/msi/tests/msi.c | 6 +++--- dlls/msi/tests/patch.c | 1 + 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 6be56f76d7..89706249e4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -204,6 +204,7 @@ static const char env_install_exec_seq_dat[] = "RegisterProduct\t\t900\n" "PublishFeatures\t\t1000\n" "PublishProduct\t\t1100\n" + "UnpublishFeatures\t\t1150\n" "InstallFinalize\t\t1200\n"; static const char env_custom_action_dat[] = @@ -305,6 +306,7 @@ static const char sss_install_exec_seq_dat[] = "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" + "UnpublishFeatures\t\t5800\n" "InstallFinalize\t\t6000\n"; static const char sss_custom_action_dat[] = @@ -338,6 +340,7 @@ static const char sds_install_exec_seq_dat[] = "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" + "UnpublishFeatures\t\t5800\n" "InstallFinalize\t\t6000\n"; static const char sds_custom_action_dat[] = @@ -366,6 +369,7 @@ static const char sis_install_exec_seq_dat[] = "RegisterProduct\t\t5500\n" "PublishFeatures\t\t5600\n" "PublishProduct\t\t5700\n" + "UnpublishFeatures\t\t5800\n" "InstallFinalize\t\t6000\n"; static const char sis_custom_action_dat[] = @@ -543,12 +547,12 @@ static const char rem_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" - "UnpublishFeatures\t\t1800\n" "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" "PublishProduct\t\t6400\n" + "UnpublishFeatures\t\t6500\n" "InstallFinalize\t\t6600"; static const char rem_remove_files_dat[] = @@ -704,6 +708,7 @@ static const char wrv_install_exec_seq_dat[] = "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6200\n" "PublishProduct\t\t6300\n" + "UnpublishFeatures\t\t6400\n" "InstallFinalize\t\t6600\n"; static const char wrv_custom_action_dat[] = @@ -858,6 +863,7 @@ static const char sr_install_exec_seq_dat[] = "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" + "UnpublishFeatures\t\t5400\n" "InstallFinalize\t\t6600\n"; static const char sr_custom_action_dat[] = @@ -916,7 +922,6 @@ static const char font_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" - "UnpublishFeatures\t\t1800\n" "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterFonts\t\t4100\n" @@ -929,6 +934,7 @@ static const char font_install_exec_seq_dat[] = "RegisterProduct\t\t6100\n" "PublishFeatures\t\t6300\n" "PublishProduct\t\t6400\n" + "UnpublishFeatures\t\t6500\n" "InstallFinalize\t\t6600"; static const char font_custom_action_dat[] = @@ -1058,6 +1064,7 @@ static const char odbc_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char odbc_custom_action_dat[] = @@ -1127,6 +1134,7 @@ static const char tl_install_exec_seq_dat[] = "RegisterProduct\t\t5100\n" "PublishFeatures\t\t5200\n" "PublishProduct\t\t5300\n" + "UnpublishFeatures\t\t5400\n" "InstallFinalize\t\t6000\n"; static const char tl_custom_action_dat[] = @@ -1190,6 +1198,7 @@ static const char crs_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char crs_custom_action_dat[] = @@ -1253,6 +1262,7 @@ static const char pub_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char pub_custom_action_dat[] = @@ -1320,6 +1330,7 @@ static const char rd_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char rd_custom_action_dat[] = @@ -1385,6 +1396,7 @@ static const char frp_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char ini_file_dat[] = @@ -1445,6 +1457,7 @@ static const char ini_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char ini_custom_action_dat[] = @@ -1514,6 +1527,7 @@ static const char rci_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char rci_custom_action_dat[] = @@ -1589,6 +1603,7 @@ static const char rei_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char rei_custom_action_dat[] = @@ -1691,6 +1706,7 @@ static const char rpi_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char rpi_custom_action_dat[] = @@ -1768,6 +1784,7 @@ static const char rmi_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char rmi_custom_action_dat[] = @@ -1959,6 +1976,7 @@ static const char rep_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const msi_table env_tables[] = diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8a9e98c543..365f1d3a75 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1004,6 +1004,7 @@ static const CHAR fo_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const CHAR uc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" @@ -1051,6 +1052,7 @@ static const CHAR uc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "RegisterProduct\t\t1000\n" "PublishFeatures\t\t1100\n" "PublishProduct\t\t1200\n" + "UnpublishFeatures\t\t1250\n" "InstallFinalize\t\t1300\n"; static const char mixed_feature_dat[] = @@ -1173,6 +1175,7 @@ static const char vp_install_exec_seq_dat[] = "RegisterProduct\t\t1600\n" "PublishFeatures\t\t1700\n" "PublishProduct\t\t1800\n" + "UnpublishFeatures\t\t1850\n" "InstallFinalize\t\t1900\n"; static const char shc_property_dat[] = @@ -1245,6 +1248,7 @@ static const char shc_install_exec_seq_dat[] = "RegisterProduct\t\t1700\n" "PublishFeatures\t\t1800\n" "PublishProduct\t\t1900\n" + "UnpublishFeatures\t\t1950\n" "InstallFinalize\t\t2000\n"; static const char shc2_install_exec_seq_dat[] = @@ -1265,6 +1269,7 @@ static const char shc2_install_exec_seq_dat[] = "RegisterProduct\t\t1700\n" "PublishFeatures\t\t1800\n" "PublishProduct\t\t1900\n" + "UnpublishFeatures\t\t1950\n" "InstallFinalize\t\t2000\n"; static const char ft_file_dat[] = @@ -1328,6 +1333,7 @@ static const char ft_install_exec_seq_dat[] = "RegisterProduct\t\t1200\n" "PublishFeatures\t\t1300\n" "PublishProduct\t\t1400\n" + "UnpublishFeatures\t\t1450\n" "InstallFinalize\t\t1500\n"; static const char da_custom_action_dat[] = @@ -2896,7 +2902,7 @@ static void test_MsiInstallProduct(void) res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - r = MsiInstallProductA(msifile, "REMOVE=ALL"); + r = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); error: @@ -5332,7 +5338,7 @@ static void test_file_in_use(void) ok(delete_pf("msitest\\maximus", TRUE), "File not present\n"); ok(delete_pf("msitest", FALSE), "Directory not present or not empty\n"); - r = MsiInstallProductA(msifile, "REMOVE=ALL"); + r = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); error: @@ -5394,7 +5400,7 @@ static void test_file_in_use_cab(void) ok(delete_pf("msitest\\maximus", TRUE), "File not present\n"); ok(delete_pf("msitest", FALSE), "Directory not present or not empty\n"); - r = MsiInstallProductA(msifile, "REMOVE=ALL"); + r = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); error: @@ -5548,7 +5554,7 @@ static void test_icon_table(void) lstrcatA(path, "\\testicon"); ok(file_exists(path), "Per-user icon file isn't where it's expected (%s)\n", path); - res = MsiInstallProductA(msifile, "REMOVE=ALL"); + res = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1"); ok(res == ERROR_SUCCESS, "Failed to uninstall per-user\n"); ok(!file_exists(path), "Per-user icon file not removed (%s)\n", path); @@ -5563,7 +5569,7 @@ static void test_icon_table(void) lstrcatA(path, "\\testicon"); ok(file_exists(path), "System-wide icon file isn't where it's expected (%s)\n", path); - res = MsiInstallProductA(msifile, "REMOVE=ALL"); + res = MsiInstallProductA(msifile, "REMOVE=ALL FULL=1"); ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n"); ok(!file_exists(path), "System-wide icon file not removed (%s)\n", path); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 9f847ce2f0..393ad08303 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -14102,7 +14102,7 @@ static void test_lastusedsource(void) ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size); - r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); + r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); /* separate cabinet file */ @@ -14128,7 +14128,7 @@ static void test_lastusedsource(void) ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size); - r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); + r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); size = MAX_PATH; @@ -14153,7 +14153,7 @@ static void test_lastusedsource(void) ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size); - r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); + r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL FULL=1"); ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); size = MAX_PATH; diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 63d38b8ff9..3834bd5fdd 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -118,6 +118,7 @@ static const char install_exec_seq_dat[] = "RegisterProduct\t\t3100\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; struct msi_table -- 2.20.1

2 1

[PATCH] dxgi: Sort reported output modes.
by Henri Verbeet 28 Oct '19

28 Oct '19

From: Andrew Eikum <aeikum(a)codeweavers.com> Sekiro: Shadows Die Twice depends on this for its mode switching. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/output.c | 29 +++++++++++++++++++++++++++++ dlls/dxgi/tests/dxgi.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index abe1aef950c..a66628cc60d 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -75,6 +75,25 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output return hr; } +static int dxgi_mode_desc_compare(const void *l, const void *r) +{ + const DXGI_MODE_DESC *left = l, *right = r; + int a, b; + + if (left->Width != right->Width) + return left->Width - right->Width; + + if (left->Height != right->Height) + return left->Height - right->Height; + + a = left->RefreshRate.Numerator * right->RefreshRate.Denominator; + b = right->RefreshRate.Numerator * left->RefreshRate.Denominator; + if (a != b) + return a - b; + + return 0; +} + enum dxgi_mode_struct_version { DXGI_MODE_STRUCT_VERSION_0, @@ -151,6 +170,16 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, } wined3d_mutex_unlock(); + switch (struct_version) + { + case DXGI_MODE_STRUCT_VERSION_0: + qsort(modes, *mode_count, sizeof(DXGI_MODE_DESC), dxgi_mode_desc_compare); + break; + case DXGI_MODE_STRUCT_VERSION_1: + qsort(modes, *mode_count, sizeof(DXGI_MODE_DESC1), dxgi_mode_desc_compare); + break; + } + return S_OK; } diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a7517c8b0ab..cbb5806e2d2 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1153,12 +1153,13 @@ static void test_parents(void) static void test_output(void) { + unsigned int mode_count, mode_count_comp, i, last_height, last_width; + double last_refresh_rate; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; IDXGIOutput *output; ULONG refcount; - UINT mode_count, mode_count_comp, i; DXGI_MODE_DESC *modes; if (!(device = create_device(0))) @@ -1227,9 +1228,38 @@ static void test_output(void) ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); ok(mode_count == mode_count_comp, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp); + last_width = last_height = 0; + last_refresh_rate = 0.; for (i = 0; i < mode_count; i++) { - ok(modes[i].Height && modes[i].Width, "Proper mode was expected\n"); + double refresh_rate = modes[i].RefreshRate.Numerator / (double)modes[i].RefreshRate.Denominator; + + ok(modes[i].Width && modes[i].Height, "Mode %u: Invalid dimensions %ux%u.\n", + i, modes[i].Width, modes[i].Height); + + ok(modes[i].Width >= last_width, + "Mode %u: Modes should have been sorted, width %u < %u.\n", i, modes[i].Width, last_width); + if (modes[i].Width != last_width) + { + last_width = modes[i].Width; + last_height = 0; + last_refresh_rate = 0.; + continue; + } + + ok(modes[i].Height >= last_height, + "Mode %u: Modes should have been sorted, height %u < %u.\n", i, modes[i].Height, last_height); + if (modes[i].Height != last_height) + { + last_height = modes[i].Height; + last_refresh_rate = 0.; + continue; + } + + ok(refresh_rate >= last_refresh_rate, + "Mode %u: Modes should have been sorted, refresh rate %f < %f.\n", i, refresh_rate, last_refresh_rate); + if (refresh_rate != last_refresh_rate) + last_refresh_rate = refresh_rate; } mode_count += 5; -- 2.11.0

2 1

[PATCH v3 0/8] Move DX10 Shader Reflection into d3dcompiler.
by Connor McAdams 28 Oct '19

28 Oct '19

This series of patches moves the DX10 Shader Reflection handling into the d3dcompiler_43 implementation. These patches should be more in line with what was suggested with the last series of patches. The only missing methods are those for GetConstantBufferByIndex/Name, which are currently in the works. For the time being, I just want to make sure that I'm on the right track. Connor McAdams (8): d3d10: move parse_dxbc + helpers into effects.c d3d10: rename utils.c to debug.c d3d10+d3dcompiler: add PARENTSRC and fix definition conflicts d3d10+d3dcompiler: Move d3d10 reflection into d3dcompiler. d3dcompiler: Add shader init to D3D10ReflectShader d3dcompiler: implement d3d10 reflection GetDesc method. d3dcompiler: Implement Input/OutputParameterDesc method d3dcompiler: GetResourceBindingDesc for d3d10 reflect shader. dlls/d3d10/Makefile.in | 5 +- dlls/d3d10/d3d10_main.c | 22 --- dlls/d3d10/d3d10_private.h | 14 -- dlls/d3d10/{utils.c => debug.c} | 101 -------------- dlls/d3d10/effect.c | 101 ++++++++++++++ dlls/d3d10/shader.c | 112 ---------------- dlls/d3dcompiler_43/reflection.c | 224 ++++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 2 + 8 files changed, 328 insertions(+), 253 deletions(-) rename dlls/d3d10/{utils.c => debug.c} (66%) -- 2.20.1

3 15

[PATCH v2 1/7] d3d9: Release the recording stateblock before calling wined3d_device_reset().
by Zebediah Figura 28 Oct '19

28 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 13 +++++++++---- dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 07179900c4..d96e7b7095 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -990,6 +990,15 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->index_buffer_size = 0; } + if (!extended) + { + if (device->recording) + wined3d_stateblock_decref(device->recording); + device->recording = NULL; + device->update_state = device->state; + wined3d_stateblock_reset(device->state); + } + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, !extended))) { @@ -997,10 +1006,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { - if (device->recording) - wined3d_stateblock_decref(device->recording); - device->recording = NULL; - device->update_state = device->state; device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1965a4303f..967a44262c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1857,3 +1857,12 @@ HRESULT CDECL wined3d_stateblock_create(struct wined3d_device *device, return WINED3D_OK; } + +void CDECL wined3d_stateblock_reset(struct wined3d_stateblock *stateblock) +{ + TRACE("stateblock %p.\n", stateblock); + + wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); + memset(&stateblock->stateblock_state, 0, sizeof(stateblock->stateblock_state)); + wined3d_stateblock_state_init(&stateblock->stateblock_state, stateblock->device, WINED3D_STATE_INIT_DEFAULT); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2df6c510b1..6fba7b5661 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 57f5775409..e328386d6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, const struct wined3d_color *blend_factor); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); -- 2.20.1

3 19

[PATCH 4/4] msvcrt: Don't use strstr from C-library.
by Piotr Caban 28 Oct '19

28 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msvcrt/tests/string.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] msvcrt: Add _mbscspn_l implementation.
by Piotr Caban 28 Oct '19

28 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 39 ++++++++++++++++++++++++++++--------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 18 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 55 insertions(+), 16 deletions(-)

1 0

[PATCH 2/4] msvcrt: Add _mbsspn_l implementation.
by Piotr Caban 28 Oct '19

28 Oct '19

1 0

[PATCH 1/4] msvcrt: Don't use strcspn from C-library.
by Piotr Caban 28 Oct '19

28 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 16 +++++++++++++++- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-)

1 0

[PATCH] ucrtbase: Implement %G format for strftime.
by Piotr Caban 28 Oct '19

28 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 9 +++++++++ dlls/ucrtbase/tests/misc.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+)

1 0

[PATCH v2 1/4] vbscript: Store the DISPID for functions and variables when they are created.
by Gabriel Ivăncescu 28 Oct '19

28 Oct '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Sending only first bit of patches now, the rest will come after. The ident map is still needed for accessing it directly by DISPID (and by MEMBERIDs when the TypeInfo is implemented), but now it is simply re-created when the DISPID count changes (after the script has stuff added to it). Note that the map can have NULL entries in very rare cases, because of dynamic vars. The code lists which have their DISPIDs stored when the functions/variables are compiled will remain even if the script is released (by decreasing its state) but not destroyed. Meanwhile, dynamic variables created during the interpreting phase will be gone, and those slots in future ident maps will not be filled. The scenario is rare enough that I think it is not worthwhile to keep track of available DISPIDs in this case, which would be more complicated, so we just never re-use the DISPIDs at all. dlls/vbscript/compile.c | 7 ++++ dlls/vbscript/interp.c | 1 + dlls/vbscript/vbdisp.c | 69 ++++++++++++++++------------------------ dlls/vbscript/vbscript.h | 5 ++- 4 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c129f36..a9bf96e 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -53,6 +53,8 @@ typedef struct { unsigned func_end_label; unsigned prop_end_label; + DISPID cur_dispid; + dim_decl_t *dim_decls; dim_decl_t *dim_decls_tail; dynamic_var_t *global_vars; @@ -1424,6 +1426,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f V_VT(&new_var->v) = VT_EMPTY; new_var->is_const = FALSE; + new_var->dispid = ++ctx->cur_dispid; new_var->next = ctx->global_vars; ctx->global_vars = new_var; @@ -1503,6 +1506,7 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi func->code_ctx = ctx->code; func->type = decl->type; func->is_public = decl->is_public; + func->dispid = ++ctx->cur_dispid; func->arg_cnt = 0; if(decl->args) { @@ -1852,6 +1856,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli ctx.global_consts = NULL; ctx.stat_ctx = NULL; ctx.labels_cnt = ctx.labels_size = 0; + ctx.cur_dispid = script->cur_dispid; hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->main_code); if(FAILED(hres)) { @@ -1919,6 +1924,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli if(TRACE_ON(vbscript_disas)) dump_code(&ctx); + script->cur_dispid = ctx.cur_dispid; + ctx.code = NULL; release_compiler(&ctx); diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 80ecc41..80588b5 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -228,6 +228,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { + new_var->dispid = ++ctx->script->cur_dispid; new_var->next = ctx->script->global_vars; ctx->script->global_vars = new_var; }else { diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1dd6d4e..fd51935 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -527,7 +527,6 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) } struct _ident_map_t { - const WCHAR *name; BOOL is_var; union { dynamic_var_t *var; @@ -542,31 +541,36 @@ static inline DISPID ident_to_id(ScriptDisp *This, ident_map_t *ident) static inline ident_map_t *id_to_ident(ScriptDisp *This, DISPID id) { - return 0 < id && id <= This->ident_map_cnt ? This->ident_map+id-1 : NULL; + return 0 < id && id <= This->ident_map_cnt && This->ident_map[id - 1].u.var + ? This->ident_map + id - 1 : NULL; } -static ident_map_t *add_ident(ScriptDisp *This, const WCHAR *name) +static BOOL update_ident_map(ScriptDisp *This) { - ident_map_t *ret; + dynamic_var_t *var; + function_t *func; + ident_map_t *map; + + if (This->ident_map_cnt == This->ctx->cur_dispid) + return TRUE; - if(!This->ident_map_size) { - This->ident_map = heap_alloc(4 * sizeof(*This->ident_map)); - if(!This->ident_map) - return NULL; - This->ident_map_size = 4; - }else if(This->ident_map_cnt == This->ident_map_size) { - ident_map_t *new_map; + map = heap_alloc_zero(This->ctx->cur_dispid * sizeof(*map)); + if (!map) return FALSE; - new_map = heap_realloc(This->ident_map, 2*This->ident_map_size*sizeof(*new_map)); - if(!new_map) - return NULL; - This->ident_map = new_map; - This->ident_map_size *= 2; + heap_free(This->ident_map); + This->ident_map_cnt = This->ctx->cur_dispid; + This->ident_map = map; + + for (var = This->ctx->global_vars; var; var = var->next) + { + map[var->dispid - 1].is_var = TRUE; + map[var->dispid - 1].u.var = var; } - ret = This->ident_map + This->ident_map_cnt++; - ret->name = name; - return ret; + for (func = This->ctx->global_funcs; func; func = func->next) + map[func->dispid - 1].u.func = func; + + return TRUE; } static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) @@ -676,7 +680,6 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); dynamic_var_t *var; - ident_map_t *ident; function_t *func; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -684,35 +687,16 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->ctx) return E_UNEXPECTED; - for(ident = This->ident_map; ident < This->ident_map+This->ident_map_cnt; ident++) { - if(!wcsicmp(ident->name, bstrName)) { - *pid = ident_to_id(This, ident); - return S_OK; - } - } - for(var = This->ctx->global_vars; var; var = var->next) { if(!wcsicmp(var->name, bstrName)) { - ident = add_ident(This, var->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = TRUE; - ident->u.var = var; - *pid = ident_to_id(This, ident); + *pid = var->dispid; return S_OK; } } for(func = This->ctx->global_funcs; func; func = func->next) { if(!wcsicmp(func->name, bstrName)) { - ident = add_ident(This, func->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = FALSE; - ident->u.func = func; - *pid = ident_to_id(This, ident); + *pid = func->dispid; return S_OK; } } @@ -730,6 +714,9 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(!update_ident_map(This)) + return E_OUTOFMEMORY; + ident = id_to_ident(This, id); if(!ident) return DISP_E_MEMBERNOTFOUND; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 71f42aa..9d41632 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -128,7 +128,6 @@ typedef struct { ident_map_t *ident_map; unsigned ident_map_cnt; - unsigned ident_map_size; script_ctx_t *ctx; } ScriptDisp; @@ -169,6 +168,7 @@ typedef struct _dynamic_var_t { VARIANT v; const WCHAR *name; BOOL is_const; + DISPID dispid; } dynamic_var_t; struct _script_ctx_t { @@ -178,6 +178,8 @@ struct _script_ctx_t { IInternetHostSecurityManager *secmgr; DWORD safeopt; + DISPID cur_dispid; + IDispatch *host_global; ScriptDisp *script_obj; @@ -314,6 +316,7 @@ typedef struct { } var_desc_t; struct _function_t { + DISPID dispid; function_type_t type; const WCHAR *name; BOOL is_public; -- 2.21.0

2 8