May 2017 - Wine-Commits - list.winehq.org

Rosanne DiMesio : Improve maintainerView
by Jeremy Newman May 19, 2017

May 19, 2017

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: Avoid redundant constant tables updates.
by Alexandre Julliard May 18, 2017

May 18, 2017

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 May 18, 2017

May 18, 2017

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

Alistair Leslie-Hughes : oleaut32: Remove dead code.
by Alexandre Julliard May 18, 2017

May 18, 2017

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 : advpack: Sort specfile.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: a05969604600ddbcd003d5487bf153c0abdf38c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05969604600ddbcd003d5487… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:40 2017 -0500 advpack: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.spec | 62 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 6e02f4f..2f4698a 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -1,82 +1,82 @@ +@ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA @ stdcall AddDelBackupEntryA(str str str long) @ stdcall AddDelBackupEntryW(wstr wstr wstr long) -@ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA +@ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall AdvInstallFileA(long str str str str long long) @ stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) -@ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall CloseINFEngine(long) -@ stdcall DelNodeA(str long) -@ stdcall DelNodeW(wstr long) @ stdcall DelNode(str long) DelNodeA +@ stdcall DelNodeA(str long) +@ stdcall DelNodeRunDLL32(ptr ptr str long) DelNodeRunDLL32A @ stdcall DelNodeRunDLL32A(ptr ptr str long) @ stdcall DelNodeRunDLL32W(ptr ptr wstr long) -@ stdcall DelNodeRunDLL32(ptr ptr str long) DelNodeRunDLL32A +@ stdcall DelNodeW(wstr long) @ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) +@ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExecuteCabA(ptr ptr ptr) @ stdcall ExecuteCabW(ptr ptr ptr) -@ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA +@ stdcall ExtractFiles(str str long str ptr long) ExtractFilesA @ stdcall ExtractFilesA(str str long str ptr long) @ stdcall ExtractFilesW(wstr wstr long wstr ptr long) -@ stdcall ExtractFiles(str str long str ptr long) ExtractFilesA +@ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA @ stdcall FileSaveMarkNotExistA(str str str) @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) -@ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA -@ stdcall FileSaveRestoreA(ptr str str str long) -@ stdcall FileSaveRestoreW(ptr wstr wstr wstr long) @ stdcall FileSaveRestore(ptr str str str long) FileSaveRestoreA +@ stdcall FileSaveRestoreA(ptr str str str long) +@ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA @ stdcall FileSaveRestoreOnINFA(ptr str str str str str long) @ stdcall FileSaveRestoreOnINFW(ptr wstr wstr wstr wstr wstr long) -@ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA -@ stdcall GetVersionFromFileA(str ptr ptr long) -@ stdcall GetVersionFromFileW(wstr ptr ptr long) +@ stdcall FileSaveRestoreW(ptr wstr wstr wstr long) @ stdcall GetVersionFromFile(str ptr ptr long) GetVersionFromFileA +@ stdcall GetVersionFromFileA(str ptr ptr long) +@ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA @ stdcall GetVersionFromFileExA(str ptr ptr long) @ stdcall GetVersionFromFileExW(wstr ptr ptr long) -@ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA +@ stdcall GetVersionFromFileW(wstr ptr ptr long) @ stdcall IsNTAdmin(long ptr) -@ stdcall LaunchINFSectionA(ptr ptr str long) -@ stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall LaunchINFSection(ptr ptr str long) LaunchINFSectionA +@ stdcall LaunchINFSectionA(ptr ptr str long) +@ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA @ stdcall LaunchINFSectionExA(ptr ptr str long) @ stdcall LaunchINFSectionExW(ptr ptr wstr long) -@ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA +@ stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall NeedReboot(long) @ stdcall NeedRebootInit() +@ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA @ stdcall OpenINFEngineA(str str long ptr ptr) @ stdcall OpenINFEngineW(wstr wstr long ptr ptr) -@ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA +@ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA @ stdcall RebootCheckOnInstallA(long str str long) @ stdcall RebootCheckOnInstallW(long wstr wstr long) -@ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA +@ stdcall RegInstall(ptr str ptr) RegInstallA @ stdcall RegInstallA(ptr str ptr) @ stdcall RegInstallW(ptr wstr ptr) -@ stdcall RegInstall(ptr str ptr) RegInstallA +@ stdcall RegRestoreAll(ptr str long) RegRestoreAllA @ stdcall RegRestoreAllA(ptr str long) @ stdcall RegRestoreAllW(ptr wstr long) -@ stdcall RegRestoreAll(ptr str long) RegRestoreAllA -@ stdcall RegSaveRestoreA(ptr str long str str str long) -@ stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) @ stdcall RegSaveRestore(ptr str long str str str long) RegSaveRestoreA +@ stdcall RegSaveRestoreA(ptr str long str str str long) +@ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA @ stdcall RegSaveRestoreOnINFA(ptr str str str long long long) @ stdcall RegSaveRestoreOnINFW(ptr wstr wstr wstr long long long) -@ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA +@ stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) @ stdcall RegisterOCX(ptr ptr str long) +@ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA @ stdcall RunSetupCommandA(long str str str str ptr long ptr) @ stdcall RunSetupCommandW(long wstr wstr wstr wstr ptr long ptr) -@ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA +@ stdcall SetPerUserSecValues(ptr) SetPerUserSecValuesA @ stdcall SetPerUserSecValuesA(ptr) @ stdcall SetPerUserSecValuesW(ptr) -@ stdcall SetPerUserSecValues(ptr) SetPerUserSecValuesA -@ stdcall TranslateInfStringA(str str str str ptr long ptr ptr) -@ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr) @ stdcall TranslateInfString(str str str str ptr long ptr ptr) TranslateInfStringA +@ stdcall TranslateInfStringA(str str str str ptr long ptr ptr) +@ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall TranslateInfStringExA(long str str str str long ptr ptr) @ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) -@ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA +@ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr) +@ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA @ stdcall UserInstStubWrapperA(long long str long) @ stdcall UserInstStubWrapperW(long long wstr long) -@ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA +@ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA @ stdcall UserUnInstStubWrapperA(long long str long) @ stdcall UserUnInstStubWrapperW(long long wstr long) -@ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA

1 0

Austin English : advapi32: Sort specfile.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 56d3830493ccd3006415f07feffabe67178a7a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d3830493ccd3006415f07fe… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:39 2017 -0500 advapi32: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ff56343..d550349 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -1,3 +1,4 @@ +# 1000 stub ADVAPI32_1000 @ stdcall A_SHAFinal(ptr ptr) @ stdcall A_SHAInit(ptr) @ stdcall A_SHAUpdate(ptr ptr long) @@ -30,7 +31,6 @@ # @ stub AddUsersToEncryptedFileEx @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) -# @ stub ADVAPI32_1000 @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) @ stdcall AllocateLocallyUniqueId(ptr) @ stdcall AreAllAccessesGranted(long long) @@ -318,6 +318,7 @@ @ stdcall GetAuditedPermissionsFromAclW(ptr ptr ptr ptr) @ stdcall GetCurrentHwProfileA(ptr) @ stdcall GetCurrentHwProfileW(ptr) +# @ stub GetDynamicTimeZoneInformationEffectiveYears @ stdcall GetEffectiveRightsFromAclA(ptr ptr ptr) @ stdcall GetEffectiveRightsFromAclW(ptr ptr ptr) # @ stub GetEncryptedFileMetadata @@ -359,7 +360,6 @@ @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr) @ stdcall GetSecurityInfoExA (long long long str str ptr ptr ptr ptr) @ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr) -# @ stub GetDynamicTimeZoneInformationEffectiveYears @ stdcall GetServiceDisplayNameA(ptr str ptr ptr) @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) @ stdcall GetServiceKeyNameA(long str ptr ptr)

1 0

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

May 18, 2017

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

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

May 18, 2017

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

Austin English : cfgmgr32: Sort specfile.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 1aac54c44528cca544f4b36c6d2a5c874b573f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aac54c44528cca544f4b36c6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:43 2017 -0500 cfgmgr32: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 2ccd29b..2438083d 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -1,3 +1,4 @@ +@ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents @ stub CM_Add_Empty_Log_Conf @ stub CM_Add_Empty_Log_Conf_Ex @ stub CM_Add_IDA @@ -181,4 +182,3 @@ @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW -@ stdcall CMP_WaitNoPendingInstallEvents(long) setupapi.CMP_WaitNoPendingInstallEvents

1 0

Austin English : apphelp: Sort specfile.
by Alexandre Julliard May 18, 2017

May 18, 2017

Module: wine Branch: master Commit: 581fe7d74c5b40806dd152cea6b327abf7b0780d URL: http://source.winehq.org/git/wine.git/?a=commit;h=581fe7d74c5b40806dd152cea… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 17 22:14:41 2017 -0500 apphelp: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/apphelp.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 2b0e0c6..43a1abf 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -17,6 +17,17 @@ @ stub ApphelpQueryModuleDataEx @ stub ApphelpUpdateCacheEntry @ stub GetPermLayers +@ stub SE_DllLoaded +@ stub SE_DllUnloaded +@ stub SE_GetHookAPIs +@ stub SE_GetMaxShimCount +@ stub SE_GetProcAddressLoad +@ stub SE_GetShimCount +@ stub SE_InstallAfterInit +@ stub SE_InstallBeforeInit +@ stub SE_IsShimDll +@ stub SE_LdrEntryRemoved +@ stub SE_ProcessDying @ stub SdbAddLayerTagRefToQuery @ stub SdbApphelpNotify @ stub SdbApphelpNotifyExSdbApphelpNotifyEx @@ -48,6 +59,8 @@ @ stub SdbFreeDatabaseInformation @ stub SdbFreeFileInfo @ stub SdbFreeFlagInfo +@ stub SdbGUIDFromString +@ stub SdbGUIDToString @ stub SdbGetAppCompatDataSize @ stdcall SdbGetAppPatchDir(long ptr long) @ stub SdbGetBinaryTagData @@ -81,8 +94,6 @@ @ stub SdbGetTagFromTagID @ stub SdbGrabMatchingInfo @ stub SdbGrabMatchingInfoEx -@ stub SdbGUIDFromString -@ stub SdbGUIDToString @ stdcall SdbInitDatabase(long wstr) @ stub SdbInitDatabaseEx @ stub SdbIsNullGUID @@ -111,8 +122,8 @@ @ stub SdbQueryReinstallUpgrade @ stub SdbReadApphelpData @ stub SdbReadApphelpDetailsData -@ stub SdbReadBinaryTag @ stub SdbReadBYTETag +@ stub SdbReadBinaryTag @ stub SdbReadDWORDTagRef @ stub SdbReadEntryInformation @ stub SdbReadMsiTransformInfo @@ -140,9 +151,9 @@ @ stub SdbTagIDToTagRef @ stub SdbTagToString @ stub SdbUnregisterDatabase +@ stub SdbWriteBYTETag @ stub SdbWriteBinaryTag @ stub SdbWriteBinaryTagFromFile -@ stub SdbWriteBYTETag @ stub SdbWriteDWORDTag @ stub SdbWriteNULLTag @ stub SdbWriteQWORDTag @@ -150,17 +161,6 @@ @ stub SdbWriteStringTag @ stub SdbWriteStringTagDirect @ stub SdbWriteWORDTag -@ stub SE_DllLoaded -@ stub SE_DllUnloaded -@ stub SE_GetHookAPIs -@ stub SE_GetMaxShimCount -@ stub SE_GetProcAddressLoad -@ stub SE_GetShimCount -@ stub SE_InstallAfterInit -@ stub SE_InstallBeforeInit -@ stub SE_IsShimDll -@ stub SE_LdrEntryRemoved -@ stub SE_ProcessDying @ stub SetPermLayers @ stub ShimDbgPrint @ stub ShimDumpCache

1 0