September 2013 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the SFLAG_INTEXTURE / SFLAG_INSRGBTEX check in surface_set_texture_name().
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 7859509f5b09ee2184c8c9e971ebeb92eec80fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7859509f5b09ee2184c8c9e97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:40 2013 +0200 wined3d: Get rid of the SFLAG_INTEXTURE / SFLAG_INSRGBTEX check in surface_set_texture_name(). --- dlls/wined3d/surface.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e36f61d..011be7a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1709,36 +1709,15 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_unmap, }; -void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, BOOL srgb) +void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb) { - GLuint *name; - DWORD flag; + TRACE("surface %p, name %u, srgb %#x.\n", surface, name, srgb); - TRACE("surface %p, new_name %u, srgb %#x.\n", surface, new_name, srgb); - - if(srgb) - { - name = &surface->texture_name_srgb; - flag = SFLAG_INSRGBTEX; - } + if (srgb) + surface->texture_name_srgb = name; else - { - name = &surface->texture_name; - flag = SFLAG_INTEXTURE; - } - - if (!*name && new_name) - { - /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the - * surface has no texture name yet. See if we can get rid of this. */ - if (surface->flags & flag) - { - ERR("Surface has %s set, but no texture name.\n", debug_surflocation(flag)); - surface_modify_location(surface, flag, FALSE); - } - } + surface->texture_name = name; - *name = new_name; surface_force_reload(surface); }

1 0

Jacek Caban : crypt32: Search world collection when looking for issuer.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 0e0d51ae85ee21d03654fbd06e083bbe4509a9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0d51ae85ee21d03654fbd06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:08:49 2013 +0200 crypt32: Search world collection when looking for issuer. --- dlls/crypt32/chain.c | 62 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index fbfe3a5..4a8933b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1971,8 +1971,37 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); } -static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, - PCCERT_CONTEXT prevIssuer, DWORD *infoStatus) +static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, + HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) +{ + PCCERT_CONTEXT issuer; + + issuer = CertFindCertificateInStore(store, cert->dwCertEncodingType, 0, type, para, prev_issuer); + if(issuer) { + TRACE("Found in store %p\n", issuer); + return issuer; + } + + /* FIXME: For alternate issuers, we don't search world store nor try to retrieve issuer from URL. + * This needs more tests. + */ + if(prev_issuer) + return NULL; + + if(engine->hWorld) { + issuer = CertFindCertificateInStore(engine->hWorld, cert->dwCertEncodingType, 0, type, para, NULL); + if(issuer) { + TRACE("Found in world %p\n", issuer); + return issuer; + } + } + + return NULL; +} + +static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, + HCERTSTORE store, PCCERT_CONTEXT subject, PCCERT_CONTEXT prevIssuer, + DWORD *infoStatus) { PCCERT_CONTEXT issuer = NULL; PCERT_EXTENSION ext; @@ -2000,9 +2029,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, sizeof(CERT_NAME_BLOB)); memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by issuer/serial number\n"); @@ -2012,10 +2040,9 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, else if (info->KeyId.cbData) { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2059,9 +2086,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, memcpy(&id.u.IssuerSerialNumber.SerialNumber, &info->AuthorityCertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by directory name\n"); @@ -2075,9 +2101,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, { id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, - prevIssuer); + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_CERT_ID, &id, prevIssuer); if (issuer) { TRACE_(chain)("issuer found by key id\n"); @@ -2089,8 +2113,7 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, } else { - issuer = CertFindCertificateInStore(store, - subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, + issuer = CRYPT_FindIssuer(engine, subject, store, CERT_FIND_SUBJECT_NAME, &subject->pCertInfo->Issuer, prevIssuer); TRACE_(chain)("issuer found by name\n"); *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; @@ -2110,7 +2133,7 @@ static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL, + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(engine, world, cert, NULL, &chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus); if (issuer) @@ -2187,8 +2210,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, /* FIXME: only simple chains are supported for now, as CTLs aren't * supported yet. */ - if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, - &simpleChain))) + if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) { CertificateChain *chain = CryptMemAlloc(sizeof(CertificateChain)); @@ -2393,7 +2415,7 @@ static CertificateChain *CRYPT_BuildAlternateContextFromChain( PCCERT_CONTEXT prevIssuer = CertDuplicateCertificateContext( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); - alternateIssuer = CRYPT_GetIssuer(prevIssuer->hCertStore, + alternateIssuer = CRYPT_GetIssuer(engine, prevIssuer->hCertStore, subject, prevIssuer, &infoStatus); } if (alternateIssuer)

1 0

Nikolay Sivov : user32/tests: Test to show that SendMessage/PostMessage don 't force caller activation context on window thread.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 47650c3320ae18440cad402c125c203b4cf54319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47650c3320ae18440cad402c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 6 14:48:56 2013 +0400 user32/tests: Test to show that SendMessage/PostMessage don't force caller activation context on window thread. --- dlls/user32/tests/msg.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3a857e8..87e2817 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -60,6 +60,20 @@ #define WM_LBTRACKPOINT 0x0131 #endif +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + +static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); +static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); +static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); +static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static void (WINAPI *pReleaseActCtx)(HANDLE); + /* encoded DRAWITEMSTRUCT into an LPARAM */ typedef struct { @@ -6728,9 +6742,66 @@ static DWORD CALLBACK create_child_thread( void *param ) return 0; } +static const char manifest_dep[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep1\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" +" <file name=\"testdep.dll\" />" +"</assembly>"; + +static const char manifest_main[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\" />" +"<dependency>" +" <dependentAssembly>" +" <assemblyIdentity type=\"win32\" name=\"testdep1\" version=\"1.2.3.4\" processorArchitecture=\"" ARCH "\" />" +" </dependentAssembly>" +"</dependency>" +"</assembly>"; + +static void create_manifest_file(const char *filename, const char *manifest) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + DWORD size; + + MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + WriteFile(file, manifest, strlen(manifest), &size, NULL); + CloseHandle(file); +} + +static HANDLE test_create(const char *file) +{ + WCHAR path[MAX_PATH]; + ACTCTXW actctx; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, file, -1, path, MAX_PATH); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + handle = pCreateActCtxW(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "failed to create context, error %u\n", GetLastError()); + + ok(actctx.cbSize == sizeof(actctx), "cbSize=%d\n", actctx.cbSize); + ok(actctx.dwFlags == 0, "dwFlags=%d\n", actctx.dwFlags); + ok(actctx.lpSource == path, "lpSource=%p\n", actctx.lpSource); + ok(actctx.wProcessorArchitecture == 0, "wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); + ok(actctx.wLangId == 0, "wLangId=%d\n", actctx.wLangId); + ok(actctx.lpAssemblyDirectory == NULL, "lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); + ok(actctx.lpResourceName == NULL, "lpResourceName=%p\n", actctx.lpResourceName); + ok(actctx.lpApplicationName == NULL, "lpApplicationName=%p\n", actctx.lpApplicationName); + ok(actctx.hModule == NULL, "hModule=%p\n", actctx.hModule); + + return handle; +} + static void test_interthread_messages(void) { - HANDLE hThread; + HANDLE hThread, context, handle, event; + ULONG_PTR cookie; DWORD tid; WNDPROC proc; MSG msg; @@ -6828,6 +6899,60 @@ static void test_interthread_messages(void) ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); + + /* activation context tests */ + if (!pActivateActCtx) + { + win_skip("Activation contexts are not supported, skipping\n"); + return; + } + + create_manifest_file("testdep1.manifest", manifest_dep); + create_manifest_file("main.manifest", manifest_main); + + context = test_create("main.manifest"); + DeleteFileA("testdep1.manifest"); + DeleteFileA("main.manifest"); + + handle = (void*)0xdeadbeef; + ret = pGetCurrentActCtx(&handle); + ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(handle == 0, "active context %p\n", handle); + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + /* context is activated after thread creation, so it doesn't inherit it by default */ + ret = pActivateActCtx(context, &cookie); + ok(ret, "activation failed: %u\n", GetLastError()); + + handle = 0; + ret = pGetCurrentActCtx(&handle); + ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); + ok(handle != 0, "active context %p\n", handle); + + /* destination window will test for active context */ + ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0); + ok(ret, "thread window returned %d\n", ret); + + event = CreateEventW(NULL, 0, 0, NULL); + ret = PostMessageA(wnd_event.hwnd, WM_USER+10, 0, (LPARAM)event); + ok(ret, "thread window returned %d\n", ret); + ok(WaitForSingleObject(event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(event); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); + + ret = pDeactivateActCtx(0, cookie); + ok(ret, "DeactivateActCtx failed: %u\n", GetLastError()); + pReleaseActCtx(context); } @@ -7463,6 +7588,19 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_NCHITTEST: return HTCLIENT; + case WM_USER+10: + { + HANDLE handle, event = (HANDLE)lParam; + BOOL ret; + + handle = (void*)0xdeadbeef; + ret = pGetCurrentActCtx(&handle); + ok(ret, "failed to get current context, %u\n", GetLastError()); + ok(handle == 0, "got active context %p\n", handle); + if (event) SetEvent(event); + return 1; + } + /* ignore */ case WM_MOUSEMOVE: case WM_MOUSEACTIVATE: @@ -14105,6 +14243,19 @@ static void test_layered_window(void) DeleteObject( bmp ); } +static void init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandle("kernel32"); + +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(ActivateActCtx); + X(CreateActCtxW); + X(DeactivateActCtx); + X(GetCurrentActCtx); + X(ReleaseActCtx); +#undef X +} + START_TEST(msg) { char **test_argv; @@ -14112,8 +14263,11 @@ START_TEST(msg) BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + int argc; + + init_funcs(); - int argc = winetest_get_mainargs( &test_argv ); + argc = winetest_get_mainargs( &test_argv ); if (argc >= 3) { unsigned int arg;

1 0

Dmitry Timoshkov : ntdll/tests: Add some tests for negative file offsets.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: a4ec0593547920a9bb13b799d3f3795278efba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ec0593547920a9bb13b799d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 6 17:03:03 2013 +0900 ntdll/tests: Add some tests for negative file offsets. --- dlls/ntdll/tests/file.c | 181 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 168 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ec0593547920a9bb13b…

1 0

Henri Verbeet : d3drm: Avoid LPCSTR.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 75deeb458989e01c6c83496c4519d7962d44ea7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75deeb458989e01c6c83496c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:43 2013 +0200 d3drm: Avoid LPCSTR. --- dlls/d3drm/d3drm.c | 36 +++++++-------------- dlls/d3drm/device.c | 18 ++++------- dlls/d3drm/face.c | 12 ++----- dlls/d3drm/frame.c | 22 +++++-------- dlls/d3drm/light.c | 6 +-- dlls/d3drm/material.c | 4 +- dlls/d3drm/meshbuilder.c | 27 +++++++---------- dlls/d3drm/texture.c | 26 +++++++-------- dlls/d3drm/viewport.c | 12 ++----- include/d3drm.h | 12 ++++---- include/d3drmdef.h | 7 ++-- include/d3drmobj.h | 76 +++++++++++++++++++++++----------------------- include/d3drmwin.h | 2 +- 13 files changed, 110 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75deeb458989e01c6c834…

1 0

Henri Verbeet : wined3d: Return 1 instead of 0 for max_vertex_blend_matrices in glsl_vertex_pipe_vp_get_caps ().
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 137590be3106c0589947c09ba0a626349e2e4a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=137590be3106c0589947c09ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:39 2013 +0200 wined3d: Return 1 instead of 0 for max_vertex_blend_matrices in glsl_vertex_pipe_vp_get_caps(). It's not necessarily clear to me that one is better than the other here, but this is what we returned in the old GL fixed function implementation of the D3D fixed function vertex pipe, and apparently EverQuest depends on this. This fixes a regression introduced by commit 2014141a253a791fc9c79aae3c8ef3c35b73e658. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0dd0197..37661d3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6808,7 +6808,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, { caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; - caps->max_vertex_blend_matrices = 0; + caps->max_vertex_blend_matrices = 1; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN | WINED3DVTXPCAPS_MATERIALSOURCE7

1 0

Frédéric Delanoy : loader: Mention builtin executables in wine manpage.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: ee771fddaacfdcc3d33b8cb46ac1f638b353b3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee771fddaacfdcc3d33b8cb46… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 17:14:36 2013 +0200 loader: Mention builtin executables in wine manpage. --- loader/wine.man.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 6b60000..f5647a3 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -53,6 +53,10 @@ a shell, e.g. .PP wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe .PP +It can also be one of the Windows executables shipped with Wine, in +which case specifying the full path is not mandatory, e.g. \fIwine +explorer\fR or \fIwine notepad\fR. +.PP .SH ENVIRONMENT .B wine makes the environment variables of the shell from which it

1 0

Jacek Caban : crypt32: Added support for retrieving issuers from URL cache.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: wine Branch: master Commit: 9dd32ba67dbb3918b3cdb3f1baf23a85c134aa40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd32ba67dbb3918b3cdb3f1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 6 13:08:59 2013 +0200 crypt32: Added support for retrieving issuers from URL cache. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/chain.c | 48 +++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/chain.c | 2 + 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 9c85a47..f84ecf4 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -D_CRYPT32_ MODULE = crypt32.dll IMPORTLIB = crypt32 IMPORTS = user32 advapi32 +DELAYIMPORTS = cryptnet EXTRALIBS = @SECURITYLIB@ C_SRCS = \ diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4a8933b..bbd0aca 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1974,7 +1974,10 @@ static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, const CERT_CONTEXT *cert, HCERTSTORE store, DWORD type, void *para, PCCERT_CONTEXT prev_issuer) { + CRYPT_URL_ARRAY *urls; PCCERT_CONTEXT issuer; + DWORD size; + BOOL res; issuer = CertFindCertificateInStore(store, cert->dwCertEncodingType, 0, type, para, prev_issuer); if(issuer) { @@ -1996,7 +1999,50 @@ static PCCERT_CONTEXT CRYPT_FindIssuer(const CertificateChainEngine *engine, con } } - return NULL; + res = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, (void*)cert, 0, NULL, &size, NULL, NULL, NULL); + if(!res) + return NULL; + + urls = HeapAlloc(GetProcessHeap(), 0, size); + if(!urls) + return NULL; + + res = CryptGetObjectUrl(URL_OID_CERTIFICATE_ISSUER, (void*)cert, 0, urls, &size, NULL, NULL, NULL); + if(res) + { + CERT_CONTEXT *new_cert; + HCERTSTORE new_store; + unsigned i; + + for(i=0; i < urls->cUrl; i++) + { + TRACE("Trying URL %s\n", debugstr_w(urls->rgwszUrl[i])); + + res = CryptRetrieveObjectByUrlW(urls->rgwszUrl[i], CONTEXT_OID_CERTIFICATE, + CRYPT_CACHE_ONLY_RETRIEVAL /* FIXME */, + 0, (void**)&new_cert, NULL, NULL, NULL, NULL); + if(!res) + { + TRACE("CryptRetrieveObjectByUrlW failed: %u\n", GetLastError()); + continue; + } + + /* FIXME: Use new_cert->hCertStore once cert ref count bug is fixed. */ + new_store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + CertAddCertificateContextToStore(new_store, new_cert, CERT_STORE_ADD_NEW, NULL); + issuer = CertFindCertificateInStore(new_store, cert->dwCertEncodingType, 0, type, para, NULL); + CertFreeCertificateContext(new_cert); + CertCloseStore(new_store, 0); + if(issuer) + { + TRACE("Found downloaded issuer %p\n", issuer); + break; + } + } + } + + HeapFree(GetProcessHeap(), 0, urls); + return issuer; } static PCCERT_CONTEXT CRYPT_GetIssuer(const CertificateChainEngine *engine, diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a89c636..96eafa2 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4005,6 +4005,7 @@ static void testGetCertChain(void) } ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + todo_wine ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, "chain->TrustStatus.dwInfoStatus = %x\n", chain->TrustStatus.dwInfoStatus); @@ -4016,6 +4017,7 @@ static void testGetCertChain(void) ok(simple_chain->cbSize == sizeof(*simple_chain), "simple_chain->cbSize = %u\n", simple_chain->cbSize); ok(!simple_chain->TrustStatus.dwErrorStatus, "simple_chain->TrustStatus.dwErrorStatus = %x\n", simple_chain->TrustStatus.dwErrorStatus); + todo_wine ok(simple_chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, "simple_chain->TrustStatus.dwInfoStatus = %x\n", simple_chain->TrustStatus.dwInfoStatus); ok(simple_chain->cElement == 3, "simple_chain->cElement = %u\n", simple_chain->cElement);

1 0

Frédéric Delanoy : winedev: Use appropriate tags for code excerpts.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: docs Branch: master Commit: 828e4b06f1a6eec1deacf6d1552811cfd31a6130 URL: http://source.winehq.org/git/docs.git/?a=commit;h=828e4b06f1a6eec1deacf6d15… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 22:56:49 2013 +0200 winedev: Use appropriate tags for code excerpts. --- en/winedev-architecture.sgml | 2 +- en/winedev-coding.sgml | 34 +++++++++++++++--------------- en/winedev-ddraw.sgml | 2 +- en/winedev-debugger.sgml | 20 +++++++++--------- en/winedev-debugging.sgml | 14 ++++++------ en/winedev-kernel.sgml | 6 ++-- en/winedev-ole.sgml | 8 +++--- en/winedev-opengl.sgml | 2 +- en/winedev-otherdebug.sgml | 45 ++++++++++++++++++++--------------------- en/winedev-testing.sgml | 22 ++++++++++---------- en/winedev-windowing.sgml | 14 ++++++------ 11 files changed, 84 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=828e4b06f1a6eec1deacf…

1 0

Frédéric Delanoy : winedev: Assorted tagging fixes.
by Alexandre Julliard Sept. 6, 2013

Sept. 6, 2013

Module: docs Branch: master Commit: fca7cf10155ec4b668cbf66cc82e15073d25269e URL: http://source.winehq.org/git/docs.git/?a=commit;h=fca7cf10155ec4b668cbf66cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 22:56:50 2013 +0200 winedev: Assorted tagging fixes. --- en/winedev-architecture.sgml | 3 +- en/winedev-debugger.sgml | 3 +- en/winedev-debugging.sgml | 4 +- en/winedev-documentation.sgml | 2 +- en/winedev-kernel.sgml | 70 +++++++++++++++++++++++++--------------- en/winedev-opengl.sgml | 4 +- en/winedev-testing.sgml | 8 ++-- 7 files changed, 56 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=fca7cf10155ec4b668cbf…

1 0