wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Frédéric Delanoy : cmd: Make PAUSE accept any keypress instead of a full input line.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: e0ec3e400df12f682bf279e3588d7656a7298c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ec3e400df12f682bf279e35… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 7 01:02:08 2011 +0200 cmd: Make PAUSE accept any keypress instead of a full input line. --- po/ar.po | 83 +++++++++++++++++++++-------------------- po/bg.po | 83 +++++++++++++++++++++-------------------- po/ca.po | 83 +++++++++++++++++++++-------------------- po/cs.po | 83 +++++++++++++++++++++-------------------- po/da.po | 85 ++++++++++++++++++++++-------------------- po/de.po | 85 ++++++++++++++++++++++-------------------- po/el.po | 83 +++++++++++++++++++++-------------------- po/en.po | 94 ++++++++++++++++++++++++----------------------- po/en_US.po | 94 ++++++++++++++++++++++++----------------------- po/eo.po | 83 +++++++++++++++++++++-------------------- po/es.po | 85 ++++++++++++++++++++++-------------------- po/fa.po | 83 +++++++++++++++++++++-------------------- po/fi.po | 83 +++++++++++++++++++++-------------------- po/fr.po | 85 ++++++++++++++++++++++-------------------- po/he.po | 85 ++++++++++++++++++++++-------------------- po/hi.po | 83 +++++++++++++++++++++-------------------- po/hu.po | 83 +++++++++++++++++++++-------------------- po/it.po | 85 ++++++++++++++++++++++-------------------- po/ja.po | 85 ++++++++++++++++++++++-------------------- po/ko.po | 85 ++++++++++++++++++++++-------------------- po/lt.po | 85 ++++++++++++++++++++++-------------------- po/ml.po | 83 +++++++++++++++++++++-------------------- po/nb_NO.po | 84 +++++++++++++++++++++-------------------- po/nl.po | 85 ++++++++++++++++++++++-------------------- po/or.po | 83 +++++++++++++++++++++-------------------- po/pa.po | 83 +++++++++++++++++++++-------------------- po/pl.po | 85 ++++++++++++++++++++++-------------------- po/pt_BR.po | 85 ++++++++++++++++++++++-------------------- po/pt_PT.po | 84 +++++++++++++++++++++-------------------- po/rm.po | 83 +++++++++++++++++++++-------------------- po/ro.po | 85 ++++++++++++++++++++++-------------------- po/ru.po | 85 ++++++++++++++++++++++-------------------- po/sk.po | 83 +++++++++++++++++++++-------------------- po/sl.po | 85 ++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 83 +++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 83 +++++++++++++++++++++-------------------- po/sv.po | 85 ++++++++++++++++++++++-------------------- po/te.po | 83 +++++++++++++++++++++-------------------- po/th.po | 83 +++++++++++++++++++++-------------------- po/tr.po | 84 +++++++++++++++++++++-------------------- po/uk.po | 85 ++++++++++++++++++++++-------------------- po/wa.po | 83 +++++++++++++++++++++-------------------- po/wine.pot | 83 +++++++++++++++++++++-------------------- po/zh_CN.po | 83 +++++++++++++++++++++-------------------- po/zh_TW.po | 83 +++++++++++++++++++++-------------------- programs/cmd/builtins.c | 21 +++++++--- programs/cmd/cmd.rc | 11 +++-- 47 files changed, 1960 insertions(+), 1866 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0ec3e400df12f682bf27…

1 0

Frédéric Delanoy : cmd: Consistently use infinitive forms in commands help summary.
by Alexandre Julliard 08 Oct '11

08 Oct '11

1 0

Andrew Talbot : msvcrt: Mark some fall-throughs in a switch statement.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 2df8dced843abde1f7e220b84f99f1725adc3e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df8dced843abde1f7e220b84… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Oct 7 21:24:51 2011 +0100 msvcrt: Mark some fall-throughs in a switch statement. --- dlls/msvcrt/locale.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b329dbc..d83f8db 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1151,6 +1151,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) if(category != MSVCRT_LC_ALL) break; + /* fall through */ case MSVCRT_LC_CTYPE: locinfo->lc_handle[MSVCRT_LC_CTYPE] = loc->locinfo->lc_handle[MSVCRT_LC_CTYPE]; @@ -1175,6 +1176,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) if(category != MSVCRT_LC_ALL) break; + /* fall through */ case MSVCRT_LC_MONETARY: locinfo->lc_handle[MSVCRT_LC_MONETARY] = loc->locinfo->lc_handle[MSVCRT_LC_MONETARY]; @@ -1208,6 +1210,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) if(category != MSVCRT_LC_ALL) break; + /* fall through */ case MSVCRT_LC_NUMERIC: locinfo->lc_handle[MSVCRT_LC_NUMERIC] = loc->locinfo->lc_handle[MSVCRT_LC_NUMERIC]; @@ -1225,6 +1228,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) if(category != MSVCRT_LC_ALL) break; + /* fall through */ case MSVCRT_LC_TIME: locinfo->lc_handle[MSVCRT_LC_TIME] = loc->locinfo->lc_handle[MSVCRT_LC_TIME];

1 0

Hans Leidekker : mspatcha: Add a stub implementation of GetFilePatchSignatureA/W.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: bf4456df60cc417e8902a110aedb07027eb2b9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4456df60cc417e8902a110a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 7 11:07:11 2011 +0200 mspatcha: Add a stub implementation of GetFilePatchSignatureA/W. --- dlls/mspatcha/mspatcha.spec | 4 ++-- dlls/mspatcha/mspatcha_main.c | 28 +++++++++++++++++++++++++++- include/patchapi.h | 13 +++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec index 40feedf..cc8ca94 100644 --- a/dlls/mspatcha/mspatcha.spec +++ b/dlls/mspatcha/mspatcha.spec @@ -4,9 +4,9 @@ 4 stub ApplyPatchToFileExA 5 stub ApplyPatchToFileExW 6 stdcall ApplyPatchToFileW(wstr wstr wstr long) -7 stub GetFilePatchSignatureA +7 stdcall GetFilePatchSignatureA(str long ptr long ptr long ptr long ptr) 8 stub GetFilePatchSignatureByHandle -9 stub GetFilePatchSignatureW +9 stdcall GetFilePatchSignatureW(wstr long ptr long ptr long ptr long ptr) 10 stub TestApplyPatchToFileA 11 stub TestApplyPatchToFileByHandles 12 stub TestApplyPatchToFileW diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index ed763c9..fcce619 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -64,7 +64,7 @@ static inline WCHAR *strdupAW( const char *src ) } /***************************************************** - * ApplyPatchToFileA (MSPATCHA.6) + * ApplyPatchToFileA (MSPATCHA.1) */ BOOL WINAPI ApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_file, ULONG apply_flags) { @@ -101,3 +101,29 @@ BOOL WINAPI ApplyPatchToFileW(LPCWSTR patch_file, LPCWSTR old_file, LPCWSTR new_ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/***************************************************** + * GetFilePatchSignatureA (MSPATCHA.7) + */ +BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureW (MSPATCHA.9) + */ +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/patchapi.h b/include/patchapi.h index 44a4a15..9a62a0f 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -28,6 +28,19 @@ extern "C" { #define APPLY_OPTION_TEST_ONLY 0x00000004 #define APPLY_OPTION_VALID_FLAGS 0x00000007 +typedef struct _PATCH_IGNORE_RANGE +{ + ULONG OffsetInOldFile; + ULONG LengthInBytes; +} PATCH_IGNORE_RANGE, *PPATCH_IGNORE_RANGE; + +typedef struct _PATCH_RETAIN_RANGE +{ + ULONG OffsetInOldFile; + ULONG LengthInBytes; + ULONG OffsetInNewFile; +} PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; + BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile)

1 0

Michael Stefaniuc : dsound: COM cleanup for the IDirectSoundCapture iface.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: f0a3a09d0e4d67818290c17f23d48529b2784c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a3a09d0e4d67818290c17f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 13:28:54 2011 +0200 dsound: COM cleanup for the IDirectSoundCapture iface. --- dlls/dsound/capture.c | 90 ++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 50 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 61a8228..77dffe6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1065,24 +1065,23 @@ static HRESULT DirectSoundCaptureDevice_Initialize( */ struct IDirectSoundCaptureImpl { - /* IUnknown fields */ - const IDirectSoundCaptureVtbl *lpVtbl; - LONG ref; - - DirectSoundCaptureDevice *device; + IDirectSoundCapture IDirectSoundCapture_iface; + LONG ref; + DirectSoundCaptureDevice *device; }; +static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) +{ + return CONTAINING_RECORD(iface, struct IDirectSoundCaptureImpl, IDirectSoundCapture_iface); +} + /*************************************************************************** * IDirectSoundCaptureImpl */ -static HRESULT WINAPI -IDirectSoundCaptureImpl_QueryInterface( - LPDIRECTSOUNDCAPTURE iface, - REFIID riid, - LPVOID* ppobj ) +static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture *iface, + REFIID riid, void **ppobj) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; - TRACE( "(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj ); + TRACE( "(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj ); if (ppobj == NULL) { WARN("invalid parameter\n"); @@ -1091,34 +1090,30 @@ IDirectSoundCaptureImpl_QueryInterface( *ppobj = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) { - IDirectSoundCapture_AddRef((LPDIRECTSOUNDCAPTURE)This); - *ppobj = This; - return DS_OK; - } else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { - IDirectSoundCapture_AddRef((LPDIRECTSOUNDCAPTURE)This); - *ppobj = This; - return DS_OK; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectSoundCapture)) { + IDirectSoundCapture_AddRef(iface); + *ppobj = iface; + return S_OK; } WARN("unsupported riid: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } -static ULONG WINAPI -IDirectSoundCaptureImpl_AddRef( LPDIRECTSOUNDCAPTURE iface ) +static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedIncrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref - 1); return ref; } -static ULONG WINAPI -IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) +static ULONG WINAPI IDirectSoundCaptureImpl_Release(IDirectSoundCapture *iface) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { @@ -1131,14 +1126,12 @@ IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) return ref; } -static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( - LPDIRECTSOUNDCAPTURE iface, - LPCDSCBUFFERDESC lpcDSCBufferDesc, - LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, - LPUNKNOWN pUnk ) +static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCapture *iface, + LPCDSCBUFFERDESC lpcDSCBufferDesc, IDirectSoundCaptureBuffer **lplpDSCaptureBuffer, + IUnknown *pUnk) { + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); HRESULT hr; - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; TRACE( "(%p,%p,%p,%p)\n",iface,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); @@ -1172,11 +1165,11 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( return hr; } -static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( - LPDIRECTSOUNDCAPTURE iface, - LPDSCCAPS lpDSCCaps ) +static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps(IDirectSoundCapture *iface, + LPDSCCAPS lpDSCCaps) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); + TRACE("(%p,%p)\n",This,lpDSCCaps); if (This->device == NULL) { @@ -1204,11 +1197,11 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( return DS_OK; } -static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( - LPDIRECTSOUNDCAPTURE iface, - LPCGUID lpcGUID ) +static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize(IDirectSoundCapture *iface, + LPCGUID lpcGUID) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); + TRACE("(%p,%s)\n", This, debugstr_guid(lpcGUID)); if (This->device != NULL) { @@ -1245,7 +1238,7 @@ static HRESULT IDirectSoundCaptureImpl_Create( return DSERR_OUTOFMEMORY; } - pDSC->lpVtbl = &dscvt; + pDSC->IDirectSoundCapture_iface.lpVtbl = &dscvt; pDSC->ref = 0; pDSC->device = NULL; @@ -1254,11 +1247,9 @@ static HRESULT IDirectSoundCaptureImpl_Create( return DS_OK; } -HRESULT DSOUND_CaptureCreate( - REFIID riid, - LPDIRECTSOUNDCAPTURE *ppDSC) +HRESULT DSOUND_CaptureCreate(REFIID riid, IDirectSoundCapture **ppDSC) { - LPDIRECTSOUNDCAPTURE pDSC; + IDirectSoundCapture *pDSC; HRESULT hr; TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSC); @@ -1334,13 +1325,12 @@ HRESULT DSOUND_CaptureCreate8( * * DSERR_ALLOCATED is returned for sound devices that do not support full duplex. */ -HRESULT WINAPI DirectSoundCaptureCreate( - LPCGUID lpcGUID, - LPDIRECTSOUNDCAPTURE *ppDSC, - LPUNKNOWN pUnkOuter) +HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpcGUID, IDirectSoundCapture **ppDSC, + IUnknown *pUnkOuter) { HRESULT hr; - LPDIRECTSOUNDCAPTURE pDSC; + IDirectSoundCapture *pDSC; + TRACE("(%s,%p,%p)\n", debugstr_guid(lpcGUID), ppDSC, pUnkOuter); if (ppDSC == NULL) {

1 0

Michael Stefaniuc : quartz: Free two assert calls from having side effects.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: a948e5e4749b1ab12df5ff99a59d0d9d8d6a7c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a948e5e4749b1ab12df5ff99a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 13:26:51 2011 +0200 quartz: Free two assert calls from having side effects. --- dlls/quartz/mpegsplit.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 059a854..68348a3 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -182,7 +182,8 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) IMediaSample_GetPointer(pCurrentSample, &fbuf); /* Find the next valid header.. it <SHOULD> be right here */ - assert(parse_header(fbuf, &length, &This->position) == S_OK); + hr = parse_header(fbuf, &length, &This->position); + assert(hr == S_OK); IMediaSample_SetActualDataLength(pCurrentSample, length); /* Queue the next sample */ @@ -739,7 +740,9 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) IMediaSample *sample; TRACE("Seeking? %d\n", This->seek); - assert(parse_header(This->header, &length, NULL) == S_OK); + + hr = parse_header(This->header, &length, NULL); + assert(hr == S_OK); if (pin->rtCurrent >= pin->rtStop) {

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in winerror.h.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 0324fc57469f402102b677c4e3c2a06701965235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0324fc57469f402102b677c4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:44:03 2011 +0200 include: Remove 'l' modifier from numeric constants in winerror.h. --- include/winerror.h | 1766 ++++++++++++++++++++++++++-------------------------- 1 files changed, 883 insertions(+), 883 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0324fc57469f402102b67…

1 0

Michael Stefaniuc : oleaut32/tests: Cleanup the EXPECTRES macros.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 42ac8afe9a75432d9cfb56ee69cbd7a4cc854010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ac8afe9a75432d9cfb56ee6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:39:36 2011 +0200 oleaut32/tests: Cleanup the EXPECTRES macros. --- dlls/oleaut32/tests/vartype.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 354e159..1ceb436 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -82,8 +82,7 @@ static HMODULE hOleaut32; #define EXPECT_EQ _EXPECT_NO_OUT(VARCMP_EQ) #define _EXPECTRES(res, x, fs) \ - ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) + ok(hres == S_OK && out == (CONV_TYPE)(x), "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #define EXPECT(x) EXPECTRES(S_OK, (x)) #define EXPECT_DBL(x) \ ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) @@ -1151,8 +1150,6 @@ static void test_VarUI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE SHORT -#undef EXPECTRES -#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI2FromI1(void) { @@ -1644,9 +1641,6 @@ static void test_VarUI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG -#undef EXPECTRES -#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") - static void test_VarI4FromI1(void) { @@ -2135,10 +2129,6 @@ static void test_VarUI4ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG64 -#undef EXPECTRES -#define EXPECTRES(res, x) \ - ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected hres " #x ", got hres=0x%08x\n", hres) #define EXPECTI8(x) \ ok((hres == S_OK && out == (CONV_TYPE)(x)), \ @@ -2544,7 +2534,10 @@ static void test_VarUI8FromBool(void) int i; CHECKPTR(VarUI8FromBool); - CONVERTRANGE(VarUI8FromBool, -32768, 32768); + for (i = -32768; i < 32768; i++) + { + CONVERT(VarUI8FromBool, i); EXPECTI8(i); + } } static void test_VarUI8FromI8(void) @@ -2885,8 +2878,6 @@ static void test_VarR4ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE double -#undef EXPECTRES -#define EXPECTRES(res, x) _EXPECTRES(res, x, "%15.15f") static void test_VarR8FromI1(void) { @@ -3541,10 +3532,6 @@ static void test_VarDateChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE CY -#undef EXPECTRES -#define EXPECTRES(res, x) \ - ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected hres " #x ", got hres=0x%08x\n", hres) #define EXPECTCY(x) \ ok((hres == S_OK && out.int64 == (LONGLONG)(x*CY_MULTIPLIER)), \ @@ -4048,10 +4035,6 @@ static void test_VarCyInt(void) #undef CONV_TYPE #define CONV_TYPE DECIMAL -#undef EXPECTRES -#define EXPECTRES(res, x) \ - ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected hres " #x ", got hres=0x%08x\n", hres) #define EXPECTDEC(scl, sgn, hi, lo) ok(hres == S_OK && \ S(U(out)).scale == (BYTE)(scl) && S(U(out)).sign == (BYTE)(sgn) && \ @@ -4576,10 +4559,6 @@ static void test_VarDecCmp(void) #undef CONV_TYPE #define CONV_TYPE VARIANT_BOOL -#undef _EXPECTRES -#define _EXPECTRES(res, x, fs) \ - ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #undef EXPECTRES #define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") #undef CONVERTRANGE

1 0

Michael Stefaniuc : oleaut32/tests: Make the EXPECT_* macros that take no args more robust.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: ef0a5a30c5d826af7698ad569c88be586bff7335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0a5a30c5d826af7698ad569… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:38:20 2011 +0200 oleaut32/tests: Make the EXPECT_* macros that take no args more robust. --- dlls/oleaut32/tests/vartype.c | 68 ++++++++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e46a9b6..354e159 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -72,17 +72,19 @@ static HMODULE hOleaut32; /* Macros for converting and testing results */ #define CONVVARS(typ) HRESULT hres; CONV_TYPE out; typ in +#define _EXPECT_NO_OUT(res) ok(hres == res, "expected " #res ", got hres=0x%08x\n", hres) +#define EXPECT_OVERFLOW _EXPECT_NO_OUT(DISP_E_OVERFLOW) +#define EXPECT_MISMATCH _EXPECT_NO_OUT(DISP_E_TYPEMISMATCH) +#define EXPECT_BADVAR _EXPECT_NO_OUT(DISP_E_BADVARTYPE) +#define EXPECT_INVALID _EXPECT_NO_OUT(E_INVALIDARG) +#define EXPECT_LT _EXPECT_NO_OUT(VARCMP_LT) +#define EXPECT_GT _EXPECT_NO_OUT(VARCMP_GT) +#define EXPECT_EQ _EXPECT_NO_OUT(VARCMP_EQ) + #define _EXPECTRES(res, x, fs) \ ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #define EXPECT(x) EXPECTRES(S_OK, (x)) -#define EXPECT_OVERFLOW EXPECTRES(DISP_E_OVERFLOW, DISP_E_OVERFLOW) -#define EXPECT_MISMATCH EXPECTRES(DISP_E_TYPEMISMATCH,DISP_E_TYPEMISMATCH) -#define EXPECT_BADVAR EXPECTRES(DISP_E_BADVARTYPE, DISP_E_BADVARTYPE) -#define EXPECT_INVALID EXPECTRES(E_INVALIDARG, E_INVALIDARG) -#define EXPECT_LT EXPECTRES(VARCMP_LT, VARCMP_LT) -#define EXPECT_GT EXPECTRES(VARCMP_GT, VARCMP_GT) -#define EXPECT_EQ EXPECTRES(VARCMP_EQ, VARCMP_EQ) #define EXPECT_DBL(x) \ ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) @@ -151,8 +153,8 @@ static HMODULE hOleaut32; ok(hres == S_OK && V_VT(&vDst) == typ && (CONV_TYPE)res == in, \ "hres=0x%X, type=%d (should be %d(" #typ ")), value=%d (should be 1)\n", \ hres, V_VT(&vDst), typ, (int)res); -#define BADVAR(typ) CHANGETYPEEX(typ); out = (CONV_TYPE)hres; EXPECT_BADVAR -#define MISMATCH(typ) CHANGETYPEEX(typ); out = (CONV_TYPE)hres; EXPECT_MISMATCH +#define BADVAR(typ) CHANGETYPEEX(typ); EXPECT_BADVAR +#define MISMATCH(typ) CHANGETYPEEX(typ); EXPECT_MISMATCH #define INITIAL_TYPETEST(vt, val, fs) \ VariantInit(&vSrc); \ @@ -847,7 +849,8 @@ static void test_VarI1Copy(void) static void test_VarI1ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + signed char in; VARIANTARG vSrc, vDst; in = 1; @@ -1131,7 +1134,8 @@ static void test_VarUI1Copy(void) static void test_VarUI1ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + BYTE in; VARIANTARG vSrc, vDst; in = 1; @@ -1380,7 +1384,8 @@ static void test_VarI2Copy(void) static void test_VarI2ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + SHORT in; VARIANTARG vSrc, vDst; in = 1; @@ -1619,7 +1624,8 @@ static void test_VarUI2Copy(void) static void test_VarUI2ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + USHORT in; VARIANTARG vSrc, vDst; in = 1; @@ -1874,7 +1880,8 @@ static void test_VarI4Copy(void) static void test_VarI4ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + LONG in; VARIANTARG vSrc, vDst; in = 1; @@ -2108,7 +2115,8 @@ static void test_VarUI4Copy(void) static void test_VarUI4ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + ULONG in; VARIANTARG vSrc, vDst; in = 1; @@ -2385,7 +2393,8 @@ static void test_VarI8Copy(void) static void test_VarI8ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + LONG64 in; VARIANTARG vSrc, vDst; if (!HAVE_OLEAUT32_I8) @@ -2650,7 +2659,8 @@ static void test_VarUI8Copy(void) static void test_VarUI8ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + ULONG64 in; VARIANTARG vSrc, vDst; if (!HAVE_OLEAUT32_I8) @@ -2858,7 +2868,8 @@ static void test_VarR4Copy(void) static void test_VarR4ChangeTypeEx(void) { #ifdef HAS_UINT64_TO_FLOAT - CONVVARS(CONV_TYPE); + HRESULT hres; + float in; VARIANTARG vSrc, vDst; in = 1.0f; @@ -3069,7 +3080,8 @@ static void test_VarR8Copy(void) static void test_VarR8ChangeTypeEx(void) { #ifdef HAS_UINT64_TO_FLOAT - CONVVARS(CONV_TYPE); + HRESULT hres; + double in; VARIANTARG vSrc, vDst; in = 1.0; @@ -3488,7 +3500,8 @@ static void test_VarDateChangeTypeEx(void) '1','/','2','/','7','0','\0' }; static const WCHAR sz25570Nls[] = { '1','/','2','/','1','9','7','0',' ','1','2',':','0','0',':','0','0',' ','A','M','\0' }; - CONVVARS(CONV_TYPE); + HRESULT hres; + DATE in; VARIANTARG vSrc, vDst; LCID lcid; @@ -3897,11 +3910,13 @@ static void test_VarCyMulI8(void) } #define MATHCMP(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); pVarCyFromR8(right, &cyRight); \ - hres = pVarCyCmp(cyLeft, cyRight); out.int64 = hres + hres = pVarCyCmp(cyLeft, cyRight) static void test_VarCyCmp(void) { - MATHVARS2; + HRESULT hres; + double left = 0.0, right = 0.0; + CY cyLeft, cyRight; CHECKPTR(VarCyCmp); MATHCMP(-1.0, -1.0); EXPECT_EQ; @@ -3918,11 +3933,13 @@ static void test_VarCyCmp(void) } #define MATHCMPR8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyCmpR8(cyLeft, right); out.int64 = hres + hres = pVarCyCmpR8(cyLeft, right); static void test_VarCyCmpR8(void) { - MATHVARS1; + HRESULT hres; + double left = 0.0; + CY cyLeft; double right; CHECKPTR(VarCyCmpR8); @@ -4819,7 +4836,8 @@ static void test_VarBoolChangeTypeEx(void) static const WCHAR szTrue[] = { 'T','r','u','e','\0' }; static const WCHAR szFalse[] = { 'F','a','l','s','e','\0' }; static const WCHAR szFaux[] = { 'F','a','u','x','\0' }; - CONVVARS(CONV_TYPE); + HRESULT hres; + VARIANT_BOOL in; VARIANTARG vSrc, vDst; LCID lcid;

1 0

Michael Stefaniuc : oleaut32: Fix some VarCyFrom* tests.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 38794b4ba0c73cbedbc5bba2d7ace58afdab835a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38794b4ba0c73cbedbc5bba2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:36:57 2011 +0200 oleaut32: Fix some VarCyFrom* tests. Due to a broken EXPECTRES macro the EXPECT_OVERFLOW accepts S_OK return values. --- dlls/oleaut32/tests/vartype.c | 8 ++++++-- dlls/oleaut32/vartype.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b4f0731..e46a9b6 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3720,7 +3720,9 @@ static void test_VarCyFromUI8(void) CONVERT(VarCyFromUI8, 0); EXPECTCY(0); CONVERT(VarCyFromUI8, 1); EXPECTCY(1); CONVERT_I8(VarCyFromUI8, 214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); - CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECT_OVERFLOW; + CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECTCY64(2147483647ul, 4294961488ul); + CONVERT_I8(VarCyFromUI8, 214748, 1566804070); EXPECT_OVERFLOW; + CONVERT_I8(VarCyFromUI8, 214749, 1566804068); EXPECT_OVERFLOW; } static void test_VarCyFromDec(void) @@ -3736,7 +3738,9 @@ static void test_VarCyFromDec(void) CONVERT_DEC(VarCyFromDec,0,0,0,1); EXPECTCY(1); CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); - CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECT_OVERFLOW; + CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECTCY64(2147483647ul, 4294961488ul); + CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804070); EXPECT_OVERFLOW; + CONVERT_DEC64(VarCyFromDec,0,0,0,214749, 1566804068); EXPECT_OVERFLOW; CONVERT_DEC(VarCyFromDec,2,0,0,100); EXPECTCY(1); CONVERT_DEC(VarCyFromDec,2,0x80,0,100); EXPECTCY(-1); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3dd65d8..2ab5438 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3764,7 +3764,7 @@ HRESULT WINAPI VarCyFromI8(LONG64 llIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut) { - if (ullIn >= (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; + if (ullIn > (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; pCyOut->int64 = ullIn * CY_MULTIPLIER; return S_OK; }

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
79
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 October 2011