wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Andrew Eikum : advapi32: Implement CreateProcessAsUserA.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: eaf709fb19f0d376da41847be60299cdd35b04e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf709fb19f0d376da41847be… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 13 15:54:41 2012 -0500 advapi32: Implement CreateProcessAsUserA. --- dlls/advapi32/security.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 83558ae..8b60dd6 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5091,11 +5091,46 @@ BOOL WINAPI CreateProcessAsUserA( LPSTARTUPINFOA lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) { - FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - stub\n", hToken, debugstr_a(lpApplicationName), + BOOL ret; + WCHAR *appW, *cmdlnW, *cwdW; + STARTUPINFOW sinfo; + + TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken, debugstr_a(lpApplicationName), debugstr_a(lpCommandLine), lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, debugstr_a(lpCurrentDirectory), lpStartupInfo, lpProcessInformation); - return FALSE; + appW = SERV_dup(lpApplicationName); + cmdlnW = SERV_dup(lpCommandLine); + cwdW = SERV_dup(lpCurrentDirectory); + sinfo.cb = sizeof(sinfo); + sinfo.lpReserved = SERV_dup(lpStartupInfo->lpReserved); + sinfo.lpDesktop = SERV_dup(lpStartupInfo->lpDesktop); + sinfo.lpTitle = SERV_dup(lpStartupInfo->lpTitle); + sinfo.dwX = lpStartupInfo->dwX; + sinfo.dwY = lpStartupInfo->dwY; + sinfo.dwXSize = lpStartupInfo->dwXSize; + sinfo.dwYSize = lpStartupInfo->dwYSize; + sinfo.dwXCountChars = lpStartupInfo->dwXCountChars; + sinfo.dwYCountChars = lpStartupInfo->dwYCountChars; + sinfo.dwFillAttribute = lpStartupInfo->dwFillAttribute; + sinfo.dwFlags = lpStartupInfo->dwFlags; + sinfo.wShowWindow = lpStartupInfo->wShowWindow; + sinfo.cbReserved2 = lpStartupInfo->cbReserved2; + sinfo.lpReserved2 = lpStartupInfo->lpReserved2; + sinfo.hStdInput = lpStartupInfo->hStdInput; + sinfo.hStdOutput = lpStartupInfo->hStdOutput; + sinfo.hStdError = lpStartupInfo->hStdError; + ret = CreateProcessAsUserW(hToken, appW, cmdlnW, lpProcessAttributes, + lpThreadAttributes, bInheritHandles, dwCreationFlags, + lpEnvironment, cwdW, &sinfo, lpProcessInformation); + HeapFree(GetProcessHeap(), 0, appW); + HeapFree(GetProcessHeap(), 0, cmdlnW); + HeapFree(GetProcessHeap(), 0, cwdW); + HeapFree(GetProcessHeap(), 0, sinfo.lpReserved); + HeapFree(GetProcessHeap(), 0, sinfo.lpDesktop); + HeapFree(GetProcessHeap(), 0, sinfo.lpTitle); + + return ret; } BOOL WINAPI CreateProcessAsUserW(

1 0

Andrew Eikum : advapi32: Consolidate helper function.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: ac615a7e9ac3cf00e90f0fb5d30a1a7f4c2ec590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac615a7e9ac3cf00e90f0fb5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 13 15:54:37 2012 -0500 advapi32: Consolidate helper function. --- dlls/advapi32/advapi32_misc.h | 3 + dlls/advapi32/eventlog.c | 15 +---- dlls/advapi32/lsa.c | 1 - dlls/advapi32/security.c | 130 +++++++--------------------------------- dlls/advapi32/service.c | 4 +- 5 files changed, 31 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac615a7e9ac3cf00e90f0…

1 0

Rico Schüller : d3dx9: Move transpose matrix into get_matrix().
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 8fb16c955bfdc0319ff6f0adfda44757c6bcc618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb16c955bfdc0319ff6f0adf… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:25 2012 +0200 d3dx9: Move transpose matrix into get_matrix(). --- dlls/d3dx9_36/effect.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a70128..6558a48 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -870,7 +870,7 @@ static void set_vector(struct d3dx_parameter *param, CONST D3DXVECTOR4 *vector) } } -static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) +static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix, BOOL transpose) { UINT i, k; @@ -878,10 +878,12 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) { for (k = 0; k < 4; ++k) { + FLOAT *tmp = transpose ? (FLOAT *)&matrix->u.m[k][i] : (FLOAT *)&matrix->u.m[i][k]; + if ((i < param->rows) && (k < param->columns)) - set_number((FLOAT *)&matrix->u.m[i][k], D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); + set_number(tmp, D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); else - matrix->u.m[i][k] = 0.0f; + *tmp = 0.0f; } } } @@ -2213,7 +2215,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DX switch (param->class) { case D3DXPC_MATRIX_ROWS: - get_matrix(param, matrix); + get_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_SCALAR: @@ -2292,7 +2294,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], FALSE); } return D3D_OK; @@ -2369,7 +2371,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], FALSE); } return D3D_OK; @@ -2427,7 +2429,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); @@ -2439,12 +2440,11 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if { case D3DXPC_SCALAR: case D3DXPC_VECTOR: - get_matrix(param, matrix); + get_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_MATRIX_ROWS: - get_matrix(param, &m); - D3DXMatrixTranspose(matrix, &m); + get_matrix(param, matrix, TRUE); return D3D_OK; case D3DXPC_OBJECT: @@ -2521,10 +2521,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffec case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - D3DXMATRIX m; - - get_matrix(get_parameter_struct(param->member_handles[i]), &m); - D3DXMatrixTranspose(&matrix[i], &m); + get_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], TRUE); } return D3D_OK; @@ -2593,7 +2590,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBa if (matrix && param && count <= param->element_count) { UINT i; - D3DXMATRIX m; TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); @@ -2602,8 +2598,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBa case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - get_matrix(get_parameter_struct(param->member_handles[i]), &m); - D3DXMatrixTranspose(matrix[i], &m); + get_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], TRUE); } return D3D_OK;

1 0

Rico Schüller : d3dx9: Move transpose matrix into set_matrix().
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 5b06a2d113bb096bdf1d04bb06f184b115ef7dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b06a2d113bb096bdf1d04bb0… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:20 2012 +0200 d3dx9: Move transpose matrix into set_matrix(). --- dlls/d3dx9_36/effect.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a063358..0a70128 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -886,7 +886,7 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) } } -static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) +static void set_matrix(struct d3dx_parameter *param, const D3DXMATRIX *matrix, BOOL transpose) { UINT i, k; @@ -894,7 +894,8 @@ static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) { for (k = 0; k < param->columns; ++k) { - set_number((FLOAT *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + set_number((FLOAT *)param->data + i * param->columns + k, param->type, + transpose ? &matrix->u.m[k][i] : &matrix->u.m[i][k], D3DXPT_FLOAT); } } } @@ -2178,7 +2179,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DX switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, matrix); + set_matrix(param, matrix, FALSE); return D3D_OK; case D3DXPC_SCALAR: @@ -2250,7 +2251,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], FALSE); } return D3D_OK; @@ -2328,7 +2329,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], FALSE); } return D3D_OK; @@ -2392,7 +2393,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *if { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); @@ -2403,7 +2403,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *if switch (param->class) { case D3DXPC_MATRIX_ROWS: - set_matrix(param, D3DXMatrixTranspose(&m, matrix)); + set_matrix(param, matrix, TRUE); return D3D_OK; case D3DXPC_SCALAR: @@ -2466,7 +2466,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffec { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); @@ -2481,7 +2480,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(ID3DXBaseEffec case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, &matrix[i])); + set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i], TRUE); } return D3D_OK; @@ -2550,7 +2549,6 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBa { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - D3DXMATRIX m; TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); @@ -2563,7 +2561,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBa case D3DXPC_MATRIX_ROWS: for (i = 0; i < count; ++i) { - set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, matrix[i])); + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i], TRUE); } return D3D_OK;

1 0

Rico Schüller : d3dx9: Use set_number instead of get_bool/int/float.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 26914eb3377899002ca76e44f0f3aa8d031cc1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26914eb3377899002ca76e44f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 14 10:56:07 2012 +0200 d3dx9: Use set_number instead of get_bool/int/float. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 --- dlls/d3dx9_36/effect.c | 19 +++++++++++-------- dlls/d3dx9_36/util.c | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index c4cc69c..bd208f8 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -94,9 +94,6 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; -FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) DECLSPEC_HIDDEN; -BOOL get_bool(LPCVOID data) DECLSPEC_HIDDEN; void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; #endif /* __WINE_D3DX9_36_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a6dcd98..a063358 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -853,7 +853,10 @@ static void get_vector(struct d3dx_parameter *param, D3DXVECTOR4 *vector) for (i = 0; i < 4; ++i) { - ((FLOAT *)vector)[i] = i < param->columns ? get_float(param->type, (DWORD *)param->data + i) : 0.0f; + if (i < param->columns) + set_number((FLOAT *)vector + i, D3DXPT_FLOAT, (DWORD *)param->data + i, param->type); + else + ((FLOAT *)vector)[i] = 0.0f; } } @@ -876,7 +879,7 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - matrix->u.m[i][k] = get_float(param->type, (FLOAT *)param->data + i * param->columns + k); + set_number((FLOAT *)&matrix->u.m[i][k], D3DXPT_FLOAT, (DWORD *)param->data + i * param->columns + k, param->type); else matrix->u.m[i][k] = 0.0f; } @@ -1667,7 +1670,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHA if (b && param && !param->element_count && param->rows == 1 && param->columns == 1) { - *b = get_bool(param->data); + set_number(b, D3DXPT_BOOL, param->data, param->type); TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); return D3D_OK; } @@ -1733,7 +1736,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBoolArray(ID3DXBaseEffect *iface, D for (i = 0; i < size; ++i) { - b[i] = get_bool((DWORD *)param->data + i); + set_number(&b[i], D3DXPT_BOOL, (DWORD *)param->data + i, param->type); } return D3D_OK; } @@ -1794,7 +1797,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHAN { if (param->columns == 1 && param->rows == 1) { - *n = get_int(param->type, param->data); + set_number(n, D3DXPT_INT, param->data, param->type); TRACE("Returning %i\n", *n); return D3D_OK; } @@ -1879,7 +1882,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetIntArray(ID3DXBaseEffect *iface, D3 for (i = 0; i < size; ++i) { - n[i] = get_int(param->type, (DWORD *)param->data + i); + set_number(&n[i], D3DXPT_INT, (DWORD *)param->data + i, param->type); } return D3D_OK; } @@ -1916,7 +1919,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloat(ID3DXBaseEffect *iface, D3DXH if (f && param && !param->element_count && param->columns == 1 && param->rows == 1) { - *f = get_float(param->type, (DWORD *)param->data); + set_number(f, D3DXPT_FLOAT, (DWORD *)param->data, param->type); TRACE("Returning %f\n", *f); return D3D_OK; } @@ -1981,7 +1984,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloatArray(ID3DXBaseEffect *iface, for (i = 0; i < size; ++i) { - f[i] = get_float(param->type, (DWORD *)param->data + i); + set_number(&f[i], D3DXPT_FLOAT, (DWORD *)param->data + i, param->type); } return D3D_OK; } diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index c5160fa..b4cdefe 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -271,12 +271,12 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR /* parameter type conversion helpers */ -BOOL get_bool(LPCVOID data) +static BOOL get_bool(LPCVOID data) { return (*(DWORD *)data) != 0; } -INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +static INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) { INT i; @@ -303,7 +303,7 @@ INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) return i; } -FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) +static FLOAT get_float(D3DXPARAMETER_TYPE type, LPCVOID data) { FLOAT f;

1 0

Alistair Leslie-Hughes : include: Add msdasc.idl.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: ef003f0fa080e259baf90125e8f063dd0c750eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef003f0fa080e259baf90125e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 14 08:55:59 2012 +1000 include: Add msdasc.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/msdasc.idl | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 93d649a..6baea7d 100644 --- a/.gitignore +++ b/.gitignore @@ -199,6 +199,7 @@ include/mmstream.h include/mscoree.h include/msctf.h include/msdadc.h +include/msdasc.h include/mshtmhst.h include/mshtml.h include/msident.h diff --git a/include/Makefile.in b/include/Makefile.in index 5bc1d1c..37f2c62 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -59,6 +59,7 @@ PUBLIC_IDL_H_SRCS = \ mscoree.idl \ msctf.idl \ msdadc.idl \ + msdasc.idl \ mshtmhst.idl \ mshtml.idl \ msident.idl \ diff --git a/include/msdasc.idl b/include/msdasc.idl new file mode 100644 index 0000000..1033516 --- /dev/null +++ b/include/msdasc.idl @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "oledb.idl"; + +#if !defined(progid) && !defined(__WIDL__) +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + +[ + uuid(2206CEB0-19C1-11D1-89E0-00C04FD7A829), + version(1.0) +] +library MSDASC +{ + importlib("stdole2.tlb"); + + [ + uuid(2206CCB1-19C1-11D1-89E0-00C04FD7A829), + ] + interface IDataInitialize : IUnknown + { + HRESULT GetDataSource([in] IUnknown* pUnkOuter, [in] DWORD dwClsCtx, + [in] LPWSTR pwszInitializationString, [in] REFIID riid, + [in, out] IUnknown** ppDataSource); + + HRESULT GetInitializationString([in] IUnknown* pDataSource, [in] boolean fIncludePassword, + [out] LPWSTR* ppwszInitString); + + HRESULT CreateDBInstance([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, + [in] REFIID riid, [out] IUnknown** ppDataSource); + + HRESULT RemoteCreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, + [in] DWORD cmq, [in] GUID** rgpIID, [out] IUnknown** rgpItf, + [out] HRESULT* rghr); + + HRESULT LoadStringFromStorage([in] LPWSTR pwszFileName, [out] LPWSTR* ppwszInitializationString); + + HRESULT WriteStringToStorage([in] LPWSTR pwszFileName, [in] LPWSTR pwszInitializationString, + [in] DWORD dwCreationDisposition); + } + + [ + uuid(2206CDB0-19C1-11D1-89E0-00C04FD7A829), + progid("MSDASC.MSDAINITIALIZE.1"), + vi_progid("MSDASC.MSDAINITIALIZE.1"), + ] + coclass MSDAINITIALIZE + { + [default] interface IDataInitialize; + } +}

1 0

Thomas Faber : msxml3: Do not directly write to resource section.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: c9d389c311b9177ac1838faed9d3935d67c50a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d389c311b9177ac1838faed… Author: Thomas Faber <thfabba(a)gmx.de> Date: Fri Sep 14 09:03:39 2012 +0200 msxml3: Do not directly write to resource section. --- dlls/msxml3/schema.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2f31016..5d971f9 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -68,7 +68,7 @@ static const xmlChar XDR_schema[] = "Schema"; static const xmlChar XDR_nsURI[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; -static xmlChar const* datatypes_src; +static xmlChar * datatypes_src; static int datatypes_len; static HGLOBAL datatypes_handle; static HRSRC datatypes_rsrc; @@ -728,7 +728,6 @@ static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, void schemasInit(void) { - int len; xmlChar* buf; if (!(datatypes_rsrc = FindResourceA(MSXML_hInstance, "DATATYPES", "XML"))) { @@ -742,14 +741,14 @@ void schemasInit(void) return; } buf = LockResource(datatypes_handle); - len = SizeofResource(MSXML_hInstance, datatypes_rsrc) - 1; + datatypes_len = SizeofResource(MSXML_hInstance, datatypes_rsrc); /* Resource is loaded as raw data, * need a null-terminated string */ - while (buf[len] != '>') - buf[len--] = 0; - datatypes_src = buf; - datatypes_len = len + 1; + while (buf[datatypes_len - 1] != '>') datatypes_len--; + datatypes_src = HeapAlloc(GetProcessHeap(), 0, datatypes_len + 1); + memcpy(datatypes_src, buf, datatypes_len); + datatypes_src[datatypes_len] = 0; if (xmlGetExternalEntityLoader() != external_entity_loader) { @@ -761,6 +760,7 @@ void schemasInit(void) void schemasCleanup(void) { xmlSchemaFree(datatypes_schema); + HeapFree(GetProcessHeap(), 0, datatypes_src); xmlSetExternalEntityLoader(_external_entity_loader); }

1 0

Dmitry Timoshkov : windowscodecs: Test GIF metadata using a specially created GIF image with a bunch of extensions .
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 6881ca771e2858cfb5f098100ab97ed6f41b1d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6881ca771e2858cfb5f098100… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:08:24 2012 +0900 windowscodecs: Test GIF metadata using a specially created GIF image with a bunch of extensions. --- dlls/windowscodecs/tests/metadata.c | 178 +++++++++++++++++++++++++++++++--- 1 files changed, 162 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6881ca771e2858cfb5f09…

1 0

Dmitry Timoshkov : windowscodecs: Fix calculation of GIF local color table size from decoder data.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: fd0cbf9ebee253fe0511771fe0be1836c6b1e285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0cbf9ebee253fe0511771fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:07:34 2012 +0900 windowscodecs: Fix calculation of GIF local color table size from decoder data. --- dlls/windowscodecs/gifformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4414f36..a814c1a 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -707,7 +707,7 @@ static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataRead /* local_color_table_flag */ IMD_data.packed |= 1 << 7; /* local_color_table_size */ - IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel; + IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel - 1; /* FIXME: sort_flag */ }

1 0

Dmitry Timoshkov : windowscodecs: Add a bunch of tests for GIF Comment Extenstion metadata reader.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 8ec1008fc7bcb73065a0818edc334c5eb8866a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec1008fc7bcb73065a0818ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 14 15:06:42 2012 +0900 windowscodecs: Add a bunch of tests for GIF Comment Extenstion metadata reader. --- dlls/windowscodecs/tests/metadata.c | 72 +++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 3 + 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 45ff717..684def8 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1558,6 +1558,77 @@ todo_wine IStream_Release(stream); } +static void test_metadata_GIF_comment(void) +{ + static const WCHAR GIF_comment_name[] = {'C','o','m','m','e','n','t',' ','E','x','t','e','n','s','i','o','n',' ','R','e','a','d','e','r',0}; + static const char GIF_comment_data[] = { 0x21,0xfe, + /*sub-block*/5,'H','e','l','l','o', + /*sub-block*/1,' ', + /*sub-block*/6,'W','o','r','l','d','!', + /*terminator*/0 }; + static const struct test_data td[1] = + { + { VT_LPSTR, 0, 12, { 0 }, "Hello World!", { 'T','e','x','t','E','n','t','r','y',0 } } + }; + HRESULT hr; + IStream *stream; + IWICPersistStream *persist; + IWICMetadataReader *reader; + IWICMetadataHandlerInfo *info; + WCHAR name[64]; + UINT count, dummy; + GUID format; + CLSID id; + + hr = CoCreateInstance(&CLSID_WICGifCommentMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); +todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE || hr == REGDB_E_CLASSNOTREG) /* before Win7 */, + "CoCreateInstance error %#x\n", hr); + + stream = create_stream(GIF_comment_data, sizeof(GIF_comment_data)); + + if (SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IWICPersistStream_Load(persist, stream); + ok(hr == S_OK, "Load error %#x\n", hr); + + IWICPersistStream_Release(persist); + } + + if (SUCCEEDED(hr)) + { + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + + compare_metadata(reader, td, count); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatGifComment), "wrong format %s\n", debugstr_guid(&format)); + + hr = IWICMetadataReader_GetMetadataHandlerInfo(reader, &info); + ok(hr == S_OK, "GetMetadataHandlerInfo error %#x\n", hr); + + hr = IWICMetadataHandlerInfo_GetCLSID(info, &id); + ok(hr == S_OK, "GetCLSID error %#x\n", hr); + ok(IsEqualGUID(&id, &CLSID_WICGifCommentMetadataReader), "wrong CLSID %s\n", debugstr_guid(&id)); + + hr = IWICMetadataHandlerInfo_GetFriendlyName(info, 64, name, &dummy); + ok(hr == S_OK, "GetFriendlyName error %#x\n", hr); + ok(lstrcmpW(name, GIF_comment_name) == 0, "wrong APE reader name %s\n", wine_dbgstr_w(name)); + + IWICMetadataHandlerInfo_Release(info); + IWICMetadataReader_Release(reader); + } + + IStream_Release(stream); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1573,6 +1644,7 @@ START_TEST(metadata) test_metadata_IMD(); test_metadata_GCE(); test_metadata_APE(); + test_metadata_GIF_comment(); CoUninitialize(); } diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 31333c5..e43f864 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -47,6 +47,7 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatIMD, 0xbd2bb086,0x4d52,0x48dd,0x96,0x7 cpp_quote("DEFINE_GUID(GUID_MetadataFormatLSD, 0xe256031e,0x6299,0x4929,0xb9,0x8d,0x5a,0xc8,0x84,0xaf,0xba,0x92);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatGCE, 0x2a25cad8,0xdeeb,0x4c69,0xa7,0x88,0x0e,0xc2,0x26,0x6d,0xca,0xfd);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatAPE, 0x2e043dc2,0xc967,0x4e05,0x87,0x5e,0x61,0x8b,0xf6,0x7e,0x85,0xc3);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatGifComment, 0xc4b6e0e0,0xcfb4,0x4ad3,0xab,0x33,0x9a,0xad,0x23,0x55,0xa3,0x4a);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") @@ -66,6 +67,8 @@ cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataReader, 0xb92e345d,0xf52d,0x41f3,0xb5 cpp_quote("DEFINE_GUID(CLSID_WICGCEMetadataWriter, 0xaf95dc76,0x16b2,0x47f4,0xb3,0xea,0x3c,0x31,0x79,0x66,0x93,0xe7);") cpp_quote("DEFINE_GUID(CLSID_WICAPEMetadataReader, 0x1767b93a,0xb021,0x44ea,0x92,0x0f,0x86,0x3c,0x11,0xf4,0xf7,0x68);") cpp_quote("DEFINE_GUID(CLSID_WICAPEMetadataWriter, 0xbd6edfca,0x2890,0x482f,0xb2,0x33,0x8d,0x73,0x39,0xa1,0xcf,0x8d);") +cpp_quote("DEFINE_GUID(CLSID_WICGifCommentMetadataReader, 0x32557d3b,0x69dc,0x4f95,0x83,0x6e,0xf5,0x97,0x2b,0x2f,0x61,0x59);") +cpp_quote("DEFINE_GUID(CLSID_WICGifCommentMetadataWriter, 0xa02797fc,0xc4ae,0x418c,0xaf,0x95,0xe6,0x37,0xc7,0xea,0xd2,0xa1);") typedef struct WICMetadataPattern { ULARGE_INTEGER Position;

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
83
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 September 2012