October 2013 - Wine-commits

Alexandre Julliard : explorer: Avoid crashing when the desktop launchers are not initialized.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 0d40cdc7796d1e688a0c80576b313aeda13198f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d40cdc7796d1e688a0c80576… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 13:29:39 2013 +0200 explorer: Avoid crashing when the desktop launchers are not initialized. --- programs/explorer/desktop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c38edb..3ea3e60 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -88,8 +88,10 @@ static RECT get_title_rect( unsigned int index ) static const struct launcher *launcher_from_point( int x, int y ) { RECT icon, title; - unsigned int index = x / launcher_size + (y / launcher_size) * launchers_per_row; + unsigned int index; + if (!nb_launchers) return NULL; + index = x / launcher_size + (y / launcher_size) * launchers_per_row; if (index >= nb_launchers) return NULL; icon = get_icon_rect( index ); @@ -523,6 +525,7 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR return 0; case WM_LBUTTONDBLCLK: + if (!using_root) { const struct launcher *launcher = launcher_from_point( (short)LOWORD(lp), (short)HIWORD(lp) ); if (launcher) do_launch( launcher );

1 0

Dmitry Timoshkov : windowscodecs: Add support for IMILBitmapSource interface.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 5e78e0b695c91041d2f034b8cc9409bf4bd37144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e78e0b695c91041d2f034b8c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 14 12:07:06 2013 +0900 windowscodecs: Add support for IMILBitmapSource interface. --- dlls/windowscodecs/bitmap.c | 253 +++++++++++++++++++++++++++++++- dlls/windowscodecs/wincodecs_private.h | 40 +++++ 2 files changed, 292 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e78e0b695c91041d2f03…

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipCloneBitmapArea without using GdipBitmapLockBits.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: df367c339973c471b0792151ddec0db19b9da1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df367c339973c471b0792151d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 18 14:04:46 2013 +0900 gdiplus: Reimplement GdipCloneBitmapArea without using GdipBitmapLockBits. --- dlls/gdiplus/image.c | 33 +++++---------------------------- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e9191e..83b0b08 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1224,9 +1224,6 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - BitmapData lockeddata_src, lockeddata_dst; - int i; - UINT row_size; Rect area; GpStatus stat; @@ -1248,39 +1245,19 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, area.Width = gdip_round(width); area.Height = gdip_round(height); - stat = GdipBitmapLockBits(srcBitmap, &area, ImageLockModeRead, format, - &lockeddata_src); - if (stat != Ok) return stat; - - stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, - 0, lockeddata_src.PixelFormat, NULL, dstBitmap); + stat = GdipCreateBitmapFromScan0(area.Width, area.Height, 0, format, NULL, dstBitmap); if (stat == Ok) { - stat = GdipBitmapLockBits(*dstBitmap, NULL, ImageLockModeWrite, - lockeddata_src.PixelFormat, &lockeddata_dst); - - if (stat == Ok) - { - /* copy the image data */ - row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; - for (i=0; i<lockeddata_src.Height; i++) - memcpy((BYTE*)lockeddata_dst.Scan0+lockeddata_dst.Stride*i, - (BYTE*)lockeddata_src.Scan0+lockeddata_src.Stride*i, - row_size); - - GdipBitmapUnlockBits(*dstBitmap, &lockeddata_dst); - } - + stat = convert_pixels(area.Width, area.Height, (*dstBitmap)->stride, (*dstBitmap)->bits, (*dstBitmap)->format, + srcBitmap->stride, + srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, + srcBitmap->format, srcBitmap->image.palette); if (stat != Ok) GdipDisposeImage((GpImage*)*dstBitmap); } - GdipBitmapUnlockBits(srcBitmap, &lockeddata_src); - if (stat != Ok) - { *dstBitmap = NULL; - } return stat; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 650d12f..63d37cb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4257,7 +4257,6 @@ static void test_CloneBitmapArea(void) expect(WrongState, status); status = GdipCloneBitmapAreaI(0, 0, 1, 1, PixelFormat24bppRGB, bitmap, &copy); -todo_wine expect(Ok, status); status = GdipBitmapUnlockBits(bitmap, &data);

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipCloneImage using GdipCloneBitmapArea for a bitmap.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: b528e01d85e4e81f670f7b2f80bb87fcf5451d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b528e01d85e4e81f670f7b2f8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 18 14:04:56 2013 +0900 gdiplus: Reimplement GdipCloneImage using GdipCloneBitmapArea for a bitmap. --- dlls/gdiplus/image.c | 43 +++---------------------------------------- 1 files changed, 3 insertions(+), 40 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 83b0b08..b9e5b84 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1312,47 +1312,10 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) } else if (image->type == ImageTypeBitmap) { - GpBitmap *bitmap = (GpBitmap*)image; - BitmapData lockeddata_src, lockeddata_dst; - int i; - UINT row_size; + GpBitmap *bitmap = (GpBitmap *)image; - stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, bitmap->format, - &lockeddata_src); - if (stat != Ok) return stat; - - stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, - 0, lockeddata_src.PixelFormat, NULL, (GpBitmap**)cloneImage); - if (stat == Ok) - { - stat = GdipBitmapLockBits((GpBitmap*)*cloneImage, NULL, ImageLockModeWrite, - lockeddata_src.PixelFormat, &lockeddata_dst); - - if (stat == Ok) - { - /* copy the image data */ - row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; - for (i=0; i<lockeddata_src.Height; i++) - memcpy((BYTE*)lockeddata_dst.Scan0+lockeddata_dst.Stride*i, - (BYTE*)lockeddata_src.Scan0+lockeddata_src.Stride*i, - row_size); - - GdipBitmapUnlockBits((GpBitmap*)*cloneImage, &lockeddata_dst); - } - - if (stat != Ok) - GdipDisposeImage(*cloneImage); - } - - GdipBitmapUnlockBits(bitmap, &lockeddata_src); - - if (stat != Ok) - { - *cloneImage = NULL; - } - else memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID)); - - return stat; + return GdipCloneBitmapAreaI(0, 0, bitmap->width, bitmap->height, + bitmap->format, bitmap, (GpBitmap **)cloneImage); } else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) {

1 0

Huw Davies : ole32/tests: Add tests to show that CoLockObjectExternal() calls ReleaseConnection() with the appropriate value for fLastReleaseCloses.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 29c6e10fd8a25ed413d1b6cc5794a80c4b001e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c6e10fd8a25ed413d1b6cc5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 18 12:52:46 2013 +0100 ole32/tests: Add tests to show that CoLockObjectExternal() calls ReleaseConnection() with the appropriate value for fLastReleaseCloses. --- dlls/ole32/tests/marshal.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 09ba030..95dae0a 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -106,6 +106,52 @@ static void UnlockModule(void) InterlockedDecrement(&cLocks); } +static BOOL with_external_conn; +static DWORD external_connections; +static BOOL last_release_closes; + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + ok(0, "unxpected call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + return 2; +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + return 1; +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + trace("add connection\n"); + return ++external_connections; +} + + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + trace("release connection %d\n", fLastReleaseCloses); + last_release_closes = fLastReleaseCloses; + return --external_connections; +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + +static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; + static HRESULT WINAPI Test_IUnknown_QueryInterface( LPUNKNOWN iface, @@ -164,6 +210,12 @@ static HRESULT WINAPI Test_IClassFactory_QueryInterface( return S_OK; } + if (with_external_conn && IsEqualGUID(riid, &IID_IExternalConnection)) + { + *ppvObj = &ExternalConnection; + return S_OK; + } + *ppvObj = NULL; return E_NOINTERFACE; } @@ -1232,6 +1284,7 @@ static void test_lock_object_external(void) IStream *pStream = NULL; cLocks = 0; + with_external_conn = TRUE; /* test the stub manager creation aspect of CoLockObjectExternal when the * object hasn't been marshaled yet */ @@ -1270,6 +1323,7 @@ static void test_lock_object_external(void) CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, TRUE); ok_no_locks(); + ok(last_release_closes, "last_release_closes FALSE\n"); /* test CoLockObjectExternal releases reference to object with * fLastUnlockReleases as TRUE and there are only strong references on @@ -1281,6 +1335,8 @@ static void test_lock_object_external(void) CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, FALSE); ok_no_locks(); +todo_wine + ok(!last_release_closes, "last_release_closes TRUE\n"); /* test CoLockObjectExternal doesn't release the last reference to an * object with fLastUnlockReleases as TRUE and there is a weak reference @@ -1301,8 +1357,11 @@ static void test_lock_object_external(void) CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); ok_no_locks(); +todo_wine + ok(!last_release_closes, "last_release_closes TRUE\n"); IStream_Release(pStream); + with_external_conn = FALSE; } /* tests disconnecting stubs */

1 0

Nikolay Sivov : rsaenh: Fail on unsupported flag values only in CryptHashData().
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: bfd2c533beef454a61b24f92790f91099e607365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd2c533beef454a61b24f927… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 22:36:36 2013 +0400 rsaenh: Fail on unsupported flag values only in CryptHashData(). --- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 12 +++++++++--- include/wincrypt.h | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 7d4cdb9..b5ab7a9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4114,7 +4114,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pb TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n", hProv, hHash, pbData, dwDataLen, dwFlags); - if (dwFlags) + if (dwFlags & ~CRYPT_USERDATA) { SetLastError(NTE_BAD_FLAGS); return FALSE; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index f43a4e4..84505f8 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -446,7 +446,10 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); + ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -470,7 +473,10 @@ static void test_hashes(void) result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); ok(result && (hashlen == 16), "%08x, hashlen: %d\n", GetLastError(), hashlen); - result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + result = CryptHashData(hHash, pbData, sizeof(pbData), ~0); + ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); len = 16; @@ -519,7 +525,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); - result = CryptHashData(hHash, pbData, 5, 0); + result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 64c932c..324007d 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3890,6 +3890,8 @@ typedef BOOL (WINAPI *PFN_CMSG_IMPORT_KEY_TRANS)( #define EXPORT_PRIVATE_KEYS 0x00000004 #define PKCS12_EXPORT_RESERVED_MASK 0xffff0000 +#define CRYPT_USERDATA 0x00000001 + /* function declarations */ /* advapi32.dll */ WINADVAPI BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD);

1 0

Michael Stefaniuc : crypt32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: df62b94c258055d532036f4dea9e7bec98418b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df62b94c258055d532036f4de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 22:58:35 2013 +0200 crypt32/tests: Compile with -D__WINESRC__. --- dlls/crypt32/tests/Makefile.in | 1 - dlls/crypt32/tests/encode.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in index 8fdc7ab..1b8842b 100644 --- a/dlls/crypt32/tests/Makefile.in +++ b/dlls/crypt32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = crypt32.dll IMPORTS = crypt32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ base64.c \ diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 5d9e76b..5d1b10d 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8054,9 +8054,9 @@ static void testPortPublicKeyInfo(void) PCERT_PUBLIC_KEY_INFO info = NULL; /* Just in case a previous run failed, delete this thing */ - CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, + CryptAcquireContextA(&csp, cspName, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, + ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret,"CryptAcquireContextA failed\n"); @@ -8065,7 +8065,7 @@ static void testPortPublicKeyInfo(void) HeapFree(GetProcessHeap(), 0, info); CryptReleaseContext(csp, 0); - ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV, PROV_RSA_FULL, + ret = CryptAcquireContextA(&csp, cspName, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok(ret,"CryptAcquireContextA failed\n"); }

1 0

Michael Stefaniuc : wintrust/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: 640dd17acfe10d41aa55423ec520163e55545613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640dd17acfe10d41aa55423ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 23:10:47 2013 +0200 wintrust/tests: Compile with -D__WINESRC__. --- dlls/wintrust/tests/Makefile.in | 1 - dlls/wintrust/tests/crypt.c | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/tests/Makefile.in b/dlls/wintrust/tests/Makefile.in index 3a875b2..b40817c 100644 --- a/dlls/wintrust/tests/Makefile.in +++ b/dlls/wintrust/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = wintrust.dll IMPORTS = wintrust crypt32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ asn.c \ diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 8534ce1..cb5818e 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -23,6 +23,7 @@ #include <stdio.h> #include "windows.h" +#include "wincrypt.h" #include "mscat.h" #include "wine/test.h" @@ -251,23 +252,23 @@ static void test_context(void) } ok(hca != NULL, "Expected a context handle, got NULL\n"); - attrs = GetFileAttributes(catroot); + attrs = GetFileAttributesA(catroot); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n"); /* Windows creates the GUID directory in capitals */ lstrcpyA(dummydir, catroot); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); - attrs = GetFileAttributes(dummydir); + attrs = GetFileAttributesA(dummydir); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected CatRoot\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); /* Only present on XP or higher. */ - attrs = GetFileAttributes(catroot2); + attrs = GetFileAttributesA(catroot2); if (attrs != INVALID_FILE_ATTRIBUTES) { lstrcpyA(dummydir, catroot2); lstrcatA(dummydir, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"); - attrs = GetFileAttributes(dummydir); + attrs = GetFileAttributesA(dummydir); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected CatRoot2\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF} directory to exist\n"); } @@ -589,7 +590,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) lstrcpyA(catfilepath, catroot); lstrcatA(catfilepath, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\\winetest.cat"); - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); todo_wine ok(attrs == FILE_ATTRIBUTE_SYSTEM || @@ -617,12 +618,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); /* The call succeeded with the full path but the file is not removed */ - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); /* Given only the filename the file is removed */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); - attrs = GetFileAttributes(catfilepath); + attrs = GetFileAttributesA(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); cleanup:

1 0

Michael Stefaniuc : twain_32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: f67893bd8267f3ee0345d1a9e828714f1e9955b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67893bd8267f3ee0345d1a9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 23:12:58 2013 +0200 twain_32/tests: Compile with -D__WINESRC__. --- dlls/twain_32/tests/Makefile.in | 1 - dlls/twain_32/tests/dsm.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in index 4a1727f..060b20e 100644 --- a/dlls/twain_32/tests/Makefile.in +++ b/dlls/twain_32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = twain_32.dll IMPORTS = user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ dsm.c diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 96381e6..b8f1c9e 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -36,12 +36,12 @@ static BOOL dsm_RegisterWindowClasses(void) BOOL rc; cls.style = 0; - cls.lpfnWndProc = DefWindowProc; + cls.lpfnWndProc = DefWindowProcA; cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TWAIN_dsm_class"; @@ -861,9 +861,8 @@ START_TEST(dsm) appid.ProtocolMinor = TWON_PROTOCOLMINOR; appid.SupportedGroups = DG_CONTROL | DG_IMAGE; - hwnd = CreateWindow("TWAIN_dsm_class", "Twain Test", 0, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, GetModuleHandleA(0), NULL); + hwnd = CreateWindowA("TWAIN_dsm_class", "Twain Test", 0, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleA(NULL), NULL); rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd); ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc);

1 0

Michael Stefaniuc : dssenh/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 18 Oct '13

18 Oct '13

Module: wine Branch: master Commit: f561f8a2be17d09834771f07b4dd957a459fc198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f561f8a2be17d09834771f07b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 17 23:13:57 2013 +0200 dssenh/tests: Compile with -D__WINESRC__. --- dlls/dssenh/tests/Makefile.in | 1 - dlls/dssenh/tests/dssenh.c | 60 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f561f8a2be17d09834771…

1 0