November 2009 - Wine-commits

Rob Shearman : server: Extend get_token_user server call to also retrieve SIDs for the token' s owner or primary group.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: bd56916f90e68632993a7275fe30a55a7efa222a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd56916f90e68632993a7275f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 20:11:06 2009 +0000 server: Extend get_token_user server call to also retrieve SIDs for the token's owner or primary group. --- dlls/ntdll/nt.c | 51 ++++++++++++++++++++++------------------ include/wine/server_protocol.h | 17 +++++++------ server/protocol.def | 9 ++++--- server/request.h | 11 ++++---- server/token.c | 42 +++++++++++++++++++++++++------- server/trace.c | 15 ++++++----- 6 files changed, 89 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd56916f90e68632993a7…

1 0

Henri Verbeet : wined3d: Add a format table for basic format flags like WINED3DFMT_FLAG_FOURCC.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: db2273652d114341c61c3896bc5e6030a25687e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2273652d114341c61c3896b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:12 2009 +0100 wined3d: Add a format table for basic format flags like WINED3DFMT_FLAG_FOURCC. --- dlls/wined3d/utils.c | 185 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db2273652d114341c61c3…

1 0

Henri Verbeet : wined3d: WINED3DFMT_FLAG_GETDC is a basic format flag.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 7676c664314665fa4f7caa50e35d660b2ccdcd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7676c664314665fa4f7caa50e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:13 2009 +0100 wined3d: WINED3DFMT_FLAG_GETDC is a basic format flag. It has nothing to do with OpenGL, so shouldn't be in "gl_formats_template". This fixes a regression introduced by e1469961d42d0eb077d3fa0236de17b56bc51a56. --- dlls/wined3d/utils.c | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e2e6cb0..54b0fb7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -152,6 +152,17 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_MULTI2_ARGB8, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_G8R8_G8B8, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_R8G8_B8G8, WINED3DFMT_FLAG_FOURCC}, + {WINED3DFMT_P8_UINT, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B8G8R8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B4G4R4A4_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_B4G4R4X4_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_FLAG_GETDC}, + {WINED3DFMT_R8G8B8X8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHU, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_NVHS, WINED3DFMT_FLAG_FOURCC}, @@ -317,47 +328,40 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* Palettized formats */ {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, GL_RGBA, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_GETDC, + 0, ARB_FRAGMENT_PROGRAM}, {WINED3DFMT_P8_UINT, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_GETDC, + 0, EXT_PALETTED_TEXTURE}, /* Standard ARGB formats */ {WINED3DFMT_B8G8R8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B8G8R8A8_UNORM, GL_RGBA8, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B8G8R8X8_UNORM, GL_RGB8, GL_SRGB8_EXT, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B5G5R5A1_UNORM, GL_RGB5_A1, GL_RGB5_A1, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B4G4R4A4_UNORM, GL_RGBA4, GL_SRGB8_ALPHA8_EXT, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | - WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_B2G3R3_UNORM, GL_R3_G3_B2, GL_R3_G3_B2, 0, GL_RGB, GL_UNSIGNED_BYTE_3_3_2, @@ -369,7 +373,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3D_GL_EXT_NONE}, {WINED3DFMT_B4G4R4X4_UNORM, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_R10G10B10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, @@ -377,11 +381,11 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { WINED3D_GL_EXT_NONE}, {WINED3DFMT_R8G8B8A8_UNORM, GL_RGBA8, GL_RGBA8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_GETDC, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GL_RGBA16_EXT, GL_RGB, GL_UNSIGNED_SHORT,

1 0

Henri Verbeet : d3d8: Add a separate function for device initialization.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: fea466455b0060e8b259c9785ad84b62de1360dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea466455b0060e8b259c9785… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:14 2009 +0100 d3d8: Add a separate function for device initialization. --- dlls/d3d8/d3d8_private.h | 13 +---- dlls/d3d8/device.c | 104 ++++++++++++++++++++++++++++++++++++++- dlls/d3d8/directx.c | 121 +++++++--------------------------------------- 3 files changed, 121 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fea466455b0060e8b259c…

1 0

Henri Verbeet : d3d8: Move D3D8CB_DestroySwapChain() to device.c.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: e0525b663ee06d762b6263beecd63dcf38e77855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0525b663ee06d762b6263bee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 17 09:43:15 2009 +0100 d3d8: Move D3D8CB_DestroySwapChain() to device.c. --- dlls/d3d8/d3d8_private.h | 3 --- dlls/d3d8/device.c | 11 +++++++++++ dlls/d3d8/directx.c | 10 ---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 8464190..141aa92 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -622,7 +622,4 @@ UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elem WINED3DVERTEXELEMENT **wined3d_elements) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; -/* Callbacks */ -extern ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) DECLSPEC_HIDDEN; - #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a20b9f4..eb26d73 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -253,6 +253,17 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d return entry->object; } +static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain) +{ + IUnknown *parent; + + TRACE("swapchain %p.\n", swapchain); + + IWineD3DSwapChain_GetParent(swapchain, &parent); + IUnknown_Release(parent); + return IUnknown_Release(parent); +} + /* IDirect3D IUnknown parts follow: */ static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFIID riid,LPVOID *ppobj) { diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index f9b8c45..8bcd5ab 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -331,16 +331,6 @@ static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT return ret; } -ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { - IUnknown* swapChainParent; - - TRACE("swapchain %p.\n", pSwapChain); - - IWineD3DSwapChain_GetParent(pSwapChain, &swapChainParent); - IUnknown_Release(swapChainParent); - return IUnknown_Release(swapChainParent); -} - static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, IDirect3DDevice8 **device) {

1 0

Owen Rudge : shell32: Implement SHGetImageList and remove todo_wine from imagelist tests.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 9db87f13d3f0f9e07accc9b5e12dccd202b88156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db87f13d3f0f9e07accc9b5e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:32 2009 -0600 shell32: Implement SHGetImageList and remove todo_wine from imagelist tests. --- dlls/comctl32/tests/imagelist.c | 6 +++--- dlls/shell32/shellord.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 36d0aea..38a3b48 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1012,18 +1012,18 @@ static void test_shell_imagelist(void) /* Get system image list */ hr = (pSHGetImageList)(SHIL_LARGE, &IID_IImageList, (void**)&iml); - todo_wine ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); if (hr != S_OK) return; IImageList_GetImageCount(iml, &out); - todo_wine ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); + ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); /* right and bottom should be 32x32 for large icons, or 48x48 if larger icons enabled in control panel */ IImageList_GetImageRect(iml, 0, &rect); - todo_wine ok((((rect.right == 32) && (rect.bottom == 32)) || + ok((((rect.right == 32) && (rect.bottom == 32)) || ((rect.right == 48) && (rect.bottom == 48))), "IImageList_GetImageRect returned r:%d,b:%d\n", rect.right, rect.bottom); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 29b77df..7aa3a0c 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -46,6 +46,7 @@ #include "pidl.h" #include "shlwapi.h" #include "commdlg.h" +#include "commoncontrols.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); @@ -2173,10 +2174,41 @@ void WINAPI SHFlushSFCache(void) { } +/************************************************************************* + * SHGetImageList (SHELL32.727) + * + * Returns a copy of a shell image list. + * + * NOTES + * Windows XP features 4 sizes of image list, and Vista 5. Wine currently + * only supports 2, so requests for the others will currently fail. + */ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) { - FIXME("STUB: %i %s\n",iImageList,debugstr_guid(riid)); - return E_NOINTERFACE; + HIMAGELIST hLarge, hSmall; + HIMAGELIST hNew; + HRESULT ret = E_FAIL; + + /* Wine currently only maintains large and small image lists */ + if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL)) + { + FIXME("Unsupported image list %i requested\n", iImageList); + return E_FAIL; + } + + Shell_GetImageList(&hLarge, &hSmall); + hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); + + /* Get the interface for the new image list */ + if (hNew) + { + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + + if (!SUCCEEDED(ret)) + ImageList_Destroy(hNew); + } + + return ret; } /*************************************************************************

1 0

Owen Rudge : comctl32/tests: Use defined flags instead of magic numbers in v6 tests.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 459361d4d668351d336e8a9f157d447c8fd349b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459361d4d668351d336e8a9f1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:33 2009 -0600 comctl32/tests: Use defined flags instead of magic numbers in v6 tests. --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 38a3b48..ef5034c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1394,7 +1394,7 @@ static void DoTest1_v6(void) int ret = 0; /* create an imagelist to play with */ - himl = ImageList_Create(84,84,0x10,0,3); + himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl != 0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1466,7 +1466,7 @@ static void DoTest3_v6(void) ok(hdc!=NULL, "couldn't get DC\n"); /* create an imagelist to play with */ - himl = ImageList_Create(48,48,0x10,0,3); + himl = ImageList_Create(48, 48, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); imgl = (IImageList *) himl;

1 0

Juan Lang : crypt32: Add more tests for CertCompareCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 4a948fa92908b254b036a40c0c2dae5fb4bde06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a948fa92908b254b036a40c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 11:48:46 2009 -0800 crypt32: Add more tests for CertCompareCertificateName. --- dlls/crypt32/tests/cert.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e1c8262..5463641 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2541,6 +2541,29 @@ static void testGetValidUsages(void) CertFreeCertificateContext(contexts[2]); } +static BYTE cn[] = { +0x30,0x14,0x31,0x12,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67 }; +static BYTE cnWithLeadingSpace[] = { +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x20,0x4a, +0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67 }; +static BYTE cnWithTrailingSpace[] = { +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x20 }; +static BYTE cnWithIntermediateSpace[] = { +0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, +0x61,0x6e,0x20,0x20,0x4c,0x61,0x6e,0x67 }; +static BYTE cnThenO[] = { +0x30,0x2d,0x31,0x2b,0x30,0x10,0x06,0x03,0x55,0x04,0x03,0x13,0x09,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x30,0x17,0x06,0x03,0x55,0x04,0x0a,0x13, +0x10,0x54,0x68,0x65,0x20,0x57,0x69,0x6e,0x65,0x20,0x50,0x72,0x6f,0x6a,0x65, +0x63,0x74 }; +static BYTE oThenCN[] = { +0x30,0x2d,0x31,0x2b,0x30,0x10,0x06,0x03,0x55,0x04,0x0a,0x13,0x09,0x4a,0x75, +0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x30,0x17,0x06,0x03,0x55,0x04,0x03,0x13, +0x10,0x54,0x68,0x65,0x20,0x57,0x69,0x6e,0x65,0x20,0x50,0x72,0x6f,0x6a,0x65, +0x63,0x74 }; + static void testCompareCertName(void) { static BYTE bogus[] = { 1, 2, 3, 4 }; @@ -2572,6 +2595,43 @@ static void testCompareCertName(void) blob2.cbData = sizeof(emptyPrime); ret = CertCompareCertificateName(0, &blob1, &blob2); ok(!ret, "Expected failure\n"); + /* Tests to show that CertCompareCertificateName doesn't decode the name + * to remove spaces, or to do an order-independent comparison. + */ + /* Compare CN="Juan Lang" with CN=" Juan Lang" */ + blob1.pbData = cn; + blob1.cbData = sizeof(cn); + blob2.pbData = cnWithLeadingSpace; + blob2.cbData = sizeof(cnWithLeadingSpace); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + /* Compare CN="Juan Lang" with CN="Juan Lang " */ + blob2.pbData = cnWithTrailingSpace; + blob2.cbData = sizeof(cnWithTrailingSpace); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + /* Compare CN="Juan Lang" with CN="Juan Lang" */ + blob2.pbData = cnWithIntermediateSpace; + blob2.cbData = sizeof(cnWithIntermediateSpace); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + /* Compare 'CN="Juan Lang", O="The Wine Project"' with + * 'O="The Wine Project", CN="Juan Lang"' + */ + blob1.pbData = cnThenO; + blob1.cbData = sizeof(cnThenO); + blob2.pbData = oThenCN; + blob2.cbData = sizeof(oThenCN); + ret = CertCompareCertificateName(0, &blob1, &blob2); + ok(!ret, "Expected failure\n"); + ret = CertCompareCertificateName(X509_ASN_ENCODING, &blob1, &blob2); + ok(!ret, "Expected failure\n"); } static BYTE int1[] = { 0x88, 0xff, 0xff, 0xff };

1 0

Juan Lang : crypt32: Add stub for CertIsRDNAttrsInCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 7d12294f08594a480508c1dd610dd08ebbc0b75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d12294f08594a480508c1dd6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 11:59:29 2009 -0800 crypt32: Add stub for CertIsRDNAttrsInCertificateName. --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4f3df32..656c547 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1832,6 +1832,14 @@ PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName) return ret; } +BOOL WINAPI CertIsRDNAttrsInCertificateName(DWORD dwCertEncodingType, + DWORD dwFlags, PCERT_NAME_BLOB pCertName, PCERT_RDN pRDN) +{ + FIXME("(%08x, %08x, %p, %p): stub\n", dwCertEncodingType, dwFlags, + pCertName, pRDN); + return FALSE; +} + LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, PCERT_INFO pCertInfo) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index b096c09..61e4d3d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -66,7 +66,7 @@ @ stdcall CertGetStoreProperty(ptr long ptr ptr) @ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) -@ stub CertIsRDNAttrsInCertificateName +@ stdcall CertIsRDNAttrsInCertificateName(long long ptr ptr) @ stdcall CertIsValidCRLForCertificate(ptr ptr long ptr) @ stdcall CertNameToStrA(long ptr long ptr long) @ stdcall CertNameToStrW(long ptr long ptr long)

1 0

Juan Lang : crypt32: Add tests for CertIsRDNAttrsInCertificateName.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: ed74536f0c92be2b9075f201fbc042e987fcffc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed74536f0c92be2b9075f201f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 13:42:21 2009 -0800 crypt32: Add tests for CertIsRDNAttrsInCertificateName. --- dlls/crypt32/tests/cert.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5463641..186691f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2634,6 +2634,143 @@ static void testCompareCertName(void) ok(!ret, "Expected failure\n"); } +static void testIsRDNAttrsInCertificateName(void) +{ + static char oid_1_2_3[] = "1.2.3"; + static char oid_common_name[] = szOID_COMMON_NAME; + static char oid_organization[] = szOID_ORGANIZATION_NAME; + static char juan[] = "Juan Lang"; + static char juan_with_leading_space[] = " Juan Lang"; + static char juan_with_intermediate_space[] = "Juan Lang"; + static char juan_with_trailing_space[] = "Juan Lang "; + static char juan_lower_case[] = "juan lang"; + static WCHAR juanW[] = { 'J','u','a','n',' ','L','a','n','g',0 }; + static char the_wine_project[] = "The Wine Project"; + BOOL ret; + CERT_NAME_BLOB name; + CERT_RDN_ATTR attr[2]; + CERT_RDN rdn = { 0, NULL }; + + name.cbData = sizeof(cn); + name.pbData = cn; + if (0) + { + /* Crash */ + ret = CertIsRDNAttrsInCertificateName(0, 0, NULL, NULL); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, + NULL); + } + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(0, 0, &name, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + attr[0].pszObjId = oid_1_2_3; + rdn.rgRDNAttr = attr; + rdn.cRDNAttr = 1; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].pszObjId = oid_common_name; + attr[0].dwValueType = CERT_RDN_PRINTABLE_STRING; + attr[0].Value.cbData = strlen(juan); + attr[0].Value.pbData = (BYTE *)juan; + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + /* Again, spaces are not removed for name comparison. */ + attr[0].Value.cbData = strlen(juan_with_leading_space); + attr[0].Value.pbData = (BYTE *)juan_with_leading_space; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].Value.cbData = strlen(juan_with_intermediate_space); + attr[0].Value.pbData = (BYTE *)juan_with_intermediate_space; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].Value.cbData = strlen(juan_with_trailing_space); + attr[0].Value.pbData = (BYTE *)juan_with_trailing_space; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + /* The lower case name isn't matched unless a case insensitive match is + * specified. + */ + attr[0].Value.cbData = strlen(juan_lower_case); + attr[0].Value.pbData = (BYTE *)juan_lower_case; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + /* The values don't match unless they have the same RDN type */ + attr[0].dwValueType = CERT_RDN_UNICODE_STRING; + attr[0].Value.cbData = lstrlenW(juanW) * sizeof(WCHAR); + attr[0].Value.pbData = (BYTE *)juanW; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, + CERT_UNICODE_IS_RDN_ATTRS_FLAG, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + attr[0].dwValueType = CERT_RDN_IA5_STRING; + attr[0].Value.cbData = strlen(juan); + attr[0].Value.pbData = (BYTE *)juan; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + /* All attributes must be present */ + attr[0].dwValueType = CERT_RDN_PRINTABLE_STRING; + attr[0].Value.cbData = strlen(juan); + attr[0].Value.pbData = (BYTE *)juan; + attr[1].pszObjId = oid_organization; + attr[1].dwValueType = CERT_RDN_PRINTABLE_STRING; + attr[1].Value.cbData = strlen(the_wine_project); + attr[1].Value.pbData = (BYTE *)the_wine_project; + rdn.cRDNAttr = 2; + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); + /* Order also matters */ + name.pbData = cnThenO; + name.cbData = sizeof(cnThenO); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(ret, "CertIsRDNAttrsInCertificateName failed: %08x\n", GetLastError()); + name.pbData = oThenCN; + name.cbData = sizeof(oThenCN); + SetLastError(0xdeadbeef); + ret = CertIsRDNAttrsInCertificateName(X509_ASN_ENCODING, 0, &name, &rdn); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, + "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); +} + static BYTE int1[] = { 0x88, 0xff, 0xff, 0xff }; static BYTE int2[] = { 0x88, 0xff }; static BYTE int3[] = { 0x23, 0xff }; @@ -3343,4 +3480,5 @@ START_TEST(cert) testVerifyRevocation(); testAcquireCertPrivateKey(); testGetPublicKeyLength(); + testIsRDNAttrsInCertificateName(); }

1 0