wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Rosanne DiMesio : Improve maintainerView
by Jeremy Newman 19 May '17

19 May '17

Module: appdb Branch: master Commit: 9182149367270c198deddae128cd9302d1bbdfb6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9182149367270c198deddae1… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri May 19 13:10:34 2017 -0500 Improve maintainerView The table (available only to admins) now displays entries sorted by maintainer name rather than userid and adds columns for the maintainer's login id and last time connected. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/maintainerView.php | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 7fe1462..8c88c3d 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -42,12 +42,14 @@ class maintainerView public function objectGetHeader() { $oTableRow = new TableRow(); - $oTableRow->AddTextCell('Submission date'); $oTableRow->AddTextCell('Maintainer'); + $oTableRow->AddTextCell('Login'); + $oTableRow->AddTextCell('Submission date'); + $oTableRow->AddTextCell('Last connected'); $oTableRow->AddTextCell('Application'); $oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Action'); - $oTableRow->SetClass('color4'); + $oTableRow->SetClass('color3'); $oTableRow->SetStyle('color: white;'); return $oTableRow; @@ -87,6 +89,7 @@ class maintainerView $oTable->SetCellPadding(3); $oTable->SetCellSpacing(0); + $oTable->SetWidth('100%'); $oHeader = $this->objectGetHeader(); $oTable->AddRow($oHeader); @@ -106,8 +109,16 @@ class maintainerView $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); - $oCell = new TableCell($oUser->objectMakeLink()); - $oCell->SetStyle($sStyle); + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oTableRow->AddCell($oCell); + + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oTableRow->AddCell($oCell); + + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); @@ -128,8 +139,8 @@ class maintainerView $oTableRow->SetClass('color4'); $oTable->AddRow($oTableRow); - - /* Show all apps/versions that the user maintainers */ + + /* Show all apps/versions that the user maintains */ $hAppResult = query_parameters("SELECT * FROM appMaintainers WHERE userId = '?'", $oMaintainerView->iUserId); for($i = 0; $oAppRow = query_fetch_object($hAppResult); $i++) { @@ -149,19 +160,22 @@ class maintainerView $sVersionText = $oVersion->sName; } - $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); + $oTableRow->AddTextCell($oUser->sEmail); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oUser->sStamp))); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCelL($sVersionText); - $oTableRow->AddTextCell('[<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).'">delete</a>]'); + $oTableRow->AddTextCell('<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).' + "class="btn btn-default btn-sm"><i class="fa fa-trash"></i> delete</a>'); $oTable->AddRow($oTableRow); } } - echo $oTable->GetString(); - } + echo $oTable->GetString(); + } function objectGetItemsPerPage($sState = 'accepted') { @@ -177,8 +191,10 @@ class maintainerView $sLimit = objectManager::getSqlLimitClause($iRows, $iStart, 'maintainerView'); - $sQuery = "SELECT DISTINCT(userId) FROM appMaintainers WHERE state = '?'$sLimit"; - $hResult = query_parameters($sQuery, $sState); + // get available maintainers + $sQuery = "SELECT * FROM appMaintainers, user_list WHERE appMaintainers.userId = user_list.userid"; + $sQuery.= " AND state='accepted' GROUP BY appMaintainers.userid ORDER BY realname, email;"; + $hResult = query_parameters($sQuery); return $hResult; }

1 0

Paul Gofman : d3dx9: Loop through input parameters in is_const_tab_input_dirty().
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 53bf72e266532f2f0533a0dfd7e90a25d7b6d901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bf72e266532f2f0533a0dfd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:20 2017 +0200 d3dx9: Loop through input parameters in is_const_tab_input_dirty(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 49eeb22..8d1d1b4 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1323,9 +1323,10 @@ static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update if (update_version == ULONG64_MAX) update_version = ctab->update_version; - for (i = 0; i < ctab->const_set_count; ++i) + for (i = 0; i < ctab->input_count; ++i) { - if (is_param_dirty(ctab->const_set[i].param, update_version)) + if (ctab->inputs_param[i] + && is_param_dirty(ctab->inputs_param[i], update_version)) return TRUE; } return FALSE;

1 0

Paul Gofman : d3dx9: Avoid redundant constant tables updates.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 5e87656ec3b054fec0d3ae19db4af7c8ac2e67f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e87656ec3b054fec0d3ae19d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:19 2017 +0200 d3dx9: Avoid redundant constant tables updates. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 72 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 6eddf6e..49eeb22 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -352,13 +352,8 @@ static void regstore_set_double(struct d3dx_regstore *rs, unsigned int table, un 1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE); } -static void regstore_reset_table(struct d3dx_regstore *rs, unsigned int table) +static void regstore_reset_modified(struct d3dx_regstore *rs, unsigned int table) { - unsigned int size; - - size = rs->table_sizes[table] * table_info[table].reg_component_count * table_info[table].component_size; - - memset(rs->tables[table], 0, size); memset(rs->table_value_set[table], 0, sizeof(*rs->table_value_set[table]) * ((rs->table_sizes[table] + PRES_BITMASK_BLOCK_SIZE - 1) / PRES_BITMASK_BLOCK_SIZE)); @@ -950,7 +945,7 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) } static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, - BOOL update_all, ULONG64 new_update_version) + ULONG64 new_update_version) { unsigned int const_idx; @@ -965,7 +960,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const BOOL transpose; unsigned int count; - if (!(update_all || is_param_dirty(param, const_tab->update_version))) + if (!is_param_dirty(param, const_tab->update_version)) continue; transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) @@ -1305,6 +1300,23 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) return D3D_OK; } +static void set_preshader_modified(struct d3dx_preshader *pres) +{ + unsigned int i; + + for (i = 0; i < pres->ins_count; ++i) + { + const struct d3dx_pres_ins *ins = &pres->ins[i]; + const struct d3dx_pres_reg *reg = &ins->output.reg; + + if (reg->table == PRES_REGTAB_TEMP) + continue; + + regstore_set_modified(&pres->regs, reg->table, reg->offset, + pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); + } +} + static BOOL is_const_tab_input_dirty(struct d3dx_const_tab *ctab, ULONG64 update_version) { unsigned int i; @@ -1337,7 +1349,7 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, const struct d3dx if (is_const_tab_input_dirty(&peval->pres.inputs, ULONG64_MAX)) { - set_constants(&peval->pres.regs, &peval->pres.inputs, FALSE, + set_constants(&peval->pres.regs, &peval->pres.inputs, next_update_version(peval->version_counter)); if (FAILED(hr = execute_preshader(&peval->pres))) @@ -1424,7 +1436,7 @@ static HRESULT set_shader_constants_device(ID3DXEffectStateManager *manager, str } start += count; } - regstore_reset_table(rs, table); + regstore_reset_modified(rs, table); return result; } @@ -1438,22 +1450,50 @@ HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, s struct d3dx_regstore *rs = &pres->regs; unsigned int i; ULONG64 new_update_version = next_update_version(peval->version_counter); + BOOL update_device = update_all; TRACE("device %p, peval %p, param_type %u.\n", device, peval, peval->param_type); - if (update_all || is_const_tab_input_dirty(&pres->inputs, ULONG64_MAX)) + if (is_const_tab_input_dirty(&pres->inputs, ULONG64_MAX)) { - set_constants(rs, &pres->inputs, update_all, new_update_version); + set_constants(rs, &pres->inputs, new_update_version); if (FAILED(hr = execute_preshader(pres))) return hr; + update_device = TRUE; } - set_constants(rs, &peval->shader_inputs, update_all, new_update_version); + if (is_const_tab_input_dirty(&peval->shader_inputs, ULONG64_MAX)) + { + set_constants(rs, &peval->shader_inputs, new_update_version); + update_device = TRUE; + } result = D3D_OK; - for (i = 0; i < ARRAY_SIZE(set_tables); ++i) + + if (update_device) { - if (FAILED(hr = set_shader_constants_device(manager, device, rs, peval->param_type, set_tables[i]))) - result = hr; + if (update_all) + { + for (i = 0; i < peval->shader_inputs.input_count; ++i) + { + unsigned int table; + + if (!peval->shader_inputs.inputs[i].RegisterCount) + continue; + table = peval->shader_inputs.regset2table[peval->shader_inputs.inputs[i].RegisterSet]; + if (table < PRES_REGTAB_COUNT) + regstore_set_modified_reg(rs, table, + peval->shader_inputs.inputs[i].RegisterIndex, + peval->shader_inputs.inputs[i].RegisterIndex + + peval->shader_inputs.inputs[i].RegisterCount - 1); + } + set_preshader_modified(pres); + } + + for (i = 0; i < ARRAY_SIZE(set_tables); ++i) + { + if (FAILED(hr = set_shader_constants_device(manager, device, rs, peval->param_type, set_tables[i]))) + result = hr; + } } return result; }

1 0

Paul Gofman : d3dx9: Factor out regstore_set_modified_reg() function.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: b5784f926caa9d29235afcf994d5e0e408a7dd9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5784f926caa9d29235afcf99… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 16 19:49:19 2017 +0300 d3dx9: Factor out regstore_set_modified_reg() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 880c66b..6eddf6e 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -265,21 +265,13 @@ static void regstore_free_tables(struct d3dx_regstore *rs) } } -static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, - unsigned int start_offset, unsigned int count) +static void regstore_set_modified_reg(struct d3dx_regstore *rs, unsigned int table, + unsigned int start, unsigned int end) { - unsigned int block_idx, start, end, start_block, end_block; + unsigned int block_idx, start_block, end_block; - if (!count) - return; - - memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, - data, count * table_info[table].component_size); - - start = get_reg_offset(table, start_offset); start_block = start / PRES_BITMASK_BLOCK_SIZE; start -= start_block * PRES_BITMASK_BLOCK_SIZE; - end = get_reg_offset(table, start_offset + count - 1); end_block = end / PRES_BITMASK_BLOCK_SIZE; end = (end_block + 1) * PRES_BITMASK_BLOCK_SIZE - 1 - end; @@ -298,6 +290,27 @@ static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, vo } } +static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, + unsigned int start_offset, unsigned int count) +{ + if (!count) + return; + + regstore_set_modified_reg(rs, table, get_reg_offset(table, start_offset), + get_reg_offset(table, start_offset + count - 1)); +} + +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, + unsigned int start_offset, unsigned int count) +{ + if (!count) + return; + + memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, + data, count * table_info[table].component_size); + regstore_set_modified(rs, table, start_offset, count); +} + static unsigned int regstore_is_val_set_reg(struct d3dx_regstore *rs, unsigned int table, unsigned int reg_idx) { return rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] &

1 0

Paul Gofman : d3dx9: Match native out of bounds array selector index handling.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 454a2c5c214ed8444464337559c591f86a2a8a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454a2c5c214ed844446433755… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu May 18 19:23:17 2017 +0200 d3dx9: Match native out of bounds array selector index handling. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 4 +++- dlls/d3dx9_36/effect.c | 23 +++++++++++++++-------- dlls/d3dx9_36/preshader.c | 16 +++++++++------- dlls/d3dx9_36/tests/effect.c | 25 +++++++++---------------- 4 files changed, 36 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=454a2c5c214ed84444643…

1 0

Paul Gofman : d3dx9: Use versioned parameter updates instead of 'dirty' flags.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: a1795848442022885ce1be127644d5eb1b95b914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1795848442022885ce1be127… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 16 19:49:17 2017 +0300 d3dx9: Use versioned parameter updates instead of 'dirty' flags. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 37 +++++++++++++++++----- dlls/d3dx9_36/effect.c | 72 +++++++++++++++++++++++-------------------- dlls/d3dx9_36/preshader.c | 29 +++++++++++------ 3 files changed, 86 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1795848442022885ce1b…

1 0

Nikolay Sivov : appwiz.cpl: Make list selection always visible, enable full row selection mode.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: a100d6a7a588967bdb9427a2a0a71a83996fe41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a100d6a7a588967bdb9427a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 15:19:34 2017 +0300 appwiz.cpl: Make list selection always visible, enable full row selection mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 +++ dlls/appwiz.cpl/appwiz.rc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 8119d07..3807555 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -831,6 +831,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l switch(msg) { case WM_INITDIALOG: + SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_SETEXTENDEDLISTVIEWSTYLE, + LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + hImageList = ResetApplicationList(TRUE, hWnd, hImageList); if (!hImageList) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 9709ca9..049e1d8 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -62,7 +62,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Modify/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 54, 275, 34 - CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Support Information", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 34, 198, 90, 14 CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 128, 198, 90, 14 CONTROL "&Remove", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 222, 198, 90, 14

1 0

Nikolay Sivov : regedit: Fix a crash when exporting from top level key.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 02b178e79134298d10daa17e1e9185d5d270a832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b178e79134298d10daa17e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 18 17:08:56 2017 +0300 regedit: Fix a crash when exporting from top level key. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 01c9c76..10b4a38 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1232,7 +1232,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); exit(1); } - if (!branch_name[0]) { + if (!branch_name || !*branch_name) { /* no branch - registry class is specified */ file = REGPROC_open_export_file(file_name, unicode); export_hkey(file, reg_key_class,

1 0

Alistair Leslie-Hughes : oleaut32: Remove dead code.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: c260de0faaf42021a592f3f750623e21b2c3f3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c260de0faaf42021a592f3f75… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 18 02:12:49 2017 +0000 oleaut32: Remove dead code. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 17f753a..188e393 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2617,17 +2617,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - if (leftvt == VT_NULL && (rightvt == VT_EMPTY || - rightvt == VT_NULL || rightvt == VT_I2 || - rightvt == VT_I4 || rightvt == VT_R4 || - rightvt == VT_R8 || rightvt == VT_CY || - rightvt == VT_DATE || rightvt == VT_BSTR || - rightvt == VT_BOOL || rightvt == VT_DECIMAL || - rightvt == VT_I1 || rightvt == VT_UI1 || - rightvt == VT_UI2 || rightvt == VT_UI4 || - rightvt == VT_I8 || rightvt == VT_UI8 || - rightvt == VT_INT || rightvt == VT_UINT)) - return DISP_E_BADVARTYPE; return hres; } } @@ -2657,17 +2646,6 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - if (rightvt == VT_NULL && (leftvt == VT_EMPTY || - leftvt == VT_NULL || leftvt == VT_I2 || - leftvt == VT_I4 || leftvt == VT_R4 || - leftvt == VT_R8 || leftvt == VT_CY || - leftvt == VT_DATE || leftvt == VT_BSTR || - leftvt == VT_BOOL || leftvt == VT_DECIMAL || - leftvt == VT_I1 || leftvt == VT_UI1 || - leftvt == VT_UI2 || leftvt == VT_UI4 || - leftvt == VT_I8 || leftvt == VT_UI8 || - leftvt == VT_INT || leftvt == VT_UINT)) - return DISP_E_BADVARTYPE; return hres; } }

1 0

Austin English : crypt32: Sort specfile.
by Alexandre Julliard 18 May '17

18 May '17

Module: wine Branch: master Commit: 148ece3a8f424c8872cd093839a4c6d006e7f0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148ece3a8f424c8872cd09383… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:46 2017 -0500 crypt32: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index b5ce48c..00a2d62 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -40,11 +40,11 @@ @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) -@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindCRLInStore(ptr long long long ptr ptr) @ stdcall CertFindCTLInStore(ptr long long long ptr ptr) -@ stdcall CertFindCertificateInStore(ptr long long long ptr ptr) @ stdcall CertFindCertificateInCRL(ptr ptr long ptr ptr) +@ stdcall CertFindCertificateInStore(ptr long long long ptr ptr) +@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindExtension(str long ptr) @ stdcall CertFindRDNAttr(str ptr) @ stub CertFindSubjectInCTL @@ -92,21 +92,20 @@ @ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) -@ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) +@ stdcall CertUnregisterSystemStore(ptr long) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) @ stdcall CertVerifyCTLUsage(long long ptr ptr long ptr ptr) +@ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) @ stdcall CertVerifyRevocation(long long long ptr long ptr ptr) @ stdcall CertVerifySubjectCertificateContext(ptr ptr ptr) @ stdcall CertVerifyTimeValidity(ptr ptr) @ stdcall CertVerifyValidityNesting(ptr ptr) @ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW +@ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) +@ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) @ stdcall CryptBinaryToStringW(ptr long long ptr ptr) -@ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) -@ stdcall CryptStringToBinaryW (wstr long long ptr ptr ptr ptr) -@ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW -@ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) @ stub CryptCloseAsyncHandle @ stub CryptCreateAsyncHandle @ stub CryptDecodeMessage @@ -187,11 +186,12 @@ @ stub CryptSignHashU @ stdcall CryptSignMessage(ptr long long ptr ptr ptr ptr) @ stub CryptSignMessageWithKey +@ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) +@ stdcall CryptStringToBinaryW (wstr long long ptr ptr ptr ptr) @ stdcall CryptUnprotectData(ptr ptr ptr ptr ptr long ptr) @ stdcall CryptUnprotectMemory(ptr long long) @ stdcall CryptUnregisterDefaultOIDFunction(long str wstr) @ stdcall CryptUnregisterOIDFunction(long str str) -@ stdcall CertUnregisterSystemStore(ptr long) @ stub CryptUnregisterOIDInfo @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr)

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017