July 2014 - Wine-commits - list.winehq.org

Andrei Slăvoiu : wined3d: Remove the gl_info parameter from select_card callbacks.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 41962a5a072be0afdffa1606260c842578b2c020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41962a5a072be0afdffa16062… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sun Jul 20 19:41:15 2014 +0300 wined3d: Remove the gl_info parameter from select_card callbacks. --- dlls/wined3d/directx.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ee610ec..6a84b85 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1674,8 +1674,7 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) return level; } -static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_nvidia_binary(const char *gl_renderer) { unsigned int i; @@ -1853,8 +1852,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) { /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * @@ -1978,8 +1976,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_intel(const char *gl_renderer) { unsigned int i; @@ -2048,8 +2045,7 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_amd_mesa(const char *gl_renderer) { unsigned int i; @@ -2144,8 +2140,7 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, - const char *gl_renderer) +static enum wined3d_pci_device select_card_nvidia_mesa(const char *gl_renderer) { unsigned int i; @@ -2238,7 +2233,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i return PCI_DEVICE_NONE; } -static enum wined3d_pci_device select_card_vmware(const struct wined3d_gl_info *gl_info, const char *gl_renderer) +static enum wined3d_pci_device select_card_vmware(const char *gl_renderer) { if (strstr(gl_renderer, "SVGA3D")) return CARD_VMWARE_SVGA3D; @@ -2250,7 +2245,7 @@ static const struct gl_vendor_selection { enum wined3d_gl_vendor gl_vendor; const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ - enum wined3d_pci_device (*select_card)(const struct wined3d_gl_info *gl_info, const char *gl_renderer); + enum wined3d_pci_device (*select_card)(const char *gl_renderer); } amd_gl_vendor_table[] = { @@ -2315,8 +2310,7 @@ static enum wined3d_pci_device select_card_fallback_intel(const struct wined3d_g } static enum wined3d_pci_device select_card_handler(const struct gl_vendor_selection *table, - unsigned int table_size, enum wined3d_gl_vendor gl_vendor, - const struct wined3d_gl_info *gl_info, const char *gl_renderer) + unsigned int table_size, enum wined3d_gl_vendor gl_vendor, const char *gl_renderer) { unsigned int i; @@ -2326,7 +2320,7 @@ static enum wined3d_pci_device select_card_handler(const struct gl_vendor_select continue; TRACE("Applying card selector \"%s\".\n", table[i].description); - return table[i].select_card(gl_info, gl_renderer); + return table[i].select_card(gl_renderer); } FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)\n", gl_vendor, debugstr_a(gl_renderer)); @@ -2422,7 +2416,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * TRACE("Applying card selector \"%s\".\n", card_vendor_table[i].description); device = select_card_handler(card_vendor_table[i].gl_vendor_selection, - card_vendor_table[i].gl_vendor_count, *gl_vendor, gl_info, gl_renderer); + card_vendor_table[i].gl_vendor_count, *gl_vendor, gl_renderer); if (device != PCI_DEVICE_NONE) return device;

1 0

Akihiro Sagawa : msi: Move set_installed_prop() call because platform information is needed in it.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 6fc6d32da2eb523fa5567e890be661f5fbea88f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc6d32da2eb523fa5567e890… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 21 21:48:13 2014 +0900 msi: Move set_installed_prop() call because platform information is needed in it. --- dlls/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 73f342c..96de82d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1181,7 +1181,6 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) package->ProductCode = msi_dup_property( package->db, szProductCode ); package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); - set_installed_prop( package ); set_installer_properties( package ); package->ui_level = gUILevel; @@ -1656,6 +1655,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } msi_set_property( package->db, szDatabase, db->path, -1 ); + set_installed_prop( package ); msi_set_context( package ); while (1)

1 0

Akihiro Sagawa : msi/tests: Add non-existence value tests for mixed package.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 5b76cd199a2a617aa7bce9325b15d289f989d149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b76cd199a2a617aa7bce9325… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 21 21:48:15 2014 +0900 msi/tests: Add non-existence value tests for mixed package. --- dlls/msi/tests/install.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 2a9af85..bda3744 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5701,15 +5701,19 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key\n"); + ok(!res, "can't open 32-bit component key, got %d\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "value test1 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key\n"); + ok(!res, "can't open 64-bit component key, got %d\n", res); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "value test2 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); @@ -5728,15 +5732,19 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key\n"); + ok(!res, "can't open 32-bit component key, got %d\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "value test1 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key\n"); + ok(!res, "can't open 64-bit component key, got %d\n", res); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "value test2 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL");

1 0

Akihiro Sagawa : msi/tests: Add CLSID registry tests for mixed package.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 0eed829f7f67364c694793a77a861dc5c9cce404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eed829f7f67364c694793a77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 21 21:48:16 2014 +0900 msi/tests: Add CLSID registry tests for mixed package. --- dlls/msi/tests/install.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index bda3744..a99a4c4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1088,7 +1088,11 @@ static const char mixed_registry_dat[] = "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" "regdata1\t2\tSOFTWARE\\Wine\\msitest\ttest1\t\tcomp1\n" - "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n"; + "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n" + "regdata3\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\t\tCLSID_Winetest32\tcomp1\n" + "regdata4\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32\t\twinetest32.dll\tcomp1\n" + "regdata5\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\t\tCLSID_Winetest64\tcomp2\n" + "regdata6\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32\t\twinetest64.dll\tcomp2\n"; static const char mixed_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -5678,6 +5682,8 @@ static void test_mixed_package(void) UINT r; LONG res; HKEY hkey; + char value[MAX_PATH]; + DWORD size; if (is_process_limited()) { @@ -5716,6 +5722,28 @@ static void test_mixed_package(void) ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest32.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest64.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5725,6 +5753,16 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "32-bit CLSID key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit CLSID key not removed\n"); + DeleteFileA( msifile ); create_database_template(msifile, mixed_tables, sizeof(mixed_tables)/sizeof(msi_table), 200, "Intel;1033"); @@ -5747,6 +5785,28 @@ static void test_mixed_package(void) ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest32.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest64.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5756,6 +5816,16 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "32-bit CLSID key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit CLSID key not removed\n"); + error: DeleteFileA( msifile ); }

1 0

Jacek Caban : vbscript: Use VariantChangeType in to_int.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 15dfae71a12f4937c363156849213881c879c684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15dfae71a12f4937c36315684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 21 16:05:14 2014 +0200 vbscript: Use VariantChangeType in to_int. --- dlls/vbscript/global.c | 54 +++++++++++---------------------------------- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 16 insertions(+), 41 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index af7a27d..610de43 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -142,41 +142,15 @@ static inline HRESULT return_date(VARIANT *res, double date) HRESULT to_int(VARIANT *v, int *ret) { - if(V_VT(v) == (VT_BYREF|VT_VARIANT)) - v = V_VARIANTREF(v); - - switch(V_VT(v)) { - case VT_I2: - *ret = V_I2(v); - break; - case VT_I4: - *ret = V_I4(v); - break; - case VT_R8: { - double n = floor(V_R8(v)+0.5); - INT32 i; - - if(!is_int32(n)) { - FIXME("%lf is out of int range\n", n); - return E_FAIL; - } - - /* Round half to even */ - i = n; - if(i%2 && n-V_R8(v) == 0.5) - i--; + VARIANT r; + HRESULT hres; - *ret = i; - break; - } - case VT_BOOL: - *ret = V_BOOL(v) ? -1 : 0; - break; - default: - FIXME("not supported %s\n", debugstr_variant(v)); - return E_NOTIMPL; - } + V_VT(&r) = VT_EMPTY; + hres = VariantChangeType(&r, v, 0, VT_I4); + if(FAILED(hres)) + return hres; + *ret = V_I4(&r); return S_OK; } @@ -400,24 +374,22 @@ static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - VARIANT v; + int i; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - V_VT(&v) = VT_EMPTY; - hres = VariantChangeType(&v, arg, 0, VT_I4); + hres = to_int(arg, &i); if(FAILED(hres)) return hres; - if(!res) return DISP_E_BADVARTYPE; - else { - *res = v; - return S_OK; - } + + V_VT(res) = VT_I4; + V_I4(res) = i; + return S_OK; } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 813f5e8..38e5e76 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -136,6 +136,7 @@ Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) Call ok(Chr(0) <> "", "Chr(0) = """"") Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) +Call ok(Chr("120") = "x", "Chr(""120"") = " & Chr("120")) sub testChrError on error resume next @@ -321,6 +322,7 @@ Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") +Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) @@ -341,6 +343,7 @@ TestLeft "test", 0, "" TestLeft 123, 2, "12" TestLeft "123456", 1.5, "12" TestLeft "123456", 2.5, "12" +TestLeft "test", "2", "te" if isEnglishLang then TestLeft true, 2, "Tr" Sub TestRight(str, len, ex)

1 0

Jacek Caban : wscript: Added support for calling object by DISPID_VALUE in do_icall.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: e73bd253ea4e72d0ceb5874105155fb99e6f3ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73bd253ea4e72d0ceb587410… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 21 18:07:40 2014 +0200 wscript: Added support for calling object by DISPID_VALUE in do_icall. --- dlls/vbscript/interp.c | 11 ++++++++++- dlls/vbscript/tests/run.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 10641db..7c66096 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -561,7 +561,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) v = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v; if(arg_cnt) { - SAFEARRAY *array; + SAFEARRAY *array = NULL; switch(V_VT(v)) { case VT_ARRAY|VT_BYREF|VT_VARIANT: @@ -570,11 +570,20 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) case VT_ARRAY|VT_VARIANT: array = V_ARRAY(ref.u.v); break; + case VT_DISPATCH: + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); + hres = disp_call(ctx->script, V_DISPATCH(v), DISPID_VALUE, &dp, res); + if(FAILED(hres)) + return hres; + break; default: FIXME("arguments not implemented\n"); return E_NOTIMPL; } + if(!array) + break; + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); hres = array_access(ctx, array, &dp, &v); if(FAILED(hres)) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 56361bf..33cf0cd 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -87,6 +87,7 @@ DEFINE_EXPECT(testobj_propget_d); DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); +DEFINE_EXPECT(testobj_value_i); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); @@ -718,6 +719,29 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_VALUE: { + VARIANT *arg; + int i; + + CHECK_EXPECT(testobj_value_i); + + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + for(i=0; i<pdp->cArgs; i++) { + arg = pdp->rgvarg+pdp->cArgs-i-1; + ok(V_VT(arg) == VT_I2, "V_VT(arg) = %d\n", V_VT(arg)); + ok(V_I2(arg) == i+1, "V_I2(arg) = %d\n", V_I2(arg)); + } + + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = pdp->cArgs; + return S_OK; + } case DISPID_TESTOBJ_PROPGET: CHECK_EXPECT(testobj_propget_i); @@ -2053,6 +2077,14 @@ static void run_tests(void) strict_dispid_check = FALSE; + SET_EXPECT(testobj_value_i); + parse_script_a("dim n,o\n set o = testObj\n n = o(1,2)\n call ok(n=2, \"n = \" & n)\n"); + CHECK_CALLED(testobj_value_i); + + SET_EXPECT(testobj_value_i); + parse_script_a("dim n,o\n set o = testObj\n n = o\n call ok(n=0, \"n = \" & n)\n"); + CHECK_CALLED(testobj_value_i); + parse_script_a("Sub testsub\n" "x = 1\n" "Call ok(x = 1, \"x = \" & x)\n"

1 0

Jactry Zeng : riched20: Fix ME_SetSelection when cpMax > strlen().
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 68b9018d50b7ef2d74c08a2562e8b670731f777f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b9018d50b7ef2d74c08a256… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 22 00:40:48 2014 +0800 riched20: Fix ME_SetSelection when cpMax > strlen(). --- dlls/riched20/caret.c | 13 ++++++++++++- dlls/riched20/tests/editor.c | 14 ++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 90b30a2..043a32a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -139,6 +139,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) { ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0]); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; ME_InvalidateSelection(editor); return len + 1; } @@ -159,6 +160,11 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_GetSelectionOfs(editor, &start, &end); if (start != end) { + if (end > len) + { + editor->pCursors[0].nOffset = 0; + end --; + } editor->pCursors[1] = editor->pCursors[0]; ME_Repaint(editor); } @@ -200,7 +206,12 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (editor->pCursors[1].pRun->member.run.nFlags & MERF_ENDPARA) editor->pCursors[1].nOffset = 0; if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA) - editor->pCursors[0].nOffset = 0; + { + if (to > len) + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + else + editor->pCursors[0].nOffset = 0; + } return to; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3bd3ec0..5ad063e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4363,7 +4363,9 @@ const struct exsetsel_s exsetsel_tests[] = { {5, 10, 10, 5, 10, 0}, {15, 17, 17, 15, 17, 0}, /* test cpMax > strlen() */ - {0, 100, 18, 0, 18, 1}, + {0, 100, 18, 0, 18, 0}, + /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ + {-1, 1, 17, 17, 17, 0}, /* test cpMin == cpMax */ {5, 5, 5, 5, 5, 0}, /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ @@ -4373,13 +4375,13 @@ const struct exsetsel_s exsetsel_tests[] = { /* test cpMin < 0 && cpMax < 0 */ {-1, -1, 17, 17, 17, 0}, {-4, -5, 17, 17, 17, 0}, - /* test cMin >=0 && cpMax < 0 (bug 6814) */ - {0, -1, 18, 0, 18, 1}, - {17, -5, 18, 17, 18, 1}, + /* test cpMin >=0 && cpMax < 0 (bug 6814) */ + {0, -1, 18, 0, 18, 0}, + {17, -5, 18, 17, 18, 0}, {18, -3, 17, 17, 17, 0}, /* test if cpMin > cpMax */ - {15, 19, 18, 15, 18, 1}, - {19, 15, 18, 15, 18, 1} + {15, 19, 18, 15, 18, 0}, + {19, 15, 18, 15, 18, 0}, }; static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) {

1 0

Jactry Zeng : riched20: Implement ITextSelection::GetText.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 1f6073c8614f7358b76551a9e35dccb1254d8a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6073c8614f7358b76551a9e… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 22 00:41:29 2014 +0800 riched20: Implement ITextSelection::GetText. --- dlls/riched20/clipboard.c | 2 +- dlls/riched20/editor.c | 22 +++++++---- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 27 ++++++++++++- dlls/riched20/tests/richole.c | 90 +++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/txtsrv.c | 2 +- 6 files changed, 132 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6073c8614f7358b7655…

1 0

Thomas Faber : strmbase: Separate BaseFilter destructor from Release.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 992f5345edb52e89087ff444fe5023b4a5d3a896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992f5345edb52e89087ff444f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jul 18 22:19:40 2014 +0200 strmbase: Separate BaseFilter destructor from Release. --- dlls/strmbase/filter.c | 21 +++++++++++++-------- include/wine/strmbase.h | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index e2cf807..697b243 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -69,14 +69,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - { - if (This->pClock) - IReferenceClock_Release(This->pClock); - - This->IBaseFilter_iface.lpVtbl = NULL; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); - } + BaseFilter_Destroy(This); return refCount; } @@ -218,3 +211,15 @@ HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, c return S_OK; } + +HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) +{ + if (This->pClock) + IReferenceClock_Release(This->pClock); + + This->IBaseFilter_iface.lpVtbl = NULL; + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); + + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9727fb4..1370198 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -194,6 +194,7 @@ LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter* This); VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable); +HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);

1 0

Thomas Faber : strmbase: Destroy base class after child class.
by Alexandre Julliard 21 Jul '14

21 Jul '14

Module: wine Branch: master Commit: 3dbcadc2785236c2518777d592d17853ea260f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbcadc2785236c2518777d59… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jul 18 22:23:36 2014 +0200 strmbase: Destroy base class after child class. --- dlls/strmbase/renderer.c | 3 ++- dlls/strmbase/transform.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index bb91236..766e467 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -294,7 +294,7 @@ HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter* iface, REFIID riid, ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) { BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); if (!refCount) { @@ -319,6 +319,7 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) CloseHandle(This->ThreadSignal); CloseHandle(This->RenderEvent); QualityControlImpl_Destroy(This->qcimpl); + BaseFilter_Destroy(&This->filter); } return refCount; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index eba7ad2..0fc7515 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -313,7 +313,7 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) { TransformFilter *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -343,6 +343,7 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); IUnknown_Release(This->seekthru_unk); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0;

1 0