November 2009 - Wine-Commits

Alexandre Julliard : gdi32: Disable SetDCOrg16.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 1fd7159cae735a83b5ea5e8f3646d449be902291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd7159cae735a83b5ea5e8f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:42:16 2009 +0100 gdi32: Disable SetDCOrg16. --- dlls/gdi32/gdi16.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 0712f40..a8644da 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3662,13 +3662,8 @@ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs ) */ DWORD WINAPI SetDCOrg16( HDC16 hdc16, INT16 x, INT16 y ) { - DWORD prevOrg = 0; - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0; - if (dc->funcs->pSetDCOrg) prevOrg = dc->funcs->pSetDCOrg( dc->physDev, x, y ); - release_dc_ptr( dc ); - return prevOrg; + FIXME( "%04x %d,%d no longer supported\n", hdc16, x, y ); + return 0; }

1 0

Alexandre Julliard : gdi32: Reimplement SaveVisRgn16/ RestoreVisRgn16 to avoid accessing the DC internals.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 16da76923d90291b2e6dc24e8e886aeb84f398ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=16da76923d90291b2e6dc24e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:28:44 2009 +0100 gdi32: Reimplement SaveVisRgn16/RestoreVisRgn16 to avoid accessing the DC internals. --- dlls/gdi32/dc.c | 10 ------- dlls/gdi32/gdi16.c | 66 ++++++++++++++++++++++++++------------------- dlls/gdi32/gdi_private.h | 8 ----- 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f7b295a..fdfc100 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -144,7 +144,6 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->BoundsRect.top = 0; dc->BoundsRect.right = 0; dc->BoundsRect.bottom = 0; - dc->saved_visrgn = NULL; PATH_InitGdiPath(&dc->path); if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) @@ -403,7 +402,6 @@ INT save_dc_state( HDC hdc ) newdc->pAbortProc = NULL; newdc->hookProc = NULL; - newdc->saved_visrgn = NULL; if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) { @@ -845,14 +843,6 @@ BOOL WINAPI DeleteDC( HDC hdc ) dc->physDev = NULL; } - while (dc->saved_visrgn) - { - struct saved_visrgn *next = dc->saved_visrgn->next; - DeleteObject( dc->saved_visrgn->hrgn ); - HeapFree( GetProcessHeap(), 0, dc->saved_visrgn ); - dc->saved_visrgn = next; - } - free_dc_ptr( dc ); if (funcs) DRIVER_release_driver( funcs ); /* do that after releasing the GDI lock */ return TRUE; diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index bd535d1..0712f40 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -34,6 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define HGDIOBJ_32(handle16) ((HGDIOBJ)(ULONG_PTR)(handle16)) #define HGDIOBJ_16(handle32) ((HGDIOBJ16)(ULONG_PTR)(handle32)) +struct saved_visrgn +{ + struct list entry; + HDC hdc; + HRGN hrgn; +}; + +static struct list saved_regions = LIST_INIT( saved_regions ); + /* * ############################################################################ */ @@ -1312,9 +1321,18 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) { if (DeleteDC( HDC_32(hdc) )) { + struct saved_visrgn *saved, *next; struct gdi_thunk* thunk; - if ((thunk = GDI_FindThunk(hdc))) - GDI_DeleteThunk(thunk); + + if ((thunk = GDI_FindThunk(hdc))) GDI_DeleteThunk(thunk); + + LIST_FOR_EACH_ENTRY_SAFE( saved, next, &saved_regions, struct saved_visrgn, entry ) + { + if (saved->hdc != HDC_32(hdc)) continue; + list_remove( &saved->entry ); + DeleteObject( saved->hrgn ); + HeapFree( GetProcessHeap(), 0, saved ); + } return TRUE; } return FALSE; @@ -3704,24 +3722,19 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) { struct saved_visrgn *saved; HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0; TRACE("%p\n", hdc ); - update_dc( dc ); - if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) goto error; - if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) goto error; - CombineRgn( saved->hrgn, dc->hVisRgn, 0, RGN_COPY ); - saved->next = dc->saved_visrgn; - dc->saved_visrgn = saved; - release_dc_ptr( dc ); + if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) return 0; + if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, saved ); + return 0; + } + saved->hdc = hdc; + GetRandomRgn( hdc, saved->hrgn, SYSRGN ); + list_add_head( &saved_regions, &saved->entry ); return HRGN_16(saved->hrgn); - -error: - release_dc_ptr( dc ); - HeapFree( GetProcessHeap(), 0, saved ); - return 0; } @@ -3732,22 +3745,19 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) { struct saved_visrgn *saved; HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); INT16 ret = ERROR; - if (!dc) return ERROR; - TRACE("%p\n", hdc ); - if (!(saved = dc->saved_visrgn)) goto done; - - ret = CombineRgn( dc->hVisRgn, saved->hrgn, 0, RGN_COPY ); - dc->saved_visrgn = saved->next; - DeleteObject( saved->hrgn ); - HeapFree( GetProcessHeap(), 0, saved ); - CLIPPING_UpdateGCRegion( dc ); - done: - release_dc_ptr( dc ); + LIST_FOR_EACH_ENTRY( saved, &saved_regions, struct saved_visrgn, entry ) + { + if (saved->hdc != hdc) continue; + ret = SelectVisRgn( hdc, saved->hrgn ); + list_remove( &saved->entry ); + DeleteObject( saved->hrgn ); + HeapFree( GetProcessHeap(), 0, saved ); + break; + } return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ad57b1b..bc2d9a7 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -234,12 +234,6 @@ typedef struct tagGdiPath typedef struct tagGdiFont GdiFont; -struct saved_visrgn -{ - struct saved_visrgn *next; - HRGN hrgn; -}; - typedef struct tagDC { GDIOBJHDR header; @@ -310,8 +304,6 @@ typedef struct tagDC XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ RECT BoundsRect; /* Current bounding rect */ - - struct saved_visrgn *saved_visrgn; } DC; /* DC flags */

1 0

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

Nov. 17, 2009

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 Nov. 17, 2009

Nov. 17, 2009

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

Alexandre Julliard : winex11: Get rid of the SetDCOrg entry point.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 184f1fe33178eaff2f21764779521526ae53f879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=184f1fe33178eaff2f2176477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:43:53 2009 +0100 winex11: Get rid of the SetDCOrg entry point. --- dlls/winex11.drv/graphics.c | 12 ------------ dlls/winex11.drv/winex11.drv.spec | 1 - 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e6cedfb..bc00e85 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1476,18 +1476,6 @@ BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ) } -/*********************************************************************** - * SetDCOrg (X11DRV.@) - */ -DWORD CDECL X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y ) -{ - DWORD ret = MAKELONG( physDev->dc_rect.left + physDev->drawable_rect.left, - physDev->dc_rect.top + physDev->drawable_rect.top ); - physDev->dc_rect.left = x - physDev->drawable_rect.left; - physDev->dc_rect.top = y - physDev->drawable_rect.top; - return ret; -} - static unsigned char *get_icm_profile( unsigned long *size ) { Atom type; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 6fd8831..4993d9a 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -46,7 +46,6 @@ @ cdecl SetBitmapBits(long ptr long) X11DRV_SetBitmapBits @ cdecl SetBkColor(ptr long) X11DRV_SetBkColor @ cdecl SetDCBrushColor(ptr long) X11DRV_SetDCBrushColor -@ cdecl SetDCOrg(ptr long long) X11DRV_SetDCOrg @ cdecl SetDCPenColor(ptr long) X11DRV_SetDCPenColor @ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable @ cdecl SetDIBits(ptr long long long ptr ptr long) X11DRV_SetDIBits

1 0

Alexandre Julliard : gdi32: Disable the 16-bit visible region manipulation functions.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 569f56e87a50faa258a265a63719217dac67c792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569f56e87a50faa258a265a63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:21:15 2009 +0100 gdi32: Disable the 16-bit visible region manipulation functions. --- dlls/gdi32/gdi16.c | 69 ++++----------------------------------------------- 1 files changed, 6 insertions(+), 63 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index c8d0536..8c4f79b 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3675,17 +3675,8 @@ HRGN16 WINAPI InquireVisRgn16( HDC16 hdc ) */ INT16 WINAPI OffsetVisRgn16( HDC16 hdc16, INT16 x, INT16 y ) { - INT16 retval; - HDC hdc = HDC_32( hdc16 ); - DC * dc = get_dc_ptr( hdc ); - - if (!dc) return ERROR; - TRACE("%p %d,%d\n", hdc, x, y ); - update_dc( dc ); - retval = OffsetRgn( dc->hVisRgn, x, y ); - CLIPPING_UpdateGCRegion( dc ); - release_dc_ptr( dc ); - return retval; + FIXME( "%04x %d,%d no longer supported\n", hdc16, x, y ); + return ERROR; } @@ -3694,32 +3685,8 @@ INT16 WINAPI OffsetVisRgn16( HDC16 hdc16, INT16 x, INT16 y ) */ INT16 WINAPI ExcludeVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right, INT16 bottom ) { - HRGN tempRgn; - INT16 ret; - POINT pt[2]; - HDC hdc = HDC_32( hdc16 ); - DC * dc = get_dc_ptr( hdc ); - if (!dc) return ERROR; - - pt[0].x = left; - pt[0].y = top; - pt[1].x = right; - pt[1].y = bottom; - - LPtoDP( hdc, pt, 2 ); - - TRACE("%p %d,%d - %d,%d\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); - - if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR; - else - { - update_dc( dc ); - ret = CombineRgn( dc->hVisRgn, dc->hVisRgn, tempRgn, RGN_DIFF ); - DeleteObject( tempRgn ); - } - if (ret != ERROR) CLIPPING_UpdateGCRegion( dc ); - release_dc_ptr( dc ); - return ret; + FIXME( "%04x %d,%d-%d,%d no longer supported\n", hdc16, left, top, right, bottom ); + return ERROR; } @@ -3728,32 +3695,8 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right, */ INT16 WINAPI IntersectVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right, INT16 bottom ) { - HRGN tempRgn; - INT16 ret; - POINT pt[2]; - HDC hdc = HDC_32( hdc16 ); - DC * dc = get_dc_ptr( hdc ); - if (!dc) return ERROR; - - pt[0].x = left; - pt[0].y = top; - pt[1].x = right; - pt[1].y = bottom; - - LPtoDP( hdc, pt, 2 ); - - TRACE("%p %d,%d - %d,%d\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); - - if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR; - else - { - update_dc( dc ); - ret = CombineRgn( dc->hVisRgn, dc->hVisRgn, tempRgn, RGN_AND ); - DeleteObject( tempRgn ); - } - if (ret != ERROR) CLIPPING_UpdateGCRegion( dc ); - release_dc_ptr( dc ); - return ret; + FIXME( "%04x %d,%d-%d,%d no longer supported\n", hdc16, left, top, right, bottom ); + return ERROR; }

1 0

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

Nov. 17, 2009

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

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

Nov. 17, 2009

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

Juan Lang : crypt32: Add tests for CertIsRDNAttrsInCertificateName.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

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

Juan Lang : crypt32: Implement CertIsRDNAttrsInCertificateName.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 440c702ce413861f8a030e728ee6bceee255b513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440c702ce413861f8a030e728… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 16 17:08:03 2009 -0800 crypt32: Implement CertIsRDNAttrsInCertificateName. --- dlls/crypt32/cert.c | 78 +++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/cert.c | 15 --------- 2 files changed, 75 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 656c547..f91adc1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1832,12 +1832,84 @@ PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName) return ret; } +static BOOL find_matching_rdn_attr(DWORD dwFlags, const CERT_NAME_INFO *name, + const CERT_RDN_ATTR *attr) +{ + DWORD i, j; + BOOL match = FALSE; + + for (i = 0; !match && i < name->cRDN; i++) + { + for (j = 0; j < name->rgRDN[i].cRDNAttr; j++) + { + if (!strcmp(name->rgRDN[i].rgRDNAttr[j].pszObjId, + attr->pszObjId) && + name->rgRDN[i].rgRDNAttr[j].dwValueType == + attr->dwValueType) + { + if (dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG) + { + LPCWSTR nameStr = + (LPCWSTR)name->rgRDN[i].rgRDNAttr[j].Value.pbData; + LPCWSTR attrStr = (LPCWSTR)attr->Value.pbData; + + if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) + match = !strncmpiW(nameStr, attrStr, + attr->Value.cbData / sizeof(WCHAR)); + else + match = !strncmpW(nameStr, attrStr, + attr->Value.cbData / sizeof(WCHAR)); + TRACE("%s : %s => %d\n", + debugstr_wn(nameStr, attr->Value.cbData / sizeof(WCHAR)), + debugstr_wn(attrStr, attr->Value.cbData / sizeof(WCHAR)), + match); + } + else + { + LPCSTR nameStr = + (LPCSTR)name->rgRDN[i].rgRDNAttr[j].Value.pbData; + LPCSTR attrStr = (LPCSTR)attr->Value.pbData; + + if (dwFlags & CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG) + match = !strncasecmp(nameStr, attrStr, + attr->Value.cbData); + else + match = !strncmp(nameStr, attrStr, attr->Value.cbData); + TRACE("%s : %s => %d\n", + debugstr_an(nameStr, attr->Value.cbData), + debugstr_an(attrStr, attr->Value.cbData), match); + } + } + } + } + return match; +} + 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; + CERT_NAME_INFO *name; + LPCSTR type; + DWORD size; + BOOL ret; + + TRACE("(%08x, %08x, %p, %p)\n", dwCertEncodingType, dwFlags, pCertName, + pRDN); + + type = dwFlags & CERT_UNICODE_IS_RDN_ATTRS_FLAG ? X509_UNICODE_NAME : + X509_NAME; + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, type, pCertName->pbData, + pCertName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &name, &size))) + { + DWORD i; + + for (i = 0; ret && i < pRDN->cRDNAttr; i++) + ret = find_matching_rdn_attr(dwFlags, name, &pRDN->rgRDNAttr[i]); + if (!ret) + SetLastError(CRYPT_E_NO_MATCH); + LocalFree(name); + } + return ret; } LONG WINAPI CertVerifyTimeValidity(LPFILETIME pTimeToVerify, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 186691f..4a1c449 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2662,18 +2662,15 @@ static void testIsRDNAttrsInCertificateName(void) } 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; @@ -2681,28 +2678,24 @@ static void testIsRDNAttrsInCertificateName(void) 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 @@ -2712,12 +2705,10 @@ static void testIsRDNAttrsInCertificateName(void) 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; @@ -2725,13 +2716,11 @@ static void testIsRDNAttrsInCertificateName(void) 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; @@ -2739,7 +2728,6 @@ static void testIsRDNAttrsInCertificateName(void) 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 */ @@ -2753,20 +2741,17 @@ static void testIsRDNAttrsInCertificateName(void) 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()); }

1 0