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

Paul Gofman : d3dx9: Get rid of table lookup for converting between register indexes and offsets.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 2f72e9669f6b429528620b1c6659300501ca5e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f72e9669f6b429528620b1c6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 24 12:46:51 2017 +0300 d3dx9: Get rid of table lookup for converting between register indexes and offsets. 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 | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 40a86fa..29a2346 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -199,18 +199,17 @@ enum pres_value_type static const struct { unsigned int component_size; - unsigned int reg_component_count; enum pres_value_type type; } table_info[] = { - {sizeof(double), 4, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ - {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ - {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ - {sizeof(BOOL), 1, PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ - {sizeof(int), 4, PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ + {sizeof(double), PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ + {sizeof(BOOL), PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ + {sizeof(int), PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ /* TODO: use double precision for 64 bit */ - {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ + {sizeof(float), PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ }; static const char *table_symbol[] = @@ -263,7 +262,12 @@ struct d3dx_pres_ins static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { - return offset / table_info[table].reg_component_count; + return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; +} + +static unsigned int get_offset_reg(unsigned int table, unsigned int reg_idx) +{ + return table == PRES_REGTAB_OBCONST ? reg_idx : reg_idx << 2; } #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) @@ -274,7 +278,7 @@ static HRESULT regstore_alloc_table(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; + size = get_offset_reg(table, rs->table_sizes[table]) * table_info[table].component_size; if (size) { rs->tables[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); @@ -674,8 +678,7 @@ static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *a index_reg = get_reg_offset(arg->index_reg.table, arg->index_reg.offset); TRACE("%s[%u + %s%u.%c].", table_symbol[table], get_reg_offset(table, arg->reg.offset), table_symbol[arg->index_reg.table], index_reg, - xyzw_str[arg->index_reg.offset - - index_reg * table_info[arg->index_reg.table].reg_component_count]); + xyzw_str[arg->index_reg.offset - get_offset_reg(arg->index_reg.table, index_reg)]); } for (i = 0; i < component_count; ++i) TRACE("%c", xyzw_str[(arg->reg.offset + i) % 4]); @@ -804,14 +807,13 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - if (const_count % table_info[PRES_REGTAB_IMMED].reg_component_count) + if (const_count % get_offset_reg(PRES_REGTAB_IMMED, 1)) { FIXME("const_count %u is not a multiple of %u.\n", const_count, - table_info[PRES_REGTAB_IMMED].reg_component_count); + get_offset_reg(PRES_REGTAB_IMMED, 1)); return D3DXERR_INVALIDDATA; } - pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count - / table_info[PRES_REGTAB_IMMED].reg_component_count; + pres->regs.table_sizes[PRES_REGTAB_IMMED] = get_reg_offset(PRES_REGTAB_IMMED, const_count); update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) @@ -1008,16 +1010,16 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const major = param->rows; minor = param->columns; } - start_offset = const_set->register_index * table_info[table].reg_component_count; - major_stride = max(minor, table_info[table].reg_component_count); + start_offset = get_offset_reg(table, const_set->register_index); + major_stride = max(minor, get_offset_reg(table, 1)); n = min(major * major_stride, - const_set->register_count * table_info[table].reg_component_count + major_stride - 1) / major_stride; + get_offset_reg(table, const_set->register_count) + major_stride - 1) / major_stride; count = n * minor; if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) && !transpose && minor == major_stride - && count == table_info[table].reg_component_count * const_set->register_count + && count == get_offset_reg(table, const_set->register_count) && count * sizeof(unsigned int) <= param->bytes) { regstore_set_values(rs, table, param->data, start_offset, count); @@ -1033,9 +1035,9 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int offset; offset = start_offset + i * major_stride + j; - if (offset / table_info[table].reg_component_count >= rs->table_sizes[table]) + if (get_reg_offset(table, offset) >= rs->table_sizes[table]) { - if (table_info[table].reg_component_count != 1) + if (table != PRES_REGTAB_OBCONST) FIXME("Output offset exceeds table size, name %s, component %u.\n", debugstr_a(param->name), i); break; @@ -1234,7 +1236,7 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan static double exec_get_reg_value(struct d3dx_regstore *rs, enum pres_reg_tables table, unsigned int offset) { - if (!regstore_is_val_set_reg(rs, table, offset / table_info[table].reg_component_count)) + if (!regstore_is_val_set_reg(rs, table, get_reg_offset(table, offset))) WARN("Using uninitialized input, table %u, offset %u.\n", table, offset); return regstore_get_double(rs, table, offset); @@ -1251,8 +1253,8 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper else base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset)); - offset = base_index * table_info[table].reg_component_count + opr->reg.offset + comp; - reg_index = offset / table_info[table].reg_component_count; + offset = get_offset_reg(table, base_index) + opr->reg.offset + comp; + reg_index = get_reg_offset(table, offset); if (reg_index >= rs->table_sizes[table]) { @@ -1276,8 +1278,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper if (reg_index >= rs->table_sizes[table]) return 0.0; - offset = reg_index * table_info[table].reg_component_count - + offset % table_info[table].reg_component_count; + offset = get_offset_reg(table, reg_index) + offset % get_offset_reg(table, 1); } return exec_get_reg_value(rs, table, offset); @@ -1390,8 +1391,7 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, const struct d3dx return hr; } - elements_table = table_info[PRES_REGTAB_OCONST].reg_component_count - * peval->pres.regs.table_sizes[PRES_REGTAB_OCONST]; + elements_table = get_offset_reg(PRES_REGTAB_OCONST, peval->pres.regs.table_sizes[PRES_REGTAB_OCONST]); elements_param = param->bytes / sizeof(unsigned int); elements = min(elements_table, elements_param); oc = (float *)peval->pres.regs.tables[PRES_REGTAB_OCONST]; @@ -1419,7 +1419,7 @@ static HRESULT set_shader_constants_device(ID3DXEffectStateManager *manager, str if (!count) break; TRACE("Setting %u constants at %u.\n", count, start); - ptr = (BYTE *)rs->tables[table] + start * table_info[table].reg_component_count + ptr = (BYTE *)rs->tables[table] + get_offset_reg(table, start) * table_info[table].component_size; if (type == D3DXPT_VERTEXSHADER) {

1 0

Austin English : d3dx9_43: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: f8c5daeac62718b88133cb5558048bcd0078212a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c5daeac62718b88133cb555… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:19 2017 -0500 d3dx9_43: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_43/d3dx9_43.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index ede3435..23bb40d 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -73,18 +73,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -119,6 +119,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -137,7 +138,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGenerateOutputDecl(ptr ptr) @ stub D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXGetDeclLength(ptr) @@ -169,11 +169,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -248,23 +248,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -277,12 +260,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Austin English : d3dx9_40: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 35f2597420b390b0bf47a5437256ae3eaf110f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f2597420b390b0bf47a5437… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:16 2017 -0500 d3dx9_40: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_40/d3dx9_40.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Austin English : d3dx9_38: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: fac79112b43c1975fc3dae52fa9f3a70f77a5231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac79112b43c1975fc3dae52f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:14 2017 -0500 d3dx9_38: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_38/d3dx9_38.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Austin English : d3dx9_37: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: ebd1ae9bda0d162f04d178b8502711e78d495ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd1ae9bda0d162f04d178b85… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:13 2017 -0500 d3dx9_37: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_37/d3dx9_37.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Jacek Caban : oleaut32/tests: Use static oleaut32 linking in vartest.c.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: e42a12d8b8e0474e8c2c7390341b8e8b46ccb281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42a12d8b8e0474e8c2c73903… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 30 13:13:06 2017 +0200 oleaut32/tests: Use static oleaut32 linking in vartest.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 648 +++++------------------------------------- 1 file changed, 68 insertions(+), 580 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e42a12d8b8e0474e8c2c7…

1 0

Andrey Gusev : api-ms-win-security-activedirectoryclient-l1-1-0: Add dll.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 52afd729752c5d8a0a90d25d6eada6da280ac548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52afd729752c5d8a0a90d25d6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 29 14:04:49 2017 +0300 api-ms-win-security-activedirectoryclient-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-activedirectoryclient-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index d2d391c..fb22627 100755 --- a/configure +++ b/configure @@ -1026,6 +1026,7 @@ enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +enable_api_ms_win_security_activedirectoryclient_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 @@ -17897,6 +17898,7 @@ wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_d wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 +wine_fn_config_dll api-ms-win-security-activedirectoryclient-l1-1-0 enable_api_ms_win_security_activedirectoryclient_l1_1_0 wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 diff --git a/configure.ac b/configure.ac index db4d168..dde867b 100644 --- a/configure.ac +++ b/configure.ac @@ -2843,6 +2843,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in new file mode 100644 index 0000000..e1e99bd --- /dev/null +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-activedirectoryclient-l1-1-0.dll diff --git a/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec new file mode 100644 index 0000000..eef1c40 --- /dev/null +++ b/dlls/api-ms-win-security-activedirectoryclient-l1-1-0/api-ms-win-security-activedirectoryclient-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub DsBindWithSpnExW +@ stub DsCrackNamesW +@ stub DsFreeDomainControllerInfoW +@ stub DsFreeNameResultW +@ stub DsFreePasswordCredentials +@ stub DsGetDomainControllerInfoW +@ stub DsMakePasswordCredentialsW +@ stub DsUnBindW diff --git a/tools/make_specfiles b/tools/make_specfiles index e544293..910bd0f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,10 @@ my @dll_groups = "api-ms-win-power-setting-l1-1-0", ], [ + "ntdsapi", + "api-ms-win-security-activedirectoryclient-l1-1-0", + ], + [ "kernel32", "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1",

1 0

Andrey Gusev : api-ms-win-core-processthreads-l1-1-2: Add forwards.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: efaedba0d7db6fe21f6c51edfe424b734dbb5225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaedba0d7db6fe21f6c51edf… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 29 12:22:20 2017 +0300 api-ms-win-core-processthreads-l1-1-2: Add forwards. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-2.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index c902274..7bfbe72 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -40,9 +40,9 @@ @ stub IsProcessCritical @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -58,7 +58,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 280954d..e544293 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -224,7 +224,6 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-sysinfo-l1-2-1", - "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", "api-ms-win-core-localization-l1-2-1", @@ -252,6 +251,7 @@ my @dll_groups = "api-ms-win-core-namedpipe-l1-2-0", "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", + "api-ms-win-core-processthreads-l1-1-2", ], [ "kernel32",

1 0

Hans Leidekker : webservices: Add support for dictionary strings in the writer.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 51d934abbc5d483794bc5d1377093ca3d060dd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d934abbc5d483794bc5d137… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:05 2017 +0200 webservices: Add support for dictionary strings in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 18 +++-- dlls/webservices/reader.c | 26 ++++-- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/writer.c | 140 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 114 +++++++++++++++++++++------ 6 files changed, 263 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51d934abbc5d483794bc5…

1 0

Sebastian Lackner : kernel32: Add missing WINAPI to SetThreadIdealProcessorEx implementation.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: dc43ed435f7f0dc9713f4c7e62f78832cc56bda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc43ed435f7f0dc9713f4c7e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon May 29 21:51:24 2017 +0200 kernel32: Add missing WINAPI to SetThreadIdealProcessorEx implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index ac2c368..a30428f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -474,7 +474,7 @@ DWORD WINAPI SetThreadIdealProcessor( /*********************************************************************** * SetThreadIdealProcessorEx (KERNEL32.@) */ -BOOL SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) +BOOL WINAPI SetThreadIdealProcessorEx( HANDLE thread, PROCESSOR_NUMBER *ideal, PROCESSOR_NUMBER *previous ) { FIXME("(%p %p %p): stub\n", thread, ideal, previous); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0