January 2012 - Wine-commits

Alexandre Julliard : advapi32: Fix the TraceMessage prototypes.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: b5314f50ed3ac7ce1b5de5492c9d428503246b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5314f50ed3ac7ce1b5de5492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 11:10:21 2012 +0100 advapi32: Fix the TraceMessage prototypes. --- dlls/advapi32/eventlog.c | 26 +++++++++++++++++--------- include/evntrace.h | 2 ++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index cfad001..0b6634b 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -885,18 +885,26 @@ ULONG WINAPI ProcessTrace( PTRACEHANDLE HandleArray, ULONG HandleCount, LPFILETI return ERROR_CALL_NOT_IMPLEMENTED; } -ULONG TraceMessage( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid, - USHORT MessageNumber, ...) +/****************************************************************************** + * TraceMessage [ADVAPI32.@] + */ +ULONG WINAPIV TraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, ... ) { - FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags, - debugstr_guid(MessageGuid), MessageNumber); - return ERROR_SUCCESS; + __ms_va_list valist; + ULONG ret; + + __ms_va_start( valist, number ); + ret = TraceMessageVa( handle, flags, guid, number, valist ); + __ms_va_end( valist ); + return ret; } -ULONG TraceMessageVa( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid, - USHORT MessageNumber, __ms_va_list args) +/****************************************************************************** + * TraceMessageVa [ADVAPI32.@] + */ +ULONG WINAPI TraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHORT number, + __ms_va_list args ) { - FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags, - debugstr_guid(MessageGuid), MessageNumber); + FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number); return ERROR_SUCCESS; } diff --git a/include/evntrace.h b/include/evntrace.h index 4cacc84..e0c3f21 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -222,6 +222,8 @@ ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define StartTrace WINELIB_NAME_AW(StartTrace) ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +ULONG WINAPIV TraceMessage(TRACEHANDLE,ULONG,LPGUID,USHORT,...); +ULONG WINAPI TraceMessageVa(TRACEHANDLE,ULONG,LPGUID,USHORT,__ms_va_list); ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE); #ifdef __cplusplus

1 0

Alexandre Julliard : winex11: Check for failure to convert the brush bitmap to X11.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 8eb9ab531f5de0a8f2a31980e37e205307807e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb9ab531f5de0a8f2a31980e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 11:10:38 2012 +0100 winex11: Check for failure to convert the brush bitmap to X11. --- dlls/winex11.drv/brush.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 216c142..ea41f8a 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -269,6 +269,11 @@ HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const struct brush_pattern memdc = CreateCompatibleDC( physDev->dev.hdc ); SelectObject( memdc, bitmap ); DeleteDC( memdc ); + if (!X11DRV_get_phys_bitmap( bitmap )) + { + DeleteObject( bitmap ); + return 0; + } SetDIBits( physDev->dev.hdc, bitmap, 0, abs(info->bmiHeader.biHeight), pattern->bits.ptr, info, pattern->usage );

1 0

Austin English : advapi32: Add a stub for CloseTrace.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: ce233a46e066c2433c6e9cf7b345b6982b7b3dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce233a46e066c2433c6e9cf7b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 26 14:35:08 2012 -0800 advapi32: Add a stub for CloseTrace. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 29e8a20..89e628e 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -61,7 +61,7 @@ # @ stub CloseEncryptedFileRaw @ stdcall CloseEventLog (long) @ stdcall CloseServiceHandle(long) -# @ stub CloseTrace +@ stdcall CloseTrace(int64) @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) # @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 0b6634b..8e1a9da 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -908,3 +908,12 @@ ULONG WINAPI TraceMessageVa( TRACEHANDLE handle, ULONG flags, LPGUID guid, USHOR FIXME("(%s %x %s %d) : stub\n", wine_dbgstr_longlong(handle), flags, debugstr_guid(guid), number); return ERROR_SUCCESS; } + +/****************************************************************************** + * CloseTrace [ADVAPI32.@] + */ +ULONG WINAPI CloseTrace( TRACEHANDLE handle ) +{ + FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); + return ERROR_INVALID_HANDLE; +}

1 0

Austin English : advapi32: Add a stub for EnumerateTraceGuids.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 5930590ed220345695cb5111de536fa87192793e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5930590ed220345695cb5111d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 26 14:35:25 2012 -0800 advapi32: Add a stub for EnumerateTraceGuids. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ include/evntrace.h | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 89e628e..68a5384 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -214,7 +214,7 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) -# @ stub EnumerateTraceGuids +@ stdcall EnumerateTraceGuids(ptr long ptr) # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 8e1a9da..8ec5cd2 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -917,3 +917,13 @@ ULONG WINAPI CloseTrace( TRACEHANDLE handle ) FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); return ERROR_INVALID_HANDLE; } + +/****************************************************************************** + * EnumerateTraceGuids [ADVAPI32.@] + */ +ULONG WINAPI EnumerateTraceGuids(PTRACE_GUID_PROPERTIES *propertiesarray, + ULONG arraycount, PULONG guidcount) +{ + FIXME("%p %d %p: stub\n", propertiesarray, arraycount, guidcount); + return ERROR_INVALID_PARAMETER; +} diff --git a/include/evntrace.h b/include/evntrace.h index e0c3f21..1516485 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -49,6 +49,15 @@ typedef struct _TRACE_GUID_REGISTRATION HANDLE RegHandle; } TRACE_GUID_REGISTRATION, *PTRACE_GUID_REGISTRATION; +typedef struct _TRACE_GUID_PROPERTIES { + GUID Guid; + ULONG GuidType; + ULONG LoggerId; + ULONG EnableLevel; + ULONG EnableFlags; + BOOLEAN IsEnable; +} TRACE_GUID_PROPERTIES, *PTRACE_GUID_PROPERTIES; + typedef struct _EVENT_TRACE_HEADER { USHORT Size;

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTranspose() test.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 0ae7c573b1529b1b6a7929319f4af6e19348d263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae7c573b1529b1b6a7929319… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:38 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixTranspose() test. --- dlls/d3dx9_36/tests/effect.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 31edcb6..5ff41a2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1972,6 +1972,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrixTranspose */ + fvalue = 1.33; + for (l = 0; l < 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixTranspose(effect, parameter, (D3DXMATRIX *)input_value); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns, res_desc->Type, + input_value + l * 4 + m, D3DXPT_FLOAT); + } + + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTransposeArray() test.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: cf512fdf13ab596aa29105576160e7633cb6fe17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf512fdf13ab596aa29105576… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:43 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixTransposeArray() test. --- dlls/d3dx9_36/tests/effect.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5ff41a2..d0f2f00 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2005,6 +2005,47 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetMatrixTransposeArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)input_value, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) + { + UINT n; + + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l * 4 + m + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposeArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add invalid parameter test for ID3DXEffect.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 49ebbd023058ad5e502fc6d8872bc24cbe4643c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ebbd023058ad5e502fc6d88… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 27 10:31:49 2012 +0100 d3dx9/tests: Add invalid parameter test for ID3DXEffect. --- dlls/d3dx9_36/tests/effect.c | 156 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49ebbd023058ad5e502fc…

1 0

Olli-Pekka Wallin : winscard: Add new stub methods.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: e8e45b3454de40681c00a00225fda706e55a19ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e45b3454de40681c00a0022… Author: Olli-Pekka Wallin <extolli-pekka.wallin(a)ixonos.com> Date: Wed Jan 25 09:44:00 2012 +0200 winscard: Add new stub methods. --- dlls/winscard/winscard.c | 14 ++++++++++++++ dlls/winscard/winscard.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 412299c..473d5f3 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -116,6 +116,20 @@ LONG WINAPI SCardReleaseContext(SCARDCONTEXT context) return SCARD_F_INTERNAL_ERROR; } +LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + +LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} + void WINAPI SCardReleaseStartedEvent(void) { FIXME("stub\n"); diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 1bd6ef1..8ecf988 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -55,8 +55,8 @@ @ stub SCardSetCardTypeProviderNameA @ stub SCardSetCardTypeProviderNameW @ stub SCardState -@ stub SCardStatusA -@ stub SCardStatusW +@ stdcall SCardStatusA (long str long long long ptr long ) +@ stdcall SCardStatusW (long wstr long long long ptr long ) @ stub SCardTransmit @ extern g_rgSCardRawPci @ extern g_rgSCardT0Pci

1 0

Jacek Caban : wscript: Properly handle CreateProcess failure.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 9f7da94a3d02a82ff61e0c134f428857ebaa467f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f7da94a3d02a82ff61e0c134… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:43:02 2012 +0100 wscript: Properly handle CreateProcess failure. --- programs/wscript/tests/run.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 163be22..315f51f 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -34,8 +34,8 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE #define CHECK_EXPECT2(func) \ do { \ @@ -355,7 +355,7 @@ static void run_test(const char *file_name) bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); if(!bres) { win_skip("script.exe is not available\n"); - SET_CALLED(reportSuccess); + CLEAR_CALLED(reportSuccess); return; }

1 0

Jacek Caban : vbscript: Get rid of unused SET_CALLED macro.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 613c276ca3e37d195caa70565ee6acb10111ba93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613c276ca3e37d195caa70565… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 11:43:12 2012 +0100 vbscript: Get rid of unused SET_CALLED macro. --- dlls/vbscript/tests/createobj.c | 3 --- dlls/vbscript/tests/run.c | 3 --- dlls/vbscript/tests/vbscript.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index b869d07..bbf53ee 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -38,9 +38,6 @@ extern const CLSID CLSID_VBScript; #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9fa4240..43c9be4 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -35,9 +35,6 @@ extern const CLSID CLSID_VBScript; #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 431f815..d4c4ec5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -35,9 +35,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define SET_CALLED(func) \ - called_ ## func = TRUE - #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \

1 0