October 2013 - Wine-commits

Jacek Caban : crypt32: Added cloning logic to context's vtbl.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 6ab429363a904529f5de0f4952a98257383723c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab429363a904529f5de0f495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:53:54 2013 +0200 crypt32: Added cloning logic to context's vtbl. --- dlls/crypt32/cert.c | 15 ++++++++++++- dlls/crypt32/collectionstore.c | 8 +------ dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 15 ++++++++++++- dlls/crypt32/crypt32_private.h | 9 ++++--- dlls/crypt32/ctl.c | 15 ++++++++++++- dlls/crypt32/store.c | 46 ++++++++++++++++++--------------------- 7 files changed, 71 insertions(+), 41 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2c96419..60cff2d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -117,8 +117,21 @@ static void Cert_free(context_t *context) LocalFree(cert->ctx.pCertInfo); } +static context_t *Cert_clone(context_t *context, WINECRYPT_CERTSTORE *store) +{ + cert_t *cert; + + cert = (cert_t*)Context_CreateLinkContext(sizeof(CERT_CONTEXT), context); + if(!cert) + return NULL; + + cert->ctx.hCertStore = store; + return &cert->base; +} + static const context_vtbl_t cert_vtbl = { - Cert_free + Cert_free, + Cert_clone }; BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 9fa1f05..855365a 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -76,7 +76,7 @@ static void *CRYPT_CollectionCreateContextFromChild(WINE_COLLECTIONSTORE *store, { context_t *ret; - ret = Context_CreateLinkContext(contextSize, child); + ret = child->vtbl->clone(child, &store->hdr); if (!ret) return NULL; @@ -210,8 +210,6 @@ static BOOL Collection_addCert(WINECRYPT_CERTSTORE *store, void *cert, PCERT_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CERT_CONTEXT)); - if (context) - context->hCertStore = store; *ppStoreContext = context; } CertFreeCertificateContext(childContext); @@ -287,8 +285,6 @@ static BOOL Collection_addCRL(WINECRYPT_CERTSTORE *store, void *crl, PCRL_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CRL_CONTEXT)); - if (context) - context->hCertStore = store; *ppStoreContext = context; } CertFreeCRLContext(childContext); @@ -363,8 +359,6 @@ static BOOL Collection_addCTL(WINECRYPT_CERTSTORE *store, void *ctl, PCTL_CONTEXT context = CRYPT_CollectionCreateContextFromChild(cs, storeEntry, context_from_ptr(childContext), sizeof(CTL_CONTEXT)); - if (context) - context->hCertStore = store; *ppStoreContext = context; } CertFreeCTLContext(childContext); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 05e5d79..bb919f2 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -162,13 +162,13 @@ struct ContextList *ContextList_Create( return list; } -void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) +void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace, struct WINE_CRYPTCERTSTORE *store) { context_t *context; TRACE("(%p, %p, %p)\n", list, toLink, toReplace); - context = Context_CreateLinkContext(list->contextSize, context_from_ptr(toLink)); + context = context_from_ptr(toLink)->vtbl->clone(BASE_CONTEXT_FROM_CONTEXT(toLink), store); if (context) { TRACE("adding %p\n", context); diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 2e3a58f..75fdc8e 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -37,8 +37,21 @@ static void CRL_free(context_t *context) LocalFree(crl->ctx.pCrlInfo); } +static context_t *CRL_clone(context_t *context, WINECRYPT_CERTSTORE *store) +{ + crl_t *crl; + + crl = (crl_t*)Context_CreateLinkContext(sizeof(CRL_CONTEXT), context); + if(!crl) + return NULL; + + crl->ctx.hCertStore = store; + return &crl->base; +} + static const context_vtbl_t crl_vtbl = { - CRL_free + CRL_free, + CRL_clone }; PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index fc1e122..9382841 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -159,12 +159,16 @@ void crypt_sip_free(void) DECLSPEC_HIDDEN; void root_store_free(void) DECLSPEC_HIDDEN; void default_chain_engine_free(void) DECLSPEC_HIDDEN; +/* (Internal) certificate store types and functions */ +struct WINE_CRYPTCERTSTORE; + typedef struct _CONTEXT_PROPERTY_LIST CONTEXT_PROPERTY_LIST; typedef struct _context_t context_t; typedef struct { void (*free)(context_t*); + struct _context_t *(*clone)(context_t*,struct WINE_CRYPTCERTSTORE*); } context_vtbl_t; typedef struct _context_t { @@ -257,9 +261,6 @@ extern const WINE_CONTEXT_INTERFACE *pCertInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCRLInterface DECLSPEC_HIDDEN; extern const WINE_CONTEXT_INTERFACE *pCTLInterface DECLSPEC_HIDDEN; -/* (Internal) certificate store types and functions */ -struct WINE_CRYPTCERTSTORE; - typedef struct WINE_CRYPTCERTSTORE * (*StoreOpenFunc)(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara); @@ -454,7 +455,7 @@ struct ContextList; struct ContextList *ContextList_Create( const WINE_CONTEXT_INTERFACE *contextInterface, size_t contextSize) DECLSPEC_HIDDEN; -void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) DECLSPEC_HIDDEN; +void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace, struct WINE_CRYPTCERTSTORE *store) DECLSPEC_HIDDEN; void *ContextList_Enum(struct ContextList *list, void *pPrev) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 26072ab..ed92f90 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -39,8 +39,21 @@ static void CTL_free(context_t *context) LocalFree(ctl->ctx.pCtlInfo); } +static context_t *CTL_clone(context_t *context, WINECRYPT_CERTSTORE *store) +{ + ctl_t *ctl; + + ctl = (ctl_t*)Context_CreateLinkContext(sizeof(CTL_CONTEXT), context); + if(!ctl) + return NULL; + + ctl->ctx.hCertStore = store; + return &ctl->base; +} + static const context_vtbl_t ctl_vtbl = { - CTL_free + CTL_free, + CTL_clone }; BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 1ba81c9..4f27e62 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -150,15 +150,13 @@ static BOOL MemStore_addCert(WINECRYPT_CERTSTORE *store, void *cert, TRACE("(%p, %p, %p, %p)\n", store, cert, toReplace, ppStoreContext); - context = ContextList_Add(ms->certs, cert, toReplace); - if (context) - { - context->hCertStore = store; - if (ppStoreContext) { - *ppStoreContext = CertDuplicateCertificateContext(context); - } - } - return context != 0; + context = ContextList_Add(ms->certs, cert, toReplace, store); + if (!context) + return FALSE; + + if (ppStoreContext) + *ppStoreContext = CertDuplicateCertificateContext(context); + return TRUE; } static void *MemStore_enumCert(WINECRYPT_CERTSTORE *store, void *pPrev) @@ -194,14 +192,13 @@ static BOOL MemStore_addCRL(WINECRYPT_CERTSTORE *store, void *crl, TRACE("(%p, %p, %p, %p)\n", store, crl, toReplace, ppStoreContext); - context = ContextList_Add(ms->crls, crl, toReplace); - if (context) - { - context->hCertStore = store; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCRLContext(context); - } - return context != 0; + context = ContextList_Add(ms->crls, crl, toReplace, store); + if (!context) + return FALSE; + + if (ppStoreContext) + *ppStoreContext = CertDuplicateCRLContext(context); + return TRUE; } static void *MemStore_enumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) @@ -237,14 +234,13 @@ static BOOL MemStore_addCTL(WINECRYPT_CERTSTORE *store, void *ctl, TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); - context = ContextList_Add(ms->ctls, ctl, toReplace); - if (context) - { - context->hCertStore = store; - if (ppStoreContext) - *ppStoreContext = CertDuplicateCTLContext(context); - } - return context != 0; + context = ContextList_Add(ms->ctls, ctl, toReplace, store); + if (!context) + return FALSE; + + if (ppStoreContext) + *ppStoreContext = CertDuplicateCTLContext(context); + return TRUE; } static void *MemStore_enumCTL(WINECRYPT_CERTSTORE *store, void *pPrev)

1 0

Jacek Caban : crypt32: Get rid of no longer needed Context_GetLinkedContext .
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 4553e6d144e2aecde7a566edb03bad171d9668e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4553e6d144e2aecde7a566edb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 15 16:54:05 2013 +0200 crypt32: Get rid of no longer needed Context_GetLinkedContext. --- dlls/crypt32/collectionstore.c | 43 +++++++++++++++++++++------------------ dlls/crypt32/crypt32_private.h | 3 -- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 855365a..f90eae4 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -98,14 +98,14 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, ret = FALSE; if (toReplace) { - void *existingLinked = Context_GetLinkedContext(toReplace); + context_t *existingLinked = context_from_ptr(toReplace)->linked; CONTEXT_FUNCS *contextFuncs; storeEntry = context_from_ptr(toReplace)->u.ptr; contextFuncs = (CONTEXT_FUNCS*)((LPBYTE)storeEntry->store->vtbl + contextFuncsOffset); ret = contextFuncs->addContext(storeEntry->store, context, - existingLinked, (const void **)&childContext); + context_ptr(existingLinked), (const void **)&childContext); } else { @@ -147,7 +147,8 @@ static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, const WINE_CONTEXT_INTERFACE *contextInterface, void *pPrev, size_t contextSize) { - void *ret, *child; + context_t *child; + void *ret, *tmp; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev); @@ -157,17 +158,21 @@ static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, /* Ref-counting funny business: "duplicate" (addref) the child, because * the free(pPrev) below can cause the ref count to become negative. */ - child = Context_GetLinkedContext(pPrev); - Context_AddRef(context_from_ptr(child)); - child = contextFuncs->enumContext(storeEntry->store, child); + child = context_from_ptr(pPrev)->linked; + Context_AddRef(child); + tmp = contextFuncs->enumContext(storeEntry->store, context_ptr(child)); + child = tmp ? context_from_ptr(tmp) : NULL; Context_Release(context_from_ptr(pPrev)); pPrev = NULL; } else - child = contextFuncs->enumContext(storeEntry->store, NULL); + { + tmp = contextFuncs->enumContext(storeEntry->store, NULL); + child = tmp ? context_from_ptr(tmp) : NULL; + } if (child) { - ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, context_from_ptr(child), contextSize); - Context_Release(context_from_ptr(child)); + ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child, contextSize); + Context_Release(child); } else { @@ -259,13 +264,13 @@ static void *Collection_enumCert(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL Collection_deleteCert(WINECRYPT_CERTSTORE *store, context_t *context) { cert_t *cert = (cert_t*)context; + cert_t *linked; BOOL ret; - PCCERT_CONTEXT linked; TRACE("(%p, %p)\n", store, cert); - linked = Context_GetLinkedContext(&cert->ctx); - ret = CertDeleteCertificateFromStore(linked); + linked = (cert_t*)context->linked; + ret = CertDeleteCertificateFromStore(&linked->ctx); Context_Release(&cert->base); return ret; } @@ -332,14 +337,13 @@ static void *Collection_enumCRL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL Collection_deleteCRL(WINECRYPT_CERTSTORE *store, context_t *context) { - crl_t *crl = (crl_t*)context; + crl_t *crl = (crl_t*)context, *linked; BOOL ret; - PCCRL_CONTEXT linked; TRACE("(%p, %p)\n", store, crl); - linked = Context_GetLinkedContext(&crl->ctx); - ret = CertDeleteCRLFromStore(linked); + linked = (crl_t*)context->linked; + ret = CertDeleteCRLFromStore(&linked->ctx); Context_Release(&crl->base); return ret; } @@ -406,14 +410,13 @@ static void *Collection_enumCTL(WINECRYPT_CERTSTORE *store, void *pPrev) static BOOL Collection_deleteCTL(WINECRYPT_CERTSTORE *store, context_t *context) { - ctl_t *ctl = (ctl_t*)context; + ctl_t *ctl = (ctl_t*)context, *linked; BOOL ret; - PCCTL_CONTEXT linked; TRACE("(%p, %p)\n", store, ctl); - linked = Context_GetLinkedContext(&ctl->ctx); - ret = CertDeleteCTLFromStore(linked); + linked = (ctl_t*)context->linked; + ret = CertDeleteCTLFromStore(&linked->ctx); Context_Release(&ctl->base); return ret; } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 9382841..33e13a8 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -402,9 +402,6 @@ void *Context_CreateDataContext(size_t contextSize, const context_vtbl_t *vtbl) */ context_t *Context_CreateLinkContext(unsigned contextSize, context_t *linked) DECLSPEC_HIDDEN; -/* Gets the context linked to by context, which must be a link context. */ -void *Context_GetLinkedContext(void*) DECLSPEC_HIDDEN; - /* Copies properties from fromContext to toContext. */ void Context_CopyProperties(const void *to, const void *from) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : cabinet/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 947977f614579d8baff58648e77628c0183a8326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947977f614579d8baff58648e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 15:45:47 2013 +0400 cabinet/tests: Compile with -D__WINESRC__. --- dlls/cabinet/tests/Makefile.in | 1 - dlls/cabinet/tests/extract.c | 10 +++++----- dlls/cabinet/tests/fdi.c | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in index 34c2479..4525d60 100644 --- a/dlls/cabinet/tests/Makefile.in +++ b/dlls/cabinet/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = cabinet.dll IMPORTS = cabinet -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ extract.c \ diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index aedbdd4..849d612 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -240,8 +240,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -251,7 +251,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); return (INT_PTR)handle; @@ -623,7 +623,7 @@ static void test_Extract(void) /* first file exists */ createTestFile("dest\\a.txt"); - SetFileAttributes("dest\\a.txt", FILE_ATTRIBUTE_READONLY); + SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; @@ -665,7 +665,7 @@ static void test_Extract(void) /* third file exists */ createTestFile("dest\\testdir\\c.txt"); - SetFileAttributes("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); + SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 4e1c9e0..919fdbf 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -440,8 +440,8 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, DWORD attrs; BOOL res; - handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); @@ -451,7 +451,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); - attrs = GetFileAttributes(pszName); + attrs = GetFileAttributesA(pszName); ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); /* fixme: should convert attrs to *pattribs, make sure * have a test that catches the fact that we don't?

1 0

Nikolay Sivov : comdlg32/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: e011d0e3c73c5483ff2005a72fcfda8eca27d35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e011d0e3c73c5483ff2005a72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 16:07:35 2013 +0400 comdlg32/tests: Compile with -D__WINESRC__. --- dlls/comdlg32/tests/Makefile.in | 1 - dlls/comdlg32/tests/filedlg.c | 85 ++++++++++++++++++++------------------- dlls/comdlg32/tests/finddlg.c | 5 +- dlls/comdlg32/tests/printdlg.c | 18 +++++---- 4 files changed, 57 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e011d0e3c73c5483ff200…

1 0

Kohei Takahashi : msi: Return -1 on open failure in FDI callbacks.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 953359c73f5c609132e6d7caea0947d164a3d4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953359c73f5c609132e6d7cae… Author: Kohei Takahashi <flast(a)flast.jp> Date: Wed Oct 16 01:08:38 2013 +0900 msi: Return -1 on open failure in FDI callbacks. --- dlls/msi/media.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d97f4bd..8646069 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -137,7 +137,6 @@ static void CDECL cabinet_free(void *pv) static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) { - HANDLE handle; DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; @@ -163,12 +162,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode) else if (oflag & _O_CREAT) dwCreateDisposition = CREATE_ALWAYS; - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - if (handle == INVALID_HANDLE_VALUE) - return 0; - - return (INT_PTR)handle; + return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); } static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb) @@ -225,12 +220,12 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) if (!cab) { WARN("failed to get cabinet stream\n"); - return 0; + return -1; } if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) { WARN("failed to encode stream name\n"); - return 0; + return -1; } if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { @@ -239,7 +234,7 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) { WARN("failed to open stream 0x%08x\n", hr); msi_free( encoded ); - return 0; + return -1; } } msi_free( encoded );

1 0

Alexandre Julliard : ntdll/tests: Skip test if LdrAddRefDll is missing.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 63092712c98b68a38011673d19d47f3699bac73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=63092712c98b68a38011673d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 18:37:05 2013 +0200 ntdll/tests: Skip test if LdrAddRefDll is missing. --- dlls/ntdll/tests/rtl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 54e3db5..6eb6de3 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1494,6 +1494,12 @@ static void test_LdrAddRefDll(void) NTSTATUS status; BOOL ret; + if (!pLdrAddRefDll) + { + win_skip( "LdrAddRefDll not supported\n" ); + return; + } + mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); ret = FreeLibrary(mod);

1 0

Hans Leidekker : msi/tests: Prepare source. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 2a70f1bde37683f3dfb3b67f1f998a5a9d249bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a70f1bde37683f3dfb3b67f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:32:23 2013 +0200 msi/tests: Prepare source.c for the switch to -D__WINESRC__. --- dlls/msi/tests/source.c | 147 ++++++++++++++++++++++++----------------------- 1 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a70f1bde37683f3dfb3b…

1 0

Hans Leidekker : msi/tests: Prepare suminfo. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 07043df793469177914c34ba04aed82b4954b850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07043df793469177914c34ba0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:33:20 2013 +0200 msi/tests: Prepare suminfo.c for the switch to -D__WINESRC__. --- dlls/msi/tests/suminfo.c | 106 +++++++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07043df793469177914c3…

1 0

Hans Leidekker : msi/tests: Prepare msi.c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 0354af649a3a09b3d45f38046f5c5a3dad590962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0354af649a3a09b3d45f38046… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:34:07 2013 +0200 msi/tests: Prepare msi.c for the switch to -D__WINESRC__. --- dlls/msi/tests/msi.c | 823 +++++++++++++++++++++++++------------------------- 1 files changed, 412 insertions(+), 411 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0354af649a3a09b3d45f3…

1 0

Hans Leidekker : msi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 1d124f8869edf916caf2206be1e32975bd7541a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d124f8869edf916caf2206be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:35:01 2013 +0200 msi/tests: Compile with -D__WINESRC__. --- dlls/msi/tests/Makefile.in | 1 - dlls/msi/tests/action.c | 10 +++- dlls/msi/tests/automation.c | 10 +++- dlls/msi/tests/db.c | 139 ++++++++++++++++++++++--------------------- dlls/msi/tests/format.c | 12 +++- dlls/msi/tests/install.c | 59 +++++++++++------- dlls/msi/tests/msi.c | 12 +++- dlls/msi/tests/package.c | 30 ++++++---- dlls/msi/tests/patch.c | 31 ++++++---- dlls/msi/tests/record.c | 2 +- dlls/msi/tests/suminfo.c | 4 +- 11 files changed, 182 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d124f8869edf916caf22…

1 0