October 2007 - Wine-commits

Juan Lang : wintrust: Improve SoftpubLoadMessage for WTD_CHOICE_CERT.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 5fa5518641755ca6e00f8ea1d5136b89b38a580b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa5518641755ca6e00f8ea1d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 12:44:27 2007 -0700 wintrust: Improve SoftpubLoadMessage for WTD_CHOICE_CERT. --- dlls/wintrust/softpub.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index a9b5464..59e4966 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -268,8 +268,38 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) switch (data->pWintrustData->dwUnionChoice) { case WTD_CHOICE_CERT: - /* Do nothing!? See the tests */ - ret = TRUE; + if (data->pWintrustData->u.pCert && + data->pWintrustData->u.pCert->cbStruct == sizeof(WINTRUST_CERT_INFO)) + { + if (data->psPfns) + { + CRYPT_PROVIDER_SGNR signer = { sizeof(signer), { 0 } }; + DWORD i; + + /* Add empty signer, so we can add a cert to it */ + ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, 0, &signer); + if (!ret) + goto error; + ret = data->psPfns->pfnAddCert2Chain(data, 0, FALSE, 0, + data->pWintrustData->u.pCert->psCertContext); + if (!ret) + goto error; + for (i = 0; ret && i < data->pWintrustData->u.pCert->chStores; + i++) + ret = data->psPfns->pfnAddStore2Chain(data, + data->pWintrustData->u.pCert->pahStores[i]); + } + else + { + /* Do nothing!? See the tests */ + ret = TRUE; + } + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } break; case WTD_CHOICE_FILE: if (!data->pWintrustData->u.pFile) @@ -305,6 +335,8 @@ error: if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError(); + TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); return ret ? S_OK : S_FALSE; }

1 0

Alexandre Julliard : msvcirt: Added stub implementation of msvcirt.dll.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 455a4994d543456a9e7f8c9c2c95076e5aaefbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=455a4994d543456a9e7f8c9c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 20:43:43 2007 +0200 msvcirt: Added stub implementation of msvcirt.dll. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/msvcirt/Makefile.in | 13 ++ dlls/msvcirt/msvcirt.c | 38 ++++ dlls/msvcirt/msvcirt.spec | 445 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 503 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=455a4994d543456a9e7f8…

1 0

Maarten Lankhorst : gdi32: Fix meaning and use of bidirectionality flags.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 6b2a6a2bcf83a1eb1684ad44751d7f79bff1a4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2a6a2bcf83a1eb1684ad447… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Sep 27 10:41:58 2007 +0200 gdi32: Fix meaning and use of bidirectionality flags. --- dlls/gdi32/bidi.c | 29 ++++++++++------------------- dlls/gdi32/gdi_private.h | 6 ++++-- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 1bb38d8..87fe05a 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -1054,7 +1054,7 @@ BOOL BIDI_Reorder( { WORD *levels; WORD *chartype; - unsigned i, baselevel = 0, forcedir = 0, done; + unsigned i, baselevel = 0, done; TRACE("%s, %d, 0x%08x lpOutString=%p, lpOrder=%p\n", debugstr_wn(lpString, uCount), uCount, dwFlags, lpOutString, lpOrder); @@ -1081,14 +1081,8 @@ BOOL BIDI_Reorder( memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); - switch (dwWineGCP_Flags&WINE_GCPW_DIR_MASK) - { - /* force means initial level is set directly, - * loose means initial level is determined by first character that has a direction */ - case WINE_GCPW_FORCE_LTR: forcedir = L; break; - case WINE_GCPW_FORCE_RTL: forcedir = R; baselevel = 1; break; - default: break; - } + if (WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) + baselevel = 1; i = done = 0; while (done < uCount) @@ -1107,29 +1101,26 @@ BOOL BIDI_Reorder( default: continue; } - if (!forcedir) - { - if ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL) - baselevel = 1; - else baselevel = 0; + if ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL) + baselevel = 1; + else if ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_LTR) + baselevel = 0; + if (dwWineGCP_Flags & WINE_GCPW_LOOSE_MASK) for (j = 0; j < i; ++j) - { if (chartype[j] == L) { baselevel = 0; break; } - if (chartype[j] == R) + else if (chartype[j] == R) { baselevel = 1; break; } - } - } /* resolve explicit */ - resolveExplicit(baselevel, forcedir, chartype, levels, i, 0); + resolveExplicit(baselevel, N, chartype, levels, i, 0); /* resolve weak */ resolveWeak(baselevel, chartype, levels, i); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 421e7c5..2cf5203 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -373,14 +373,16 @@ typedef struct tagBITMAPOBJ /* Wine_GCPW Flags */ /* Directionality - - * LOOSE means that the paragraph dir is only set if there is no strong character. - * FORCE means override the characters in the paragraph. + * LOOSE means taking the directionality of the first strong character, if there is found one. + * FORCE means the paragraph direction is forced. (RLE/LRE) */ #define WINE_GCPW_FORCE_LTR 0 #define WINE_GCPW_FORCE_RTL 1 #define WINE_GCPW_LOOSE_LTR 2 #define WINE_GCPW_LOOSE_RTL 3 #define WINE_GCPW_DIR_MASK 3 +#define WINE_GCPW_LOOSE_MASK 2 + extern BOOL BIDI_Reorder( LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder );

1 0

Maarten Lankhorst : gdi32: Fix 3 tiny bugs in bidi.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 10834ee5c7000fe85a21aa07316539067c018668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10834ee5c7000fe85a21aa073… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Sep 28 16:22:15 2007 +0200 gdi32: Fix 3 tiny bugs in bidi. --- dlls/gdi32/bidi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 87fe05a..cac9453 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -1091,13 +1091,13 @@ BOOL BIDI_Reorder( classify(lpOutString + done, chartype, uCount - done); /* limit text to first block */ i = resolveParagraphs(chartype, uCount - done); - for (j = 0; j < i - 1; ++j) + for (j = 0; j < i; ++j) switch(chartype[j]) { case B: case S: case WS: - case ON: chartype[i] = N; + case ON: chartype[j] = N; default: continue; } @@ -1113,7 +1113,7 @@ BOOL BIDI_Reorder( baselevel = 0; break; } - else if (chartype[j] == R) + else if (chartype[j] == R || chartype[j] == AL) { baselevel = 1; break;

1 0

Dmitry Timoshkov : user32: WM_IME_SETCONTEXT messages are optional.
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 4830966498567e4bd6692a60332fd9108e5d34d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4830966498567e4bd6692a603… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Sep 29 00:22:37 2007 +0900 user32: WM_IME_SETCONTEXT messages are optional. --- dlls/user32/tests/msg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7f86c06..88c5228 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -261,14 +261,14 @@ static const struct message WmSwitchChild[] = { { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent|defwinproc }, /* in the 2nd MDI child */ - { WM_IME_SETCONTEXT, sent|wparam|defwinproc, 0 },/* in the 1st MDI child */ - { WM_IME_SETCONTEXT, sent|wparam, 1 }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 0 },/* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent },/* in the MDI client */ { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent },/* in the MDI client */ - { WM_IME_SETCONTEXT, sent|wparam, 0 }, /* in MDI client */ - { WM_IME_SETCONTEXT, sent|wparam|defwinproc, 1 }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ + { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, /* in the 1st MDI child */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, /* in the 1st MDI child */ { WM_MDIACTIVATE, sent|defwinproc },/* in the 1st MDI child */

1 0

Juan Lang : crypt32: Add a helper function to create a file store from an already-initialized memory store .
by Alexandre Julliard 01 Oct '07

01 Oct '07

Module: wine Branch: master Commit: 2373b8bc804c7bb8f4ab47fb5d91e01ebe5aeaec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2373b8bc804c7bb8f4ab47fb5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 08:37:17 2007 -0700 crypt32: Add a helper function to create a file store from an already-initialized memory store. --- dlls/crypt32/filestore.c | 57 +++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 63a7b6e..fc89c0a 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -99,8 +99,8 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, { case CERT_STORE_CTRL_RESYNC: CRYPT_EmptyStore(store->memStore); - CRYPT_ReadSerializedStoreFromFile(store->file, store); - ret = TRUE; + store->dirty = FALSE; + ret = CRYPT_ReadSerializedStoreFromFile(store->file, store->memStore); break; case CERT_STORE_CTRL_COMMIT: if (!(store->dwOpenFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG)) @@ -139,6 +139,30 @@ static void *fileProvFuncs[] = { CRYPT_FileControl, }; +static PWINECRYPT_CERTSTORE CRYPT_CreateFileStore(DWORD dwFlags, + HCERTSTORE memStore, HANDLE file) +{ + PWINECRYPT_CERTSTORE store = NULL; + PWINE_FILESTOREINFO info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); + + if (info) + { + CERT_STORE_PROV_INFO provInfo = { 0 }; + + info->dwOpenFlags = dwFlags; + info->memStore = memStore; + info->file = file; + info->dirty = FALSE; + provInfo.cbSize = sizeof(provInfo); + provInfo.cStoreProvFunc = sizeof(fileProvFuncs) / + sizeof(fileProvFuncs[0]); + provInfo.rgpvStoreProvFunc = fileProvFuncs; + provInfo.hStoreProv = info; + store = CRYPT_ProvCreateStore(dwFlags, memStore, &provInfo); + } + return store; +} + PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -168,7 +192,7 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, GetCurrentProcess(), &file, dwFlags & CERT_STORE_READONLY_FLAG ? GENERIC_READ : GENERIC_READ | GENERIC_WRITE, TRUE, 0)) { - PWINECRYPT_CERTSTORE memStore; + HCERTSTORE memStore; memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -176,28 +200,11 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, { if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) { - PWINE_FILESTOREINFO info = CryptMemAlloc( - sizeof(WINE_FILESTOREINFO)); - - if (info) - { - CERT_STORE_PROV_INFO provInfo = { 0 }; - - info->dwOpenFlags = dwFlags; - info->memStore = memStore; - info->file = file; - info->dirty = FALSE; - provInfo.cbSize = sizeof(provInfo); - provInfo.cStoreProvFunc = sizeof(fileProvFuncs) / - sizeof(fileProvFuncs[0]); - provInfo.rgpvStoreProvFunc = fileProvFuncs; - provInfo.hStoreProv = info; - store = CRYPT_ProvCreateStore(dwFlags, memStore, &provInfo); - /* File store doesn't need crypto provider, so close it */ - if (hCryptProv && - !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) - CryptReleaseContext(hCryptProv, 0); - } + store = CRYPT_CreateFileStore(dwFlags, memStore, file); + /* File store doesn't need crypto provider, so close it */ + if (hCryptProv && + !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) + CryptReleaseContext(hCryptProv, 0); } } }

1 0