April 2018 - Wine-commits - list.winehq.org

Zebediah Figura : msi: Make MsiEvaluateCondition() RPC-compatible.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 0fc1b6f2f31952f9dab4a22805fe0f098548cb25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc1b6f2f31952f9dab4a228… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 24 22:27:40 2018 -0500 msi: Make MsiEvaluateCondition() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/cond.y | 21 +++------------------ dlls/msi/package.c | 5 ++--- dlls/msi/tests/custom.c | 7 +++++++ dlls/msi/winemsi.idl | 2 +- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 8a3373f..ce06199 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -851,29 +851,14 @@ MSICONDITION WINAPI MsiEvaluateConditionW( MSIHANDLE hInstall, LPCWSTR szConditi if( !package ) { MSIHANDLE remote; - HRESULT hr; - BSTR condition; if (!(remote = msi_get_remote(hInstall))) return MSICONDITION_ERROR; - condition = SysAllocString( szCondition ); - if (!condition) - return ERROR_OUTOFMEMORY; + if (!szCondition) + return MSICONDITION_NONE; - hr = remote_EvaluateCondition(remote, condition); - - SysFreeString( condition ); - - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; + return remote_EvaluateCondition(remote, szCondition); } ret = MSI_EvaluateConditionW( package, szCondition ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4a46df1..c93a0c8 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2578,10 +2578,9 @@ UINT __cdecl remote_FormatRecord(MSIHANDLE hinst, struct wire_record *remote_rec return r; } -HRESULT __cdecl remote_EvaluateCondition(MSIHANDLE hinst, BSTR condition) +MSICONDITION __cdecl remote_EvaluateCondition(MSIHANDLE hinst, LPCWSTR condition) { - UINT r = MsiEvaluateConditionW(hinst, condition); - return HRESULT_FROM_WIN32(r); + return MsiEvaluateConditionW(hinst, condition); } HRESULT __cdecl remote_GetFeatureCost(MSIHANDLE hinst, BSTR feature, diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 76a70ad..2035a8f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -644,6 +644,7 @@ static void test_targetpath(MSIHANDLE hinst) static void test_misc(MSIHANDLE hinst) { + MSICONDITION cond; LANGID lang; UINT r; @@ -658,6 +659,12 @@ static void test_misc(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); check_prop(hinst, "INSTALLLEVEL", "123"); MsiSetInstallLevel(hinst, 3); + + cond = MsiEvaluateConditionA(hinst, NULL); + ok(hinst, cond == MSICONDITION_NONE, "got %u\n", cond); + MsiSetPropertyA(hinst, "condprop", "1"); + cond = MsiEvaluateConditionA(hinst, "condprop = 1"); + ok(hinst, cond == MSICONDITION_TRUE, "got %u\n", cond); } static void test_feature_states(MSIHANDLE hinst) diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 7d7054a..6bdd117 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -88,7 +88,7 @@ interface IWineMsiRemote LANGID remote_GetLanguage( [in] MSIHANDLE hinst ); UINT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level ); UINT remote_FormatRecord( [in] MSIHANDLE hinst, [in] struct wire_record *record, [out, string] LPWSTR *value); - HRESULT remote_EvaluateCondition( [in] MSIHANDLE hinst, [in] BSTR condition ); + MSICONDITION remote_EvaluateCondition( [in] MSIHANDLE hinst, [in, string] LPCWSTR condition ); HRESULT remote_GetFeatureCost( [in] MSIHANDLE hinst, [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost ); HRESULT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in] BSTR component, [in] DWORD index, [in] INSTALLSTATE state, [out, size_is(*buflen)] BSTR drive, [in, out] DWORD *buflen, [out] INT *cost, [out] INT *temp );

1 0

Zebediah Figura : msi: Handle some invalid parameters in MsiGetFeatureCost ().
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 1b6adcb7216a6b4a0706ac7255f3ddb832656127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b6adcb7216a6b4a0706ac72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 24 22:27:41 2018 -0500 msi: Handle some invalid parameters in MsiGetFeatureCost(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 9 +++++++++ dlls/msi/tests/package.c | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b9290b4..63aed1e 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1061,6 +1061,9 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, TRACE("(%d %s %i %i %p)\n", hInstall, debugstr_w(szFeature), iCostTree, iState, piCost); + if (!szFeature) + return ERROR_INVALID_PARAMETER; + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) { @@ -1090,6 +1093,12 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, return ERROR_SUCCESS; } + if (!piCost) + { + msiobj_release( &package->hdr ); + return ERROR_INVALID_PARAMETER; + } + feature = msi_get_loaded_feature(package, szFeature); if (feature) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c2e2106..d26e2fd 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8479,7 +8479,7 @@ static void test_MsiApplyPatch(void) ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); } -static void test_MsiEnumComponentCosts(void) +static void test_costs(void) { MSIHANDLE hdb, hpkg; char package[12], drive[3]; @@ -8662,6 +8662,20 @@ static void test_MsiEnumComponentCosts(void) r = MsiEnumComponentCostsA( hpkg, "", 1, INSTALLSTATE_UNKNOWN, drive, &len, &cost, &temp ); ok( r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + /* test MsiGetFeatureCost */ + cost = 0xdead; + r = MsiGetFeatureCostA( hpkg, NULL, MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &cost ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r); + ok( cost == 0xdead, "got %d\n", cost ); + + r = MsiGetFeatureCostA( hpkg, "one", MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, NULL ); + ok( r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + cost = 0xdead; + r = MsiGetFeatureCostA( hpkg, "one", MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &cost ); + ok( !r, "got %u\n", r); + ok( cost == 8, "got %d\n", cost ); + MsiCloseHandle( hpkg ); error: MsiCloseHandle( hdb ); @@ -9702,7 +9716,7 @@ START_TEST(package) test_MsiSetProperty(); test_MsiApplyMultiplePatches(); test_MsiApplyPatch(); - test_MsiEnumComponentCosts(); + test_costs(); test_MsiDatabaseCommit(); test_externalui(); test_externalui_message();

1 0

Zebediah Figura : msi: Make MsiGetFeatureCost() RPC-compatible.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: e500af2b678da519011588ee6973bda19999f34d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e500af2b678da519011588ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 24 22:27:42 2018 -0500 msi: Make MsiGetFeatureCost() RPC-compatible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 22 ++++------------------ dlls/msi/package.c | 7 +++---- dlls/msi/tests/custom.c | 20 ++++++++++++++++++++ dlls/msi/tests/install.c | 1 + dlls/msi/winemsi.idl | 3 ++- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 63aed1e..45c5537 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1068,29 +1068,15 @@ UINT WINAPI MsiGetFeatureCostW(MSIHANDLE hInstall, LPCWSTR szFeature, if (!package) { MSIHANDLE remote; - HRESULT hr; - BSTR feature; if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - feature = SysAllocString(szFeature); - if (!feature) - return ERROR_OUTOFMEMORY; - - hr = remote_GetFeatureCost(remote, feature, iCostTree, iState, piCost); - - SysFreeString(feature); - - if (FAILED(hr)) - { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) - return HRESULT_CODE(hr); - - return ERROR_FUNCTION_FAILED; - } + /* FIXME: should use SEH */ + if (!piCost) + return RPC_X_NULL_REF_POINTER; - return ERROR_SUCCESS; + return remote_GetFeatureCost(remote, szFeature, iCostTree, iState, piCost); } if (!piCost) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c93a0c8..b633250 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2583,11 +2583,10 @@ MSICONDITION __cdecl remote_EvaluateCondition(MSIHANDLE hinst, LPCWSTR condition return MsiEvaluateConditionW(hinst, condition); } -HRESULT __cdecl remote_GetFeatureCost(MSIHANDLE hinst, BSTR feature, - INT cost_tree, INSTALLSTATE state, INT *cost) +UINT __cdecl remote_GetFeatureCost(MSIHANDLE hinst, LPCWSTR feature, + MSICOSTTREE cost_tree, INSTALLSTATE state, INT *cost) { - UINT r = MsiGetFeatureCostW(hinst, feature, cost_tree, state, cost); - return HRESULT_FROM_WIN32(r); + return MsiGetFeatureCostW(hinst, feature, cost_tree, state, cost); } HRESULT __cdecl remote_EnumComponentCosts(MSIHANDLE hinst, BSTR component, diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 2035a8f..ecd172a 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -855,6 +855,25 @@ static void test_format_record(MSIHANDLE hinst) MsiCloseHandle(rec); } +static void test_costs(MSIHANDLE hinst) +{ + INT cost; + UINT r; + + cost = 0xdead; + r = MsiGetFeatureCostA(hinst, NULL, MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + todo_wine_ok(hinst, !cost, "got %d\n", cost); + + r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, NULL); + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + cost = 0xdead; + r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); + ok(hinst, !r, "got %u\n", r); + todo_wine_ok(hinst, cost == 8, "got %d\n", cost); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) @@ -885,6 +904,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_misc(hinst); test_feature_states(hinst); test_format_record(hinst); + test_costs(hinst); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6a7383b..5c83d30 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -698,6 +698,7 @@ static const CHAR ca1_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "CostInitialize\t\t100\n" "FileCost\t\t200\n" "CostFinalize\t\t300\n" + "InstallValidate\t\t400\n" "embednull\t\t600\n" "maintest\tMAIN_TEST\t700\n" "testretval\tTEST_RETVAL\t710\n"; diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 6bdd117..fa98ac0 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -29,6 +29,7 @@ typedef int MSIRUNMODE; typedef int INSTALLSTATE; typedef int MSICOLINFO; typedef int MSIMODIFY; +typedef int MSICOSTTREE; #define MSIFIELD_NULL 0 #define MSIFIELD_INT 1 @@ -89,7 +90,7 @@ interface IWineMsiRemote UINT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level ); UINT remote_FormatRecord( [in] MSIHANDLE hinst, [in] struct wire_record *record, [out, string] LPWSTR *value); MSICONDITION remote_EvaluateCondition( [in] MSIHANDLE hinst, [in, string] LPCWSTR condition ); - HRESULT remote_GetFeatureCost( [in] MSIHANDLE hinst, [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost ); + UINT remote_GetFeatureCost( [in] MSIHANDLE hinst, [in, string] LPCWSTR feature, [in] MSICOSTTREE cost_tree, [in] INSTALLSTATE state, [out] INT *cost ); HRESULT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in] BSTR component, [in] DWORD index, [in] INSTALLSTATE state, [out, size_is(*buflen)] BSTR drive, [in, out] DWORD *buflen, [out] INT *cost, [out] INT *temp );

1 0

Józef Kucia : wined3d: Scan output signatures for pass-through geometry shaders.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 45b8eef47a1ebd8a696c795f2f741576ea241443 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b8eef47a1ebd8a696c795f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:47 2018 +0200 wined3d: Scan output signatures for pass-through geometry shaders. For shader_glsl_generate_sm4_output_setup(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 65 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b757d93..68d9954 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -992,6 +992,40 @@ static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT, mode); } +static HRESULT shader_scan_output_signature(struct wined3d_shader *shader) +{ + const struct wined3d_shader_signature *output_signature = &shader->output_signature; + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + unsigned int i; + HRESULT hr; + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + unsigned int mask; + + reg_maps->output_registers |= 1u << e->register_idx; + if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->clip_distance_mask |= mask; + } + else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->cull_distance_mask |= mask; + } + else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) + { + reg_maps->viewport_array = 1; + } + } + + return WINED3D_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -1789,29 +1823,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (output_signature->elements) { - for (i = 0; i < output_signature->element_count; ++i) - { - const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; - unsigned int mask; - - reg_maps->output_registers |= 1u << e->register_idx; - if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) - { - if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) - return hr; - reg_maps->clip_distance_mask |= mask; - } - else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) - { - if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) - return hr; - reg_maps->cull_distance_mask |= mask; - } - else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) - { - reg_maps->viewport_array = 1; - } - } + if (FAILED(hr = shader_scan_output_signature(shader))) + return hr; } else if (reg_maps->output_registers) { @@ -3701,6 +3714,12 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->reg_maps.shader_version.major = 4; shader->reg_maps.shader_version.minor = 0; shader_set_limits(shader); + + if (FAILED(hr = shader_scan_output_signature(shader))) + { + shader_cleanup(shader); + return hr; + } } shader->load_local_constsF = shader->lconst_inf_or_nan;

1 0

Józef Kucia : wined3d: Reduce number of parameters passed to shader_get_registers_used().
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: wine Branch: master Commit: 9c88870459ecaf745f96a5533b300075681d1a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c88870459ecaf745f96a553… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 25 11:23:48 2018 +0200 wined3d: Reduce number of parameters passed to shader_get_registers_used(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 68d9954..c893945 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1027,12 +1027,14 @@ static HRESULT shader_scan_output_signature(struct wined3d_shader *shader) } /* Note that this does not count the loop register as an address register. */ -static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, - struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, - struct wined3d_shader_signature *output_signature, DWORD constf_size) +static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD constf_size) { struct wined3d_shader_signature_element input_signature_elements[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature_elements[MAX_REG_OUTPUT]; + struct wined3d_shader_signature *output_signature = &shader->output_signature; + struct wined3d_shader_signature *input_signature = &shader->input_signature; + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_shader_frontend *fe = shader->frontend; unsigned int cur_loop_depth = 0, max_loop_depth = 0; struct wined3d_shader_version shader_version; struct wined3d_shader_phase *phase = NULL; @@ -3292,11 +3294,11 @@ const struct wined3d_shader_backend_ops none_shader_backend = static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version) { + const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; - HRESULT hr; unsigned int backend_version; - const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; + HRESULT hr; TRACE("shader %p, float_const_count %u, type %#x, max_version %u.\n", shader, float_const_count, type, max_version); @@ -3314,8 +3316,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_co shader_trace_init(fe, shader->frontend_data); /* Second pass: figure out which registers are used, what the semantics are, etc. */ - if (FAILED(hr = shader_get_registers_used(shader, fe, reg_maps, &shader->input_signature, - &shader->output_signature, float_const_count))) + if (FAILED(hr = shader_get_registers_used(shader, float_const_count))) return hr; if (reg_maps->shader_version.type != type)

1 0

Francois Gouget : testbot/web: Standardize the packages inheritance.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: tools Branch: master Commit: 42b196c770e172761305656328994a86ebd9b164 URL: https://source.winehq.org/git/tools.git/?a=commit;h=42b196c770e172761305656… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 25 14:01:01 2018 +0200 testbot/web: Standardize the packages inheritance. Use "our" instead of fully prefixing @ISA. Also defining the package inheritance does not depend on the rest of the package so move these statements first, even before all the other imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 6 ++++-- testbot/web/Feedback.pl | 6 ++++-- testbot/web/ForgotPassword.pl | 6 ++++-- testbot/web/JobDetails.pl | 7 +++++-- testbot/web/Login.pl | 6 ++++-- testbot/web/Logout.pl | 6 ++++-- testbot/web/PatchesList.pl | 6 ++++-- testbot/web/Register.pl | 6 ++++-- testbot/web/ResetPassword.pl | 6 ++++-- testbot/web/Stats.pl | 4 +++- testbot/web/Submit.pl | 6 ++++-- testbot/web/admin/BranchDetails.pl | 5 +++-- testbot/web/admin/BranchesList.pl | 4 +++- testbot/web/admin/Log.pl | 5 +++-- testbot/web/admin/UserDetails.pl | 4 +++- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMDetails.pl | 4 +++- testbot/web/admin/VMsList.pl | 4 +++- 18 files changed, 64 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=42b196c770e17276130…

1 0

Francois Gouget : testbot: Take Step dependencies into account in Job:: UpdateStatus().
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: tools Branch: master Commit: 07b78e2c7916dd4b228c01fdd11e841ef7a9c548 URL: https://source.winehq.org/git/tools.git/?a=commit;h=07b78e2c7916dd4b228c01f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 25 14:00:31 2018 +0200 testbot: Take Step dependencies into account in Job::UpdateStatus(). Job::UpdateStatus() used to assume that Step n would always depend on Step n-1. But now Step n may depend on Step 1 or any other previous step instead. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 29f7860..0f80193 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -179,21 +179,26 @@ sub UpdateStatus($) my $Status = $self->Status; return $Status if ($Status ne "queued" && $Status ne "running"); - my (%Has, $Skip); - my @SortedSteps = sort { $a->No <=> $b->No } @{$self->Steps->GetItems()}; + my %Has; + my $Steps = $self->Steps; + my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) { - my $StepStatus = $Step->UpdateStatus($Skip); - $Has{$StepStatus} = 1; - - if ($StepStatus ne "queued" && $StepStatus ne "running" && - $StepStatus ne "completed" && - ($Step->Type eq "build" || $Step->Type eq "reconfig")) + my $Skip; + if ($Step->PreviousNo) { - # The following steps need binaries that this one was supposed to - # produce. So skip them. - $Skip = 1; + my $PrevStatus = $Steps->GetItem($Step->PreviousNo)->Status; + if ($PrevStatus ne "queued" && $PrevStatus ne "running" && + $PrevStatus ne "completed") + { + # The previous step was supposed to provide binaries but it failed + # or was canceled. So skip this one. + $Skip = 1; + } } + + my $StepStatus = $Step->UpdateStatus($Skip); + $Has{$StepStatus} = 1; } # Inherit the steps most significant status.

1 0

Józef Kucia : include: Remove stdbool.h include from vkd3d_utils.h.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: vkd3d Branch: master Commit: c197b9c9a17c065c402224ec304861a67fd875d0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c197b9c9a17c065c402224e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 24 17:32:53 2018 +0200 include: Remove stdbool.h include from vkd3d_utils.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo_xcb.h | 1 + include/vkd3d_utils.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 3871556..40e2534 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -26,6 +26,7 @@ #include <limits.h> #include <unistd.h> #include <fcntl.h> +#include <stdbool.h> struct demo { diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 676d333..49987d0 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_UTILS_H #define __VKD3D_UTILS_H -#include <stdbool.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */

1 0

Józef Kucia : include: Move vkd3d_shader.h to private headers.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: vkd3d Branch: master Commit: 6988513d7bfcb9af9dd79383375f733fe9b8153a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6988513d7bfcb9af9dd7938… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 24 17:32:54 2018 +0200 include: Move vkd3d_shader.h to private headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- include/{ => private}/vkd3d_shader.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f1f80c3..494e378 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ libvkd3d_shader_la_SOURCES = \ include/private/vkd3d_common.h \ include/private/vkd3d_debug.h \ include/private/vkd3d_memory.h \ - include/vkd3d_shader.h \ + include/private/vkd3d_shader.h \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/spirv.c \ libs/vkd3d-shader/vkd3d_shader.map \ diff --git a/include/vkd3d_shader.h b/include/private/vkd3d_shader.h similarity index 100% rename from include/vkd3d_shader.h rename to include/private/vkd3d_shader.h

1 0

Józef Kucia : libs/vkd3d-utils: Prefix defines with VKD3D_.
by Alexandre Julliard 25 Apr '18

25 Apr '18

Module: vkd3d Branch: master Commit: 0ae0e431b15b13b6cca3023fdd63987198a308f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0ae0e431b15b13b6cca3023… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 24 17:32:55 2018 +0200 libs/vkd3d-utils: Prefix defines with VKD3D_. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo.h | 1 + include/vkd3d_utils.h | 8 ++++---- libs/vkd3d-utils/vkd3d_utils_main.c | 12 ++++++------ tests/d3d12.c | 4 ++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/demos/demo.h b/demos/demo.h index 4645bd7..2869ea7 100644 --- a/demos/demo.h +++ b/demos/demo.h @@ -142,5 +142,6 @@ static inline HRESULT demo_create_root_signature(ID3D12Device *device, #include "demo_win32.h" #else #include <vkd3d_utils.h> +#define INFINITE VKD3D_INFINITE #include "demo_xcb.h" #endif diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 49987d0..6c926e4 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -23,10 +23,10 @@ extern "C" { #endif /* __cplusplus */ -#define WAIT_OBJECT_0 (0) -#define WAIT_TIMEOUT (1) -#define WAIT_FAILED (~0u) -#define INFINITE (~0u) +#define VKD3D_WAIT_OBJECT_0 (0) +#define VKD3D_WAIT_TIMEOUT (1) +#define VKD3D_WAIT_FAILED (~0u) +#define VKD3D_INFINITE (~0u) HANDLE vkd3d_create_event(void); HRESULT vkd3d_signal_event(HANDLE event); diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 3c0d139..2c4d89a 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -126,7 +126,7 @@ unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) if ((rc = pthread_mutex_lock(&impl->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - return WAIT_FAILED; + return VKD3D_WAIT_FAILED; } if (impl->is_signaled || !milliseconds) @@ -134,10 +134,10 @@ unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) bool is_signaled = impl->is_signaled; impl->is_signaled = false; pthread_mutex_unlock(&impl->mutex); - return is_signaled ? WAIT_OBJECT_0 : WAIT_TIMEOUT; + return is_signaled ? VKD3D_WAIT_OBJECT_0 : VKD3D_WAIT_TIMEOUT; } - if (milliseconds == INFINITE) + if (milliseconds == VKD3D_INFINITE) { do { @@ -145,18 +145,18 @@ unsigned int vkd3d_wait_event(HANDLE event, unsigned int milliseconds) { ERR("Failed to wait on condition variable, error %d.\n", rc); pthread_mutex_unlock(&impl->mutex); - return WAIT_FAILED; + return VKD3D_WAIT_FAILED; } } while (!impl->is_signaled); impl->is_signaled = false; pthread_mutex_unlock(&impl->mutex); - return WAIT_OBJECT_0; + return VKD3D_WAIT_OBJECT_0; } pthread_mutex_unlock(&impl->mutex); FIXME("Timed wait not implemented yet.\n"); - return WAIT_FAILED; + return VKD3D_WAIT_FAILED; } HRESULT vkd3d_signal_event(HANDLE event) diff --git a/tests/d3d12.c b/tests/d3d12.c index ea7d24d..c7303f8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -201,6 +201,10 @@ static void destroy_event(HANDLE event) CloseHandle(event); } #else +#define INFINITE VKD3D_INFINITE +#define WAIT_OBJECT_0 VKD3D_WAIT_OBJECT_0 +#define WAIT_TIMEOUT VKD3D_WAIT_TIMEOUT + static HANDLE create_event(void) { return vkd3d_create_event();

1 0