wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Ken Thomases : dsound: Replace a realloc-or-alloc with a free-then-alloc.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: ca1d074c50493f032c60be627309e9b1eee53678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1d074c50493f032c60be627… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 23 17:33:58 2009 -0600 dsound: Replace a realloc-or-alloc with a free-then-alloc. The buffer is to be overwritten anyway, so there's no need to preserve its contents. Also, the old code leaked if the realloc were to fail. All in all, free-then-alloc is simpler. --- dlls/dsound/buffer.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 038a90e..abff0c9 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -117,11 +117,8 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( } else if (howmuch > 0) { /* Make an internal copy of the caller-supplied array. * Replace the existing copy if one is already present. */ - if (This->dsb->notifies) - This->dsb->notifies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - This->dsb->notifies, howmuch * sizeof(DSBPOSITIONNOTIFY)); - else - This->dsb->notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + HeapFree(GetProcessHeap(), 0, This->dsb->notifies); + This->dsb->notifies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, howmuch * sizeof(DSBPOSITIONNOTIFY)); if (This->dsb->notifies == NULL) {

1 0

Ken Thomases : winecoreaudio: Fix a copy-paste accident ("In" vs. "Out").
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: ad1090c23c29b42e6328edaa65f4837a1426c5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1090c23c29b42e6328edaa6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 23 17:34:07 2009 -0600 winecoreaudio: Fix a copy-paste accident ("In" vs. "Out"). --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 43f2451..b6f55b8 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -542,7 +542,7 @@ LONG CoreAudio_WaveInit(void) for (i = 0; i < MAX_WAVEOUTDRV; ++i) { static const WCHAR wszWaveOutFormat[] = - {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','I','n',' ','%','d',0}; + {'C','o','r','e','A','u','d','i','o',' ','W','a','v','e','O','u','t',' ','%','d',0}; WOutDev[i].state = WINE_WS_CLOSED; WOutDev[i].cadev = &CoreAudio_DefaultDevice;

1 0

Francois Gouget : crypt32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: df4d66458218ef4cf369356cd1cc3df6e3516ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4d66458218ef4cf369356cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:04:36 2009 +0100 crypt32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/crypt32/tests/base64.c | 4 ++-- dlls/crypt32/tests/cert.c | 10 +++++----- dlls/crypt32/tests/chain.c | 6 +++--- dlls/crypt32/tests/crl.c | 4 ++-- dlls/crypt32/tests/encode.c | 2 +- dlls/crypt32/tests/oid.c | 2 +- dlls/crypt32/tests/protectdata.c | 2 +- dlls/crypt32/tests/store.c | 14 +++++++------- dlls/crypt32/tests/str.c | 10 +++++----- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 15f41c8..5a260ed 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -449,10 +449,10 @@ START_TEST(base64) if (pCryptBinaryToStringA) testBinaryToStringA(); else - skip("CryptBinaryToStringA is not available\n"); + win_skip("CryptBinaryToStringA is not available\n"); if (pCryptStringToBinaryA) testStringToBinaryA(); else - skip("CryptStringToBinaryA is not available\n"); + win_skip("CryptStringToBinaryA is not available\n"); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index ffb9105..322fa2f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1672,12 +1672,12 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, if (!pCryptVerifyCertificateSignatureEx) { - skip("no CryptVerifyCertificateSignatureEx support\n"); + win_skip("no CryptVerifyCertificateSignatureEx support\n"); return; } if (!pCryptEncodeObjectEx) { - skip("no CryptEncodeObjectEx support\n"); + win_skip("no CryptEncodeObjectEx support\n"); return; } ret = pCryptVerifyCertificateSignatureEx(0, 0, 0, NULL, 0, NULL, 0, NULL); @@ -1897,7 +1897,7 @@ static void testCreateSelfSignCert(void) if (!pCertCreateSelfSignCertificate) { - skip("CertCreateSelfSignCertificate() is not available\n"); + win_skip("CertCreateSelfSignCertificate() is not available\n"); return; } @@ -2334,7 +2334,7 @@ static void testGetValidUsages(void) if (!pCertGetValidUsages) { - skip("CertGetValidUsages() is not available\n"); + win_skip("CertGetValidUsages() is not available\n"); return; } @@ -2875,7 +2875,7 @@ static void testAcquireCertPrivateKey(void) if (!pCryptAcquireCertificatePrivateKey) { - skip("CryptAcquireCertificatePrivateKey() is not available\n"); + win_skip("CryptAcquireCertificatePrivateKey() is not available\n"); return; } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 73fda34..f7efe64 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -68,7 +68,7 @@ static void testCreateCertChainEngine(void) if (!pCertCreateCertificateChainEngine || !pCertFreeCertificateChainEngine) { - skip("Cert*CertificateChainEngine() functions are not available\n"); + win_skip("Cert*CertificateChainEngine() functions are not available\n"); return; } @@ -1930,7 +1930,7 @@ static void testVerifyCertChainPolicy(void) if (!pCertVerifyCertificateChainPolicy) { - skip("CertVerifyCertificateChainPolicy() is not available\n"); + win_skip("CertVerifyCertificateChainPolicy() is not available\n"); return; } @@ -2010,7 +2010,7 @@ START_TEST(chain) testCreateCertChainEngine(); if (!pCertGetCertificateChain) { - skip("CertGetCertificateChain() is not available\n"); + win_skip("CertGetCertificateChain() is not available\n"); } else { diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 0bd0e5c..abd8491 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -219,7 +219,7 @@ static void testFindCRL(void) if (!store) return; if (!pCertFindCRLInStore) { - skip("CertFindCRLInStore() is not available\n"); + win_skip("CertFindCRLInStore() is not available\n"); return; } @@ -619,7 +619,7 @@ static void testFindCertInCRL(void) if (!pCertFindCertificateInCRL) { - skip("CertFindCertificateInCRL() is not available\n"); + win_skip("CertFindCertificateInCRL() is not available\n"); return; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 439a25f..e406194 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7497,7 +7497,7 @@ START_TEST(encode) pCryptEncodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptEncodeObjectEx"); if (!pCryptDecodeObjectEx || !pCryptEncodeObjectEx) { - skip("CryptDecodeObjectEx() is not available\n"); + win_skip("CryptDecodeObjectEx() is not available\n"); return; } diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index bb23a1e..9b50129 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -531,7 +531,7 @@ static void test_enumOIDInfo(void) if (!pCryptEnumOIDInfo) { - skip("CryptEnumOIDInfo() is not available\n"); + win_skip("CryptEnumOIDInfo() is not available\n"); return; } diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 97b08c5..82cf1aa 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -221,7 +221,7 @@ START_TEST(protectdata) pCryptUnprotectData = (void*)GetProcAddress(hCrypt32, "CryptUnprotectData"); if (!pCryptProtectData || !pCryptUnprotectData) { - skip("Crypt(Un)ProtectData() is not available\n"); + win_skip("Crypt(Un)ProtectData() is not available\n"); return; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 65d7f15..ae10fbc 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -285,7 +285,7 @@ static void testCollectionStore(void) if (!pCertAddStoreToCollection) { - skip("CertAddStoreToCollection() is not available\n"); + win_skip("CertAddStoreToCollection() is not available\n"); return; } @@ -545,7 +545,7 @@ static void testCollectionStore(void) if (!pCertRemoveStoreFromCollection) { - skip("CertRemoveStoreFromCollection() is not available\n"); + win_skip("CertRemoveStoreFromCollection() is not available\n"); } else { @@ -639,7 +639,7 @@ static void testRegStore(void) /* It looks like the remainder pretty much needs CertControlStore() */ if (!pCertControlStore) { - skip("CertControlStore() is not available\n"); + win_skip("CertControlStore() is not available\n"); return; } @@ -1113,7 +1113,7 @@ static void testFileStore(void) if (!pCertControlStore) { - skip("CertControlStore() is not available\n"); + win_skip("CertControlStore() is not available\n"); return; } @@ -1714,7 +1714,7 @@ static void testCertEnumSystemStore(void) if (!pCertEnumSystemStore) { - skip("CertEnumSystemStore() is not available\n"); + win_skip("CertEnumSystemStore() is not available\n"); return; } @@ -1754,7 +1754,7 @@ static void testStoreProperty(void) if (!pCertGetStoreProperty || !pCertSetStoreProperty) { - skip("CertGet/SetStoreProperty() is not available\n"); + win_skip("CertGet/SetStoreProperty() is not available\n"); return; } @@ -2016,7 +2016,7 @@ static void test_I_UpdateStore(void) if (!pI_CertUpdatestore) { - skip("No I_CertUpdateStore\n"); + win_skip("No I_CertUpdateStore\n"); return; } store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 2b30995..ebc3342 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -281,7 +281,7 @@ static void test_CertRDNValueToStrW(void) if (!pCertRDNValueToStrW) { - skip("CertRDNValueToStrW is not available\n"); + win_skip("CertRDNValueToStrW is not available\n"); return; } @@ -333,7 +333,7 @@ static void test_CertNameToStrA(void) if (!pCertNameToStrA) { - skip("CertNameToStrA is not available\n"); + win_skip("CertNameToStrA is not available\n"); return; } @@ -412,7 +412,7 @@ static void test_CertNameToStrW(void) if (!pCertNameToStrW) { - skip("CertNameToStrW is not available\n"); + win_skip("CertNameToStrW is not available\n"); return; } @@ -499,7 +499,7 @@ static void test_CertStrToNameA(void) if (!pCertStrToNameA) { - skip("CertStrToNameA is not available\n"); + win_skip("CertStrToNameA is not available\n"); return; } @@ -584,7 +584,7 @@ static void test_CertStrToNameW(void) if (!pCertStrToNameW) { - skip("CertStrToNameW is not available\n"); + win_skip("CertStrToNameW is not available\n"); return; }

1 0

Francois Gouget : opengl32/tests: Replace a couple of trace()s with skip()s .
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 3d777d6e616b2c04b61caf3ff1180f04eda0d197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d777d6e616b2c04b61caf3ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:04:40 2009 +0100 opengl32/tests: Replace a couple of trace()s with skip()s. --- dlls/opengl32/tests/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ffef769..49659eb 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -613,12 +613,12 @@ START_TEST(opengl) if(strstr(wgl_extensions, "WGL_ARB_make_current_read")) test_make_current_read(hdc); else - trace("WGL_ARB_make_current_read not supported, skipping test\n"); + skip("WGL_ARB_make_current_read not supported, skipping test\n"); if(strstr(wgl_extensions, "WGL_ARB_pbuffer")) test_pbuffers(hdc); else - trace("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); + skip("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); cleanup: ReleaseDC(hwnd, hdc);

1 0

Francois Gouget : opengl32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 08637ac368baa1ad25ddbd83aa7b8f237c4dd32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08637ac368baa1ad25ddbd83a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:04:48 2009 +0100 opengl32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/opengl32/tests/opengl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index a3ac3af..ffef769 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -311,7 +311,7 @@ static void test_colorbits(HDC hdc) if (!pwglChoosePixelFormatARB) { - skip("wglChoosePixelFormatARB is not available\n"); + win_skip("wglChoosePixelFormatARB is not available\n"); return; } @@ -345,7 +345,7 @@ static void test_gdi_dbuf(HDC hdc) if (!pwglGetPixelFormatAttribivARB) { - skip("wglGetPixelFormatAttribivARB is not available\n"); + win_skip("wglGetPixelFormatAttribivARB is not available\n"); return; } @@ -595,7 +595,7 @@ START_TEST(opengl) /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) { - skip("wglGetExtensionsStringARB is not available\n"); + win_skip("wglGetExtensionsStringARB is not available\n"); return; }

1 0

Francois Gouget : ddraw/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 77a3cffb1bfd8227cf69a720a2d522231f6d3317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a3cffb1bfd8227cf69a720a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:04:23 2009 +0100 ddraw/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a35f520..f5927be 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2883,7 +2883,7 @@ START_TEST(d3d) { init_function_pointers(); if(!pDirectDrawCreateEx) { - skip("function DirectDrawCreateEx not available\n"); + win_skip("function DirectDrawCreateEx not available\n"); return; }

1 0

Francois Gouget : fusion/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: b7a6cc36764d48adb3db91adcaed2f99fe3ea3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a6cc36764d48adb3db91adc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:04:12 2009 +0100 fusion/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/fusion/tests/asmcache.c | 8 ++++---- dlls/fusion/tests/asmenum.c | 8 ++++---- dlls/fusion/tests/asmname.c | 2 +- dlls/fusion/tests/fusion.c | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index cd55afa..2fe84ec 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -759,14 +759,14 @@ static BOOL init_functionpointers(void) hmscoree = LoadLibraryA("mscoree.dll"); if (!hmscoree) { - skip("mscoree.dll not available\n"); + win_skip("mscoree.dll not available\n"); return FALSE; } pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); if (!pLoadLibraryShim) { - skip("LoadLibraryShim not available\n"); + win_skip("LoadLibraryShim not available\n"); FreeLibrary(hmscoree); return FALSE; } @@ -774,7 +774,7 @@ static BOOL init_functionpointers(void) hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion); if (FAILED(hr)) { - skip("fusion.dll not available\n"); + win_skip("fusion.dll not available\n"); FreeLibrary(hmscoree); return FALSE; } @@ -784,7 +784,7 @@ static BOOL init_functionpointers(void) if (!pCreateAssemblyCache || !pGetCachePath) { - skip("fusion.dll not implemented\n"); + win_skip("fusion.dll not implemented\n"); return FALSE; } diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index 921ddf8..54c1340 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -52,14 +52,14 @@ static BOOL init_functionpointers(void) hmscoree = LoadLibraryA("mscoree.dll"); if (!hmscoree) { - skip("mscoree.dll not available\n"); + win_skip("mscoree.dll not available\n"); return FALSE; } pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); if (!pLoadLibraryShim) { - skip("LoadLibraryShim not available\n"); + win_skip("LoadLibraryShim not available\n"); FreeLibrary(hmscoree); return FALSE; } @@ -67,7 +67,7 @@ static BOOL init_functionpointers(void) hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion); if (FAILED(hr)) { - skip("fusion.dll not available\n"); + win_skip("fusion.dll not available\n"); FreeLibrary(hmscoree); return FALSE; } @@ -79,7 +79,7 @@ static BOOL init_functionpointers(void) if (!pCreateAssemblyEnum || !pCreateAssemblyNameObject || !pGetCachePath) { - skip("fusion.dll not implemented\n"); + win_skip("fusion.dll not implemented\n"); return FALSE; } diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index b63e6b2..a926b87 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -777,7 +777,7 @@ START_TEST(asmname) { if (!init_functionpointers()) { - skip("fusion.dll not available\n"); + win_skip("fusion.dll not available\n"); return; } diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index be3da41..6ebd455 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -48,14 +48,14 @@ static BOOL init_functionpointers(void) hmscoree = LoadLibraryA("mscoree.dll"); if (!hmscoree) { - skip("mscoree.dll not available\n"); + win_skip("mscoree.dll not available\n"); return FALSE; } pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); if (!pLoadLibraryShim) { - skip("LoadLibraryShim not available\n"); + win_skip("LoadLibraryShim not available\n"); FreeLibrary(hmscoree); return FALSE; } @@ -65,7 +65,7 @@ static BOOL init_functionpointers(void) hr = pLoadLibraryShim(szFusion, NULL, NULL, &hfusion); if (FAILED(hr)) { - skip("fusion.dll not available\n"); + win_skip("fusion.dll not available\n"); FreeLibrary(hmscoree); return FALSE; } @@ -91,7 +91,7 @@ static void test_GetCachePath(void) if (!pGetCachePath) { - skip("GetCachePath not implemented\n"); + win_skip("GetCachePath not implemented\n"); return; }

1 0

Francois Gouget : gdi32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 9de60b9c2cb679967aba31ddf0c7e3d6ee01ec37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de60b9c2cb679967aba31ddf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:03:32 2009 +0100 gdi32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/gdi32/tests/dc.c | 2 +- dlls/gdi32/tests/font.c | 18 +++++++++--------- dlls/gdi32/tests/icm.c | 8 ++++---- dlls/gdi32/tests/path.c | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9e0048e..661246c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -185,7 +185,7 @@ static void test_GdiConvertToDevmodeW(void) pGdiConvertToDevmodeW = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GdiConvertToDevmodeW"); if (!pGdiConvertToDevmodeW) { - skip("GdiConvertToDevmodeW is not available on this platform\n"); + win_skip("GdiConvertToDevmodeW is not available on this platform\n"); return; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 041a742..cc5e3f5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -839,7 +839,7 @@ static void test_GdiGetCharDimensions(void) if (!pGdiGetCharDimensions) { - skip("GdiGetCharDimensions not available on this platform\n"); + win_skip("GdiGetCharDimensions not available on this platform\n"); return; } @@ -879,7 +879,7 @@ static void test_GetCharABCWidths(void) if (!pGetCharABCWidthsW || !pGetCharABCWidthsI) { - skip("GetCharABCWidthsW/I not available on this platform\n"); + win_skip("GetCharABCWidthsW/I not available on this platform\n"); return; } @@ -944,7 +944,7 @@ static void test_text_extents(void) GetTextExtentExPointW(hdc, wt, 1, 1, &fit1, &fit2, &sz1); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("Skipping remainder of text extents test on a Win9x platform\n"); + win_skip("Skipping remainder of text extents test on a Win9x platform\n"); hfont = SelectObject(hdc, hfont); DeleteObject(hfont); ReleaseDC(0, hdc); @@ -1002,7 +1002,7 @@ static void test_GetGlyphIndices(void) HFONT hOldFont; if (!pGetGlyphIndicesW) { - skip("GetGlyphIndicesW not available on platform\n"); + win_skip("GetGlyphIndicesW not available on platform\n"); return; } @@ -1137,7 +1137,7 @@ static void test_GetKerningPairs(void) GetKerningPairsW(hdc, 0, NULL); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("Skipping the GetKerningPairs test on a Win9x platform\n"); + win_skip("Skipping the GetKerningPairs test on a Win9x platform\n"); ReleaseDC(0, hdc); return; } @@ -1561,7 +1561,7 @@ static void test_font_charset(void) if (!pGetGlyphIndicesA || !pGetGlyphIndicesW) { - skip("Skipping the font charset test on a Win9x platform\n"); + win_skip("Skipping the font charset test on a Win9x platform\n"); return; } @@ -1606,7 +1606,7 @@ static void test_GetFontUnicodeRanges(void) if (!pGetFontUnicodeRanges) { - skip("GetFontUnicodeRanges not available before W2K\n"); + win_skip("GetFontUnicodeRanges not available before W2K\n"); return; } @@ -2511,7 +2511,7 @@ static void test_GetTextMetrics(void) /* Report only once */ if(!pGetGlyphIndicesA) - skip("GetGlyphIndicesA is unavailable, negative width will not be checked\n"); + win_skip("GetGlyphIndicesA is unavailable, negative width will not be checked\n"); hdc = GetDC(0); @@ -2672,7 +2672,7 @@ static void test_GdiRealizationInfo(void) if(!pGdiRealizationInfo) { - skip("GdiRealizationInfo not available\n"); + win_skip("GdiRealizationInfo not available\n"); return; } diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 424082c..06812aa 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -39,7 +39,7 @@ static void test_GetICMProfileA( HDC dc ) ret = GetICMProfileA( NULL, NULL, NULL ); if ( !ret && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { - skip( "GetICMProfileA is not implemented\n" ); + win_skip( "GetICMProfileA is not implemented\n" ); return; } ok( !ret, "GetICMProfileA succeeded\n" ); @@ -91,7 +91,7 @@ static void test_GetICMProfileW( HDC dc ) ret = GetICMProfileW( NULL, NULL, NULL ); if ( !ret && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { - skip( "GetICMProfileW is not implemented\n" ); + win_skip( "GetICMProfileW is not implemented\n" ); return; } ok( !ret, "GetICMProfileW succeeded\n" ); @@ -136,7 +136,7 @@ static void test_SetICMMode( HDC dc ) impl = GetICMProfileA( NULL, NULL, NULL ); if ( !impl && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { - skip( "On NT4 where SetICMMode is not implemented but this is not advertised\n" ); + win_skip( "On NT4 where SetICMMode is not implemented but this is not advertised\n" ); return; } @@ -165,7 +165,7 @@ static void test_SetICMMode( HDC dc ) dc = CreateDCW( displayW, NULL, NULL, NULL ); if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { - skip( "CreateDCW is not implemented\n" ); + win_skip( "CreateDCW is not implemented\n" ); return; } ok( dc != NULL, "CreateDCW failed (%d)\n", GetLastError() ); diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 58e8467..4a8ea6d 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -238,7 +238,7 @@ static void test_arcto(void) GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* ArcTo is only available on Win2k and later */ - skip("ArcTo is not available\n"); + win_skip("ArcTo is not available\n"); goto done; } SetArcDirection(hdc, AD_COUNTERCLOCKWISE); @@ -282,7 +282,7 @@ static void test_anglearc(void) GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* AngleArc is only available on Win2k and later */ - skip("AngleArc is not available\n"); + win_skip("AngleArc is not available\n"); goto done; } AngleArc(hdc, 300, 300, 80, 150.0, -180.0); @@ -355,7 +355,7 @@ static void test_polydraw(void) GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* PolyDraw is only available on Win2k and later */ - skip("PolyDraw is not available\n"); + win_skip("PolyDraw is not available\n"); goto done; } expect(TRUE, retb);

1 0

Francois Gouget : imm32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: ca8a2da6c197466c049daa85451fc2c4792eefc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8a2da6c197466c049daa854… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:03:16 2009 +0100 imm32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 3329928..7e7f752 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -162,7 +162,7 @@ static int init(void) { imc = ImmGetContext(hwnd); if (!imc) { - skip("IME support not implemented\n"); + win_skip("IME support not implemented\n"); return 0; } ImmReleaseContext(hwnd, imc);

1 0

Francois Gouget : kernel32/tests: Change to a win_skip() because we don' t want to skip the GetConsoleCursorInfo(,NULL) test in Wine.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 41360cc16128be7b6a6646c7f12ebd2a47992b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41360cc16128be7b6a6646c7f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 24 00:02:47 2009 +0100 kernel32/tests: Change to a win_skip() because we don't want to skip the GetConsoleCursorInfo(,NULL) test in Wine. --- dlls/kernel32/tests/console.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 830dbc1..fa94679 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -162,7 +162,7 @@ static void testCursorInfo(HANDLE hCon) if (info.dwSize == 12) { - skip("NULL CONSOLE_CURSOR_INFO will crash on win9x\n"); + win_skip("NULL CONSOLE_CURSOR_INFO will crash on win9x\n"); return; }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
97
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 February 2009