September 2013 - Wine-Commits

Dmitry Timoshkov : ntdll: NtWriteFile should fail for overlapped IO on files if offset is NULL.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: d37fac051929cfc82245a1c49e9cbf003bd0119e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37fac051929cfc82245a1c49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 2 18:29:38 2013 +0900 ntdll: NtWriteFile should fail for overlapped IO on files if offset is NULL. --- dlls/ntdll/file.c | 37 +++++++++++++++++++++++-------------- dlls/ntdll/tests/file.c | 6 ------ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3ffc632..3637b69 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -950,26 +950,35 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (type == FD_TYPE_FILE && offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */ ) + if (type == FD_TYPE_FILE) { - /* async I/O doesn't make sense on regular files */ - while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) { - if (errno != EINTR) + status = STATUS_INVALID_PARAMETER; + goto done; + } + + if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) + { + /* async I/O doesn't make sense on regular files */ + while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) { - if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; - else status = FILE_GetNtStatus(); - goto done; + if (errno != EINTR) + { + if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; + else status = FILE_GetNtStatus(); + goto done; + } } - } - if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) - /* update file pointer position */ - lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); + if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + /* update file pointer position */ + lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); - total = result; - status = STATUS_SUCCESS; - goto done; + total = result; + status = STATUS_SUCCESS; + goto done; + } } for (;;) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 1f9d60e..cde299c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2109,21 +2109,15 @@ todo_wine bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WriteFile(hfile, contents, sizeof(contents), &bytes, NULL); -todo_wine ok(!ret, "WriteFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); -todo_wine ok(bytes == 0, "bytes %u\n", bytes); iob.Status = -1; iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); -todo_wine ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); -todo_wine ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); -todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); iob.Status = -1;

1 0

Jacek Caban : crypt32: Get rid of remaining P* typedefs.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 0a5cb15f949495a06ff983fcfe6fa3ceb46f43db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5cb15f949495a06ff983fcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:40:32 2013 +0200 crypt32: Get rid of remaining P* typedefs. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/chain.c | 2 +- dlls/crypt32/msg.c | 8 ++++---- dlls/crypt32/serialize.c | 8 ++++---- dlls/crypt32/store.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 64ea613..04d16a0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1739,7 +1739,7 @@ typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD dwIndex; DWORD dwError; DWORD dwReason; -} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; +} OLD_CERT_REVOCATION_STATUS; typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8cc8c4a..fbfe3a5 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2548,7 +2548,7 @@ static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain( typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS { DWORD cbSize; CERT_USAGE_MATCH RequestedUsage; -} CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS; +} CERT_CHAIN_PARA_NO_EXTRA_FIELDS; static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, LPFILETIME pTime, HCERTSTORE hAdditionalStore, diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 370bf73..13f5934 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -603,20 +603,20 @@ typedef struct _CMSG_SIGNER_ENCODE_INFO_WITH_CMS CERT_ID SignerId; CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; void *pvHashEncryptionAuxInfo; -} CMSG_SIGNER_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNER_ENCODE_INFO_WITH_CMS; +} CMSG_SIGNER_ENCODE_INFO_WITH_CMS; typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS { DWORD cbSize; DWORD cSigners; - PCMSG_SIGNER_ENCODE_INFO_WITH_CMS rgSigners; + CMSG_SIGNER_ENCODE_INFO_WITH_CMS *rgSigners; DWORD cCertEncoded; PCERT_BLOB rgCertEncoded; DWORD cCrlEncoded; PCRL_BLOB rgCrlEncoded; DWORD cAttrCertEncoded; PCERT_BLOB rgAttrCertEncoded; -} CMSG_SIGNED_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNED_ENCODE_INFO_WITH_CMS; +} CMSG_SIGNED_ENCODE_INFO_WITH_CMS; static BOOL CRYPT_IsValidSigner(const CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) { @@ -1474,7 +1474,7 @@ typedef struct _CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS PCERT_BLOB rgAttrCertEncoded; DWORD cUnprotectedAttr; PCRYPT_ATTRIBUTE rgUnprotectedAttr; -} CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS, *PCMSG_ENVELOPED_ENCODE_INFO_WITH_CMS; +} CMSG_ENVELOPED_ENCODE_INFO_WITH_CMS; typedef struct _CEnvelopedEncodeMsg { diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 59dde5a..d8027c1 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -37,7 +37,7 @@ typedef struct _WINE_CERT_PROP_HEADER DWORD propID; DWORD unknown; /* always 1 */ DWORD cb; -} WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER; +} WINE_CERT_PROP_HEADER; static BOOL CRYPT_SerializeStoreElement(const void *context, const BYTE *encodedContext, DWORD cbEncodedContext, DWORD contextPropID, @@ -80,7 +80,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, } else { - PWINE_CERT_PROP_HEADER hdr; + WINE_CERT_PROP_HEADER *hdr; DWORD bufSize = 0; LPBYTE buf = NULL; @@ -109,7 +109,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, &propSize); if (ret) { - hdr = (PWINE_CERT_PROP_HEADER)pbElement; + hdr = (WINE_CERT_PROP_HEADER*)pbElement; hdr->propID = prop; hdr->unknown = 1; hdr->cb = propSize; @@ -128,7 +128,7 @@ static BOOL CRYPT_SerializeStoreElement(const void *context, } while (ret && prop != 0); CryptMemFree(buf); - hdr = (PWINE_CERT_PROP_HEADER)pbElement; + hdr = (WINE_CERT_PROP_HEADER*)pbElement; hdr->propID = contextPropID; hdr->unknown = 1; hdr->cb = cbEncodedContext; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index d7dfe6e..0fffa5b 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -92,7 +92,7 @@ typedef struct _WINE_MEMSTORE struct ContextList *certs; struct ContextList *crls; struct ContextList *ctls; -} WINE_MEMSTORE, *PWINE_MEMSTORE; +} WINE_MEMSTORE; void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags, CertStoreType type) @@ -307,7 +307,7 @@ static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { - PWINE_MEMSTORE store; + WINE_MEMSTORE *store; TRACE("(%ld, %08x, %p)\n", hCryptProv, dwFlags, pvPara);

1 0

Jacek Caban : crypt32: Get rid of PWINE_FILESTOREINFO typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: eacc0b8238ef304ceeba32a4b08890b6e18f1683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacc0b8238ef304ceeba32a4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:43 2013 +0200 crypt32: Get rid of PWINE_FILESTOREINFO typedef. --- dlls/crypt32/filestore.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 0bd34ec..44b9bbb 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -33,11 +33,11 @@ typedef struct _WINE_FILESTOREINFO HANDLE file; DWORD type; BOOL dirty; -} WINE_FILESTOREINFO, *PWINE_FILESTOREINFO; +} WINE_FILESTOREINFO; static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %08x)\n", store, dwFlags); if (store->dirty) @@ -50,7 +50,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) static BOOL WINAPI CRYPT_FileWriteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, cert, dwFlags); store->dirty = TRUE; @@ -60,7 +60,7 @@ static BOOL WINAPI CRYPT_FileWriteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileDeleteCert(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", hCertStore, pCertContext, dwFlags); store->dirty = TRUE; @@ -70,7 +70,7 @@ static BOOL WINAPI CRYPT_FileDeleteCert(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileWriteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT crl, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, crl, dwFlags); store->dirty = TRUE; @@ -80,7 +80,7 @@ static BOOL WINAPI CRYPT_FileWriteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore, PCCRL_CONTEXT pCrlContext, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", hCertStore, pCrlContext, dwFlags); store->dirty = TRUE; @@ -90,7 +90,7 @@ static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileWriteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT ctl, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags); store->dirty = TRUE; @@ -100,7 +100,7 @@ static BOOL WINAPI CRYPT_FileWriteCTL(HCERTSTORE hCertStore, static BOOL WINAPI CRYPT_FileDeleteCTL(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwFlags) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; TRACE("(%p, %p, %08x)\n", hCertStore, pCtlContext, dwFlags); store->dirty = TRUE; @@ -128,7 +128,7 @@ static BOOL CRYPT_ReadBlobFromFile(HANDLE file, PCERT_BLOB blob) static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { - PWINE_FILESTOREINFO store = hCertStore; + WINE_FILESTOREINFO *store = hCertStore; BOOL ret; TRACE("(%p, %08x, %d, %p)\n", hCertStore, dwFlags, dwCtrlType, @@ -216,7 +216,7 @@ static WINECRYPT_CERTSTORE *CRYPT_CreateFileStore(DWORD dwFlags, HCERTSTORE memStore, HANDLE file, DWORD type) { WINECRYPT_CERTSTORE *store = NULL; - PWINE_FILESTOREINFO info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); + WINE_FILESTOREINFO *info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); if (info) {

1 0

Jacek Caban : crypt32: Get rid of P*_CONTEXT typedefs.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: f4c8c3d69ccf93b7d8e9e89ab8c2c51bd760155f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c8c3d69ccf93b7d8e9e89ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:39:34 2013 +0200 crypt32: Get rid of P*_CONTEXT typedefs. --- dlls/crypt32/context.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index a8d47f2..c5f609b 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -35,24 +35,24 @@ typedef struct _BASE_CONTEXT { LONG ref; ContextType type; -} BASE_CONTEXT, *PBASE_CONTEXT; +} BASE_CONTEXT; typedef struct _DATA_CONTEXT { LONG ref; ContextType type; /* always ContextTypeData */ CONTEXT_PROPERTY_LIST *properties; -} DATA_CONTEXT, *PDATA_CONTEXT; +} DATA_CONTEXT; typedef struct _LINK_CONTEXT { LONG ref; ContextType type; /* always ContextTypeLink */ - PBASE_CONTEXT linked; -} LINK_CONTEXT, *PLINK_CONTEXT; + BASE_CONTEXT *linked; +} LINK_CONTEXT; #define CONTEXT_FROM_BASE_CONTEXT(p, s) ((LPBYTE)(p) - (s)) -#define BASE_CONTEXT_FROM_CONTEXT(p, s) (PBASE_CONTEXT)((LPBYTE)(p) + (s)) +#define BASE_CONTEXT_FROM_CONTEXT(p, s) (BASE_CONTEXT*)((LPBYTE)(p) + (s)) void *Context_CreateDataContext(size_t contextSize) { @@ -60,7 +60,7 @@ void *Context_CreateDataContext(size_t contextSize) if (ret) { - PDATA_CONTEXT context = (PDATA_CONTEXT)((LPBYTE)ret + contextSize); + DATA_CONTEXT *context = (DATA_CONTEXT*)((LPBYTE)ret + contextSize); context->ref = 1; context->type = ContextTypeData; @@ -84,9 +84,9 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned if (context) { - PLINK_CONTEXT linkContext = (PLINK_CONTEXT)BASE_CONTEXT_FROM_CONTEXT( + LINK_CONTEXT *linkContext = (LINK_CONTEXT*)BASE_CONTEXT_FROM_CONTEXT( context, contextSize); - PBASE_CONTEXT linkedBase = BASE_CONTEXT_FROM_CONTEXT(linked, + BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linked, contextSize); memcpy(context, linked, contextSize); @@ -103,14 +103,14 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned void Context_AddRef(void *context, size_t contextSize) { - PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); InterlockedIncrement(&baseContext->ref); TRACE("%p's ref count is %d\n", context, baseContext->ref); if (baseContext->type == ContextTypeLink) { void *linkedContext = Context_GetLinkedContext(context, contextSize); - PBASE_CONTEXT linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, + BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, contextSize); /* Add-ref the linked contexts too */ @@ -141,7 +141,7 @@ void Context_AddRef(void *context, size_t contextSize) void *Context_GetExtra(const void *context, size_t contextSize) { - PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); assert(baseContext->type == ContextTypeLink); return (LPBYTE)baseContext + sizeof(LINK_CONTEXT); @@ -149,27 +149,25 @@ void *Context_GetExtra(const void *context, size_t contextSize) void *Context_GetLinkedContext(void *context, size_t contextSize) { - PBASE_CONTEXT baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); assert(baseContext->type == ContextTypeLink); - return CONTEXT_FROM_BASE_CONTEXT(((PLINK_CONTEXT)baseContext)->linked, - contextSize); + return CONTEXT_FROM_BASE_CONTEXT(((LINK_CONTEXT*)baseContext)->linked, contextSize); } CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) { - PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); while (ptr && ptr->type == ContextTypeLink) - ptr = ((PLINK_CONTEXT)ptr)->linked; - return (ptr && ptr->type == ContextTypeData) ? - ((PDATA_CONTEXT)ptr)->properties : NULL; + ptr = ((LINK_CONTEXT*)ptr)->linked; + return (ptr && ptr->type == ContextTypeData) ? ((DATA_CONTEXT*)ptr)->properties : NULL; } BOOL Context_Release(void *context, size_t contextSize, ContextFreeFunc dataContextFree) { - PBASE_CONTEXT base = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *base = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); BOOL ret = TRUE; if (base->ref <= 0) @@ -183,7 +181,7 @@ BOOL Context_Release(void *context, size_t contextSize, * it as well, using the same offset and data free function. */ ret = Context_Release(CONTEXT_FROM_BASE_CONTEXT( - ((PLINK_CONTEXT)base)->linked, contextSize), contextSize, + ((LINK_CONTEXT*)base)->linked, contextSize), contextSize, dataContextFree); } if (InterlockedDecrement(&base->ref) == 0) @@ -191,7 +189,7 @@ BOOL Context_Release(void *context, size_t contextSize, TRACE("freeing %p\n", context); if (base->type == ContextTypeData) { - ContextPropertyList_Free(((PDATA_CONTEXT)base)->properties); + ContextPropertyList_Free(((DATA_CONTEXT*)base)->properties); dataContextFree(context); } CryptMemFree(context);

1 0

Jacek Caban : crypt32: Get rid of PCONTEXT_PROPERTY_LIST typedef.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: d8c3ccee287880e8fb3be617063c0dacf8748b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c3ccee287880e8fb3be6170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:38:36 2013 +0200 crypt32: Get rid of PCONTEXT_PROPERTY_LIST typedef. --- dlls/crypt32/cert.c | 8 ++++---- dlls/crypt32/context.c | 6 +++--- dlls/crypt32/crl.c | 6 +++--- dlls/crypt32/crypt32_private.h | 23 +++++++++++------------ dlls/crypt32/ctl.c | 7 +++---- dlls/crypt32/msg.c | 2 +- dlls/crypt32/proplist.c | 21 ++++++++++----------- 7 files changed, 35 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c3ccee287880e8fb3be…

1 0

Nikolay Sivov : po: Tweak Russian strings for winecfg.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: b790abe9c6ac0e6c9a206b26ed8c4d5f82afaf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b790abe9c6ac0e6c9a206b26e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 11:17:49 2013 +0400 po: Tweak Russian strings for winecfg. --- po/ru.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3bb7397..d0db94e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12633,8 +12633,8 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Wine может имитировать различные версии Windows для каждого приложения " -"отдельно. Эта вкладка связана с вкладками Библиотеки и Графика, что " -"позволяет изменение настроек в этих вкладках как для определённого " +"отдельно. Эта вкладка связана со вкладками Библиотеки и Графика, что " +"позволяет изменять настройки в этих вкладках как для определённого " "приложения, так и глобально." #: winecfg.rc:150 @@ -12671,7 +12671,7 @@ msgstr "&Эмулировать виртуальный рабочий стол" #: winecfg.rc:166 msgid "Desktop &size:" -msgstr "Размер рабочего стола:" +msgstr "&Рабочий стол:" #: winecfg.rc:171 msgid "Screen resolution" @@ -12679,7 +12679,7 @@ msgstr "Разрешение экрана" #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" -msgstr "Пример текста (This is a sample text), шрифт Tahoma 10 пунктов" +msgstr "Пример текста, шрифт Tahoma 10 пунктов" #: winecfg.rc:182 msgid "DLL overrides" @@ -12764,7 +12764,7 @@ msgstr "&Путь:" #: winecfg.rc:239 winecfg.rc:35 msgid "Show &Advanced" -msgstr "Показать &дополнительные" +msgstr "&Дополнительно" #: winecfg.rc:240 msgid "De&vice:" @@ -12892,7 +12892,7 @@ msgstr "Выберите файл с темой" #: winecfg.rc:45 msgid "Folder" -msgstr "Стандартные папки" +msgstr "Папка" #: winecfg.rc:46 msgid "Links to"

1 0

Henri Verbeet : d3dx9: Avoid LPVOID.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 871967d0fb4c3695cabd13a8669b513b5085c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=871967d0fb4c3695cabd13a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:46 2013 +0200 d3dx9: Avoid LPVOID. --- dlls/d3dx9_36/core.c | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 2 +- dlls/d3dx9_36/effect.c | 12 +++++-- dlls/d3dx9_36/line.c | 6 ++-- dlls/d3dx9_36/mesh.c | 65 ++++++++++++++++++------------------- dlls/d3dx9_36/shader.c | 8 ++-- dlls/d3dx9_36/tests/mesh.c | 8 ++-- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/d3dx9_36/texture.c | 9 +++-- dlls/d3dx9_36/util.c | 2 +- include/d3dx9anim.h | 26 +++++++------- include/d3dx9core.h | 14 ++++---- include/d3dx9effect.h | 16 +++++----- include/d3dx9math.h | 2 +- include/d3dx9mesh.h | 44 +++++++++++++------------- include/d3dx9shader.h | 4 +- include/d3dx9tex.h | 6 ++- include/d3dx9xof.h | 15 +++++---- 19 files changed, 126 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=871967d0fb4c3695cabd1…

1 0

Henri Verbeet : wined3d: Use clamp() instead of max() for calculating the clamped cosine in the ffp lighting calculations.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: ff6ce4c669ac901abdc9664d891b4b6d044df295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6ce4c669ac901abdc9664d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 4 08:56:43 2013 +0200 wined3d: Use clamp() instead of max() for calculating the clamped cosine in the ffp lighting calculations. On typical hardware, the clamp() would be an instruction modifier, while the max() would need an extra instruction. --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 740e100..280ec20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4940,7 +4940,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (!settings->normal) break; shader_addline(buffer, "dir = normalize(dir);\n"); - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) / att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); @@ -4965,7 +4965,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer shader_addline(buffer, "ambient += gl_LightSource[%u].ambient.xyz * att;\n", i); if (!settings->normal) break; - shader_addline(buffer, "diffuse += (max(0.0, dot(dir, normal))" + shader_addline(buffer, "diffuse += (clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz) * att;\n", i); if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); @@ -4980,7 +4980,8 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (!settings->normal) break; shader_addline(buffer, "dir = normalize(gl_LightSource[%u].position.xyz);\n", i); - shader_addline(buffer, "diffuse += max(0.0, dot(dir, normal)) * gl_LightSource[%u].diffuse.xyz;\n", i); + shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" + " * gl_LightSource[%u].diffuse.xyz;\n", i); shader_addline(buffer, "t = dot(normal, gl_LightSource[%u].halfVector.xyz);\n", i); shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular;\n", i);

1 0

Nikolay Sivov : ntdll: Added support for multiple progids in comClass and clrClass elements.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: af3a20d2ea493fa5c0d0516db5bb48309b218fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3a20d2ea493fa5c0d0516db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 4 09:47:32 2013 +0400 ntdll: Added support for multiple progids in comClass and clrClass elements. --- dlls/kernel32/tests/actctx.c | 18 ++++++++- dlls/ntdll/actctx.c | 80 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8d2f352..b689d30 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -113,7 +113,14 @@ static const char manifest3[] = " miscStatusContent=\"insideout\"" " miscStatusThumbnail=\"alignable\"" " miscStatusDocPrint=\"simpleframe,setclientsitefirst\"" -" />" +" >" +" <progid>ProgId.ProgId.1</progid>" +" <progid>ProgId.ProgId.2</progid>" +" <progid>ProgId.ProgId.3</progid>" +" <progid>ProgId.ProgId.4</progid>" +" <progid>ProgId.ProgId.5</progid>" +" <progid>ProgId.ProgId.6</progid>" +" </comClass>" " <comInterfaceProxyStub " " name=\"Iifaceps\"" " tlbid=\"{99999999-8888-7777-6666-555555555558}\"" @@ -152,7 +159,14 @@ static const char manifest3[] = " tlbid=\"{99999999-8888-7777-6666-555555555555}\"" " runtimeVersion=\"1.2.3.4\"" " threadingModel=\"Neutral\"" -" />" +" >" +" <progid>clrprogid.1</progid>" +" <progid>clrprogid.2</progid>" +" <progid>clrprogid.3</progid>" +" <progid>clrprogid.4</progid>" +" <progid>clrprogid.5</progid>" +" <progid>clrprogid.6</progid>" +" </clrClass>" "</assembly>"; static const char manifest_wndcls1[] = diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f652c18..2ce7715 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5,6 +5,7 @@ * Copyright 2007 Eric Pouech * Copyright 2007 Jacek Caban for CodeWeavers * Copyright 2007 Alexandre Julliard + * Copyright 2013 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -368,6 +369,13 @@ struct clrsurrogate_data no modules part as it belongs to assembly level, not a file. */ +struct progids +{ + WCHAR **progids; + unsigned int num; + unsigned int allocated; +}; + struct entity { DWORD kind; @@ -394,6 +402,7 @@ struct entity DWORD miscstatusthumbnail; DWORD miscstatusicon; DWORD miscstatusdocprint; + struct progids progids; } comclass; struct { WCHAR *iid; @@ -777,7 +786,7 @@ static struct entity* add_entity(struct entity_array *array, DWORD kind) static void free_entity_array(struct entity_array *array) { - unsigned int i; + unsigned int i, j; for (i = 0; i < array->num; i++) { struct entity *entity = &array->base[i]; @@ -789,6 +798,9 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progid); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.version); + for (j = 0; j < entity->u.comclass.progids.num; j++) + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progids.progids[j]); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progids.progids); break; case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.iid); @@ -1372,10 +1384,44 @@ static DWORD parse_com_class_misc(const xmlstr_t *value) return flags; } +static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) +{ + struct progids *progids = &entity->u.comclass.progids; + + if (progids->allocated == 0) + { + progids->allocated = 4; + if (!(progids->progids = RtlAllocateHeap(GetProcessHeap(), 0, progids->allocated * sizeof(WCHAR*)))) return FALSE; + } + + if (progids->allocated == progids->num) + { + progids->allocated *= 2; + progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + } + + if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE; + progids->num++; + + return TRUE; +} + +static BOOL parse_com_class_progid(xmlbuf_t* xmlbuf, struct entity *entity) +{ + xmlstr_t content; + BOOL end = FALSE; + + if (!parse_expect_no_attr(xmlbuf, &end) || end || !parse_text_content(xmlbuf, &content)) + return FALSE; + + if (!com_class_add_progid(&content, entity)) return FALSE; + return parse_expect_end_elem(xmlbuf, progidW, asmv1W); +} + static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader *acl) { xmlstr_t elem, attr_name, attr_value; - BOOL ret, end = FALSE, error; + BOOL ret = TRUE, end = FALSE, error; struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) @@ -1431,13 +1477,17 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, str if (end) return TRUE; - while ((ret = next_xml_elem(xmlbuf, &elem))) + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { if (xmlstr_cmp_end(&elem, comClassW)) { ret = parse_end_element(xmlbuf); break; } + else if (xmlstr_cmp(&elem, progidW)) + { + ret = parse_com_class_progid(xmlbuf, entity); + } else { WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); @@ -1797,8 +1847,8 @@ static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + xmlstr_t attr_name, attr_value, elem; + BOOL end = FALSE, error, ret = TRUE; struct entity* entity; entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); @@ -1837,7 +1887,25 @@ static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly) } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, clrClassW, asmv1W); + + while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, clrClassW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else if (xmlstr_cmp(&elem, progidW)) + { + ret = parse_com_class_progid(xmlbuf, entity); + } + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + return ret; } static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl)

1 0

Bruno Jesus : ws2_32: Merge protocol.c and socket.c.
by Alexandre Julliard Sept. 4, 2013

Sept. 4, 2013

Module: wine Branch: master Commit: 03362e5a3dcc3a7dff8c5ba45c299a16ed3e3a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03362e5a3dcc3a7dff8c5ba45… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 3 22:51:58 2013 -0300 ws2_32: Merge protocol.c and socket.c. --- dlls/ws2_32/Makefile.in | 1 - dlls/ws2_32/protocol.c | 324 ----------------------------------------------- dlls/ws2_32/socket.c | 274 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 274 insertions(+), 325 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03362e5a3dcc3a7dff8c5…

1 0