July 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Add infrastructure for loading a manifest file or resource.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 9c58a2ce8cca8c83cf37e80f0ad04c664575fe8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c58a2ce8cca8c83cf37e80f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 17:38:43 2007 +0200 ntdll: Add infrastructure for loading a manifest file or resource. Partially based on a patch by Eric Pouech. --- dlls/ntdll/actctx.c | 331 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 325 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c58a2ce8cca8c83cf37e…

1 0

Alexandre Julliard : ntdll: Implemented handling of the per-thread activation context stack.
by Alexandre Julliard July 20, 2007

July 20, 2007

Module: wine Branch: master Commit: 797dd942ecfc4d405e5e9c3cb528b9698cd79fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=797dd942ecfc4d405e5e9c3cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 19 17:07:48 2007 +0200 ntdll: Implemented handling of the per-thread activation context stack. --- dlls/kernel32/actctx.c | 46 ++++++++------------- dlls/kernel32/thread.c | 6 ++- dlls/ntdll/actctx.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 10 ++-- include/winternl.h | 5 ++ 5 files changed, 137 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=797dd942ecfc4d405e5e9…

1 0

Alexander Nicolaysen Sørnes : wordpad: Add date/time toolbar button.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 5ae5da912f5c0ac54eab34d1c42cbe1726f60ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae5da912f5c0ac54eab34d1c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 15:50:43 2007 +0200 wordpad: Add date/time toolbar button. --- .gitignore | 1 + programs/wordpad/Makefile.in | 1 + programs/wordpad/resource.h | 5 +++-- programs/wordpad/rsrc.rc | 21 +++++++++++++++++++++ programs/wordpad/wordpad.c | 4 +++- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index df94f78..c9f97b9 100644 --- a/.gitignore +++ b/.gitignore @@ -927,6 +927,7 @@ programs/winhelp/winhelp programs/winver/winver programs/wordpad/formatbar.bmp programs/wordpad/rsrc.res +programs/wordpad/toolbar.bmp programs/wordpad/wordpad programs/wordpad/wordpad.ico programs/xcopy/rsrc.res diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 2192db8..017bb19 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = rsrc.rc RC_BINSRC = rsrc.rc RC_BINARIES = \ formatbar.bmp \ + toolbar.bmp \ wordpad.ico @MAKE_PROG_RULES@ diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index c058e17..eb329e3 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -72,9 +72,10 @@ #define IDD_DATETIME 2100 -#define IDB_FORMATBAR 100 +#define IDB_TOOLBAR 100 +#define IDB_FORMATBAR 101 -#define IDI_WORDPAD 101 +#define IDI_WORDPAD 102 #define STRING_ALL_FILES 1400 #define STRING_TEXT_FILES_TXT 1401 diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 3410d51..0ef3ff5 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -39,6 +39,27 @@ BEGIN "S", ID_FILE_SAVE, VIRTKEY, CONTROL END +/* BINRES toolbar.bmp */ +IDB_TOOLBAR BITMAP "toolbar.bmp" +/* { + '42 4d f6 00 00 00 00 00 00 00 76 00 00 00 28 00' + '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' + '00 00 80 00 00 00 12 0b 00 00 12 0b 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' + '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' + '00 00 80 80 80 00 c0 c0 c0 00 00 00 ff 00 00 ff' + '00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff' + '00 00 ff ff ff 00 88 88 88 88 88 33 33 88 88 88' + '88 88 83 33 33 38 88 88 88 88 33 33 33 33 88 88' + '88 88 33 30 00 03 8f ff ff ff 33 30 33 33 8f 0f' + 'f0 0f 33 30 33 33 8f 0f 0f f0 f3 30 33 38 8f 0f' + 'ff f0 f8 33 33 88 8f 0f f0 0f f8 88 88 88 8f 0f' + 'ff f0 f8 88 88 88 8f 0f 0f f0 f8 88 88 88 8f 0f' + 'f0 0f f8 88 88 88 8f ff ff ff f8 88 88 88 84 44' + '44 44 48 88 88 88 84 44 44 44 48 88 88 88 88 88' + '88 88 88 88 88 88' + } */ + /* BINRES formatbar.bmp */ IDB_FORMATBAR BITMAP "formatbar.bmp" /* { diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 6cae4a5..14f82f4 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -511,7 +511,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, IDC_TOOLBAR, - 0, hInstance, 0, + 1, hInstance, IDB_TOOLBAR, NULL, 0, 24, 24, 16, 16, sizeof(TBBUTTON)); @@ -533,6 +533,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) AddButton(hToolBarWnd, nStdBitmaps+STD_PASTE, ID_EDIT_PASTE); AddButton(hToolBarWnd, nStdBitmaps+STD_UNDO, ID_EDIT_UNDO); AddButton(hToolBarWnd, nStdBitmaps+STD_REDOW, ID_EDIT_REDO); + AddSeparator(hToolBarWnd); + AddButton(hToolBarWnd, 0, ID_DATETIME); SendMessageW(hToolBarWnd, TB_AUTOSIZE, 0, 0);

1 0

Martin Fuchs : shell32: Implementation of SheGetDirA/W and SheChangeDirA/W.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 303b357ce1b28a34059181b96d042952c2335623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303b357ce1b28a34059181b96… Author: Martin Fuchs <martin-fuchs(a)gmx.net> Date: Wed Jul 18 19:09:31 2007 +0200 shell32: Implementation of SheGetDirA/W and SheChangeDirA/W. --- dlls/shell32/shlfileop.c | 90 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 78 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index f541b60..02da5e8 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1574,37 +1574,103 @@ void WINAPI SHFreeNameMappings(HANDLE hNameMapping) /************************************************************************* * SheGetDirA [SHELL32.@] * - */ -HRESULT WINAPI SheGetDirA(LPSTR u, LPSTR v) -{ FIXME("%p %p stub\n",u,v); + * drive = 0: returns the current directory path + * drive > 0: returns the current directory path of the specified drive + * drive=1 -> A: drive=2 -> B: ... + * returns 0 if successfull +*/ +DWORD WINAPI SheGetDirA(DWORD drive, LPSTR buffer) +{ + WCHAR org_path[MAX_PATH]; + DWORD ret; + char drv_path[3]; + + /* change current directory to the specified drive */ + if (drive) { + strcpy(drv_path, "A:"); + drv_path[0] += (char)drive-1; + + GetCurrentDirectoryW(MAX_PATH, org_path); + + SetCurrentDirectoryA(drv_path); + } + + /* query current directory path of the specified drive */ + ret = GetCurrentDirectoryA(MAX_PATH, buffer); + + /* back to the original drive */ + if (drive) + SetCurrentDirectoryW(org_path); + + if (!ret) + return GetLastError(); + return 0; } /************************************************************************* * SheGetDirW [SHELL32.@] * + * drive = 0: returns the current directory path + * drive > 0: returns the current directory path of the specified drive + * drive=1 -> A: drive=2 -> B: ... + * returns 0 if successfull */ -HRESULT WINAPI SheGetDirW(LPWSTR u, LPWSTR v) -{ FIXME("%p %p stub\n",u,v); - return 0; +DWORD WINAPI SheGetDirW(DWORD drive, LPWSTR buffer) +{ + WCHAR org_path[MAX_PATH]; + DWORD ret; + char drv_path[3]; + + /* change current directory to the specified drive */ + if (drive) { + strcpy(drv_path, "A:"); + drv_path[0] += (char)drive-1; + + GetCurrentDirectoryW(MAX_PATH, org_path); + + SetCurrentDirectoryA(drv_path); + } + + /* query current directory path of the specified drive */ + ret = GetCurrentDirectoryW(MAX_PATH, buffer); + + /* back to the original drive */ + if (drive) + SetCurrentDirectoryW(org_path); + + if (!ret) + return GetLastError(); + + return 0; } /************************************************************************* * SheChangeDirA [SHELL32.@] * + * changes the current directory to the specified path + * and returns 0 if successfull */ -HRESULT WINAPI SheChangeDirA(LPSTR u) -{ FIXME("(%s),stub\n",debugstr_a(u)); - return 0; +DWORD WINAPI SheChangeDirA(LPSTR path) +{ + if (SetCurrentDirectoryA(path)) + return 0; + else + return GetLastError(); } /************************************************************************* * SheChangeDirW [SHELL32.@] * + * changes the current directory to the specified path + * and returns 0 if successfull */ -HRESULT WINAPI SheChangeDirW(LPWSTR u) -{ FIXME("(%s),stub\n",debugstr_w(u)); - return 0; +DWORD WINAPI SheChangeDirW(LPWSTR path) +{ + if (SetCurrentDirectoryW(path)) + return 0; + else + return GetLastError(); } /*************************************************************************

1 0

Alexander Nicolaysen Sørnes : wordpad: Add date/time dialog.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 4c6c9e596fbcba25225c1696e6d1d044293c5ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6c9e596fbcba25225c1696e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 18 15:50:21 2007 +0200 wordpad: Add date/time dialog. --- programs/wordpad/De.rc | 15 +++++++++++ programs/wordpad/En.rc | 15 +++++++++++ programs/wordpad/Fr.rc | 22 ++++++++++++++++ programs/wordpad/Hu.rc | 22 ++++++++++++++++ programs/wordpad/Ko.rc | 15 +++++++++++ programs/wordpad/Nl.rc | 22 ++++++++++++++++ programs/wordpad/No.rc | 15 +++++++++++ programs/wordpad/Pl.rc | 15 +++++++++++ programs/wordpad/Ru.rc | 22 ++++++++++++++++ programs/wordpad/Tr.rc | 22 ++++++++++++++++ programs/wordpad/resource.h | 5 +++ programs/wordpad/wordpad.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 248 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c6c9e596fbcba25225c1…

1 0

Evan Stade : gdi32: Improved PolyDraw in path closed case.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 099bfbe1a4e0cd53fc6d22326740eb2356c3953e URL: http://source.winehq.org/git/wine.git/?a=commit;h=099bfbe1a4e0cd53fc6d22326… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 18 19:41:13 2007 -0700 gdi32: Improved PolyDraw in path closed case. --- dlls/gdi32/painting.c | 107 +++++++++++++++++++++++++++++++------------------ 1 files changed, 68 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index ed3f9b0..6276e8c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -824,8 +824,8 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, { DC *dc; BOOL result = FALSE; - POINT lastmove; - unsigned int i; + POINT * line_pts = NULL, * bzr_pts = NULL, bzr[4]; + INT i, num_pts, num_bzr_pts, space, size; dc = DC_GetDCUpdate( hdc ); if(!dc) return FALSE; @@ -835,47 +835,76 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, else if(dc->funcs->pPolyDraw) result = dc->funcs->pPolyDraw( dc->physDev, lppt, lpbTypes, cCount ); else { - /* check for each bezierto if there are two more points */ - for( i = 0; i < cCount; i++ ) - if( lpbTypes[i] != PT_MOVETO && - lpbTypes[i] & PT_BEZIERTO ) - { - if( cCount < i+3 ) - goto end; - else - i += 2; - } + /* check for valid point types */ + for(i = 0; i < cCount; i++) { + switch(lpbTypes[i]) { + case PT_MOVETO: + case PT_LINETO | PT_CLOSEFIGURE: + case PT_LINETO: + break; + case PT_BEZIERTO: + if((i + 2 < cCount) && (lpbTypes[i + 1] == PT_BEZIERTO) && + ((lpbTypes[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO)){ + i += 2; + break; + } + default: + goto end; + } + } - /* if no moveto occurs, we will close the figure here */ - lastmove.x = dc->CursPosX; - lastmove.y = dc->CursPosY; + space = cCount + 300; + line_pts = HeapAlloc(GetProcessHeap(), 0, space * sizeof(POINT)); + num_pts = 1; + + line_pts[0].x = dc->CursPosX; + line_pts[0].y = dc->CursPosY; + + for(i = 0; i < cCount; i++) { + switch(lpbTypes[i]) { + case PT_MOVETO: + if(num_pts >= 2) + Polyline(dc->hSelf, line_pts, num_pts); + num_pts = 0; + line_pts[num_pts++] = lppt[i]; + break; + case PT_LINETO: + case (PT_LINETO | PT_CLOSEFIGURE): + line_pts[num_pts++] = lppt[i]; + break; + case PT_BEZIERTO: + bzr[0].x = line_pts[num_pts - 1].x; + bzr[0].y = line_pts[num_pts - 1].y; + memcpy(&bzr[1], &lppt[i], 3 * sizeof(POINT)); + + bzr_pts = GDI_Bezier(bzr, 4, &num_bzr_pts); + + size = num_pts + (cCount - i) + num_bzr_pts; + if(space < size){ + space = size * 2; + line_pts = HeapReAlloc(GetProcessHeap(), 0, line_pts, + space * sizeof(POINT)); + } + memcpy(&line_pts[num_pts], &bzr_pts[1], + (num_bzr_pts - 1) * sizeof(POINT)); + num_pts += num_bzr_pts - 1; + HeapFree(GetProcessHeap(), 0, bzr_pts); + i += 2; + break; + default: + goto end; + } - /* now let's draw */ - for( i = 0; i < cCount; i++ ) - { - if( lpbTypes[i] == PT_MOVETO ) - { - MoveToEx( hdc, lppt[i].x, lppt[i].y, NULL ); - lastmove.x = dc->CursPosX; - lastmove.y = dc->CursPosY; - } - else if( lpbTypes[i] & PT_LINETO ) - LineTo( hdc, lppt[i].x, lppt[i].y ); - else if( lpbTypes[i] & PT_BEZIERTO ) - { - PolyBezierTo( hdc, &lppt[i], 3 ); - i += 2; - } - else - goto end; + if(lpbTypes[i] & PT_CLOSEFIGURE) + line_pts[num_pts++] = line_pts[0]; + } - if( lpbTypes[i] & PT_CLOSEFIGURE ) - { - LineTo( hdc, lastmove.x, lastmove.y ); - } - } + if(num_pts >= 2) + Polyline(dc->hSelf, line_pts, num_pts); + + MoveToEx(dc->hSelf, line_pts[num_pts - 1].x, line_pts[num_pts - 1].y, NULL); - result = TRUE; + result = TRUE; } end:

1 0

Huw Davies : wininet: Stub for InternetQueryFortezzaStatus().
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 00631b24805faa445d321058963380a4486d07c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00631b24805faa445d3210589… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 19 11:25:18 2007 +0100 wininet: Stub for InternetQueryFortezzaStatus(). --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cb38297..fb6970b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3927,3 +3927,9 @@ BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError ) FIXME("(%p, 0x%08x) stub\n", hInternet, dwError); return FALSE; } + +DWORD WINAPI InternetQueryFortezzaStatus(void *a, DWORD b) +{ + FIXME("(%p, %08x) stub\n", a, b); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 3722546..19e6551 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -169,7 +169,7 @@ @ stdcall InternetOpenUrlW(ptr wstr wstr long long long) @ stdcall InternetOpenW(wstr long wstr wstr long) @ stdcall InternetQueryDataAvailable(ptr ptr long long) -@ stub InternetQueryFortezzaStatus +@ stdcall InternetQueryFortezzaStatus(ptr long) @ stdcall InternetQueryOptionA(ptr long ptr ptr) @ stdcall InternetQueryOptionW(ptr long ptr ptr) @ stdcall InternetReadFile(ptr ptr long ptr)

1 0

Juan Lang : msi: Return FALSE from MsiGetMode for MSIRUNMODE_OPERATIONS.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 955f5f3910a12fcc3e95983e3e46c079b45b5d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955f5f3910a12fcc3e95983e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 18 15:55:12 2007 -0700 msi: Return FALSE from MsiGetMode for MSIRUNMODE_OPERATIONS. --- dlls/msi/install.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index cb88ebb..c370a28 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -688,6 +688,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = TRUE; break; + case MSIRUNMODE_OPERATIONS: case MSIRUNMODE_RESERVED11: case MSIRUNMODE_RESERVED14: case MSIRUNMODE_RESERVED15:

1 0

Juan Lang : wincrypt: Add more missing definitions.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 834dbceadaacd45514865a99369f9fdee8fdb070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834dbceadaacd45514865a993… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 18 13:09:55 2007 -0700 wincrypt: Add more missing definitions. --- include/wincrypt.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 5 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 2c71c08..eb0cd16 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3070,9 +3070,11 @@ typedef struct _CMSG_SIGNER_ENCODE_INFO PCRYPT_ATTRIBUTE rgAuthAttr; DWORD cUnauthAttr; PCRYPT_ATTRIBUTE rgUnauthAttr; +#ifdef CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS CERT_ID SignerId; CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; void *pvHashEncryptionAuxInfo; +#endif } CMSG_SIGNER_ENCODE_INFO, *PCMSG_SIGNER_ENCODE_INFO; typedef struct _CMSG_SIGNED_ENCODE_INFO @@ -3084,18 +3086,105 @@ typedef struct _CMSG_SIGNED_ENCODE_INFO PCERT_BLOB rgCertEncoded; DWORD cCrlEncoded; PCRL_BLOB rgCrlEncoded; +#ifdef CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS DWORD cAttrCertEncoded; PCERT_BLOB rgAttrCertEncoded; +#endif } CMSG_SIGNED_ENCODE_INFO, *PCMSG_SIGNED_ENCODE_INFO; -typedef struct _CMSG_ENVELOPED_ENCODE_INFO +typedef struct _CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO { DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void *pvKeyEncryptionAuxInfo; HCRYPTPROV hCryptProv; - CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; - void *pvEncryptionAuxInfo; - DWORD cRecipients; - PCERT_INFO *rgpRecipientCert; + CRYPT_BIT_BLOB RecipientPublicKey; + CERT_ID RecipientId; +} CMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO; + +typedef struct _CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_BIT_BLOB RecipientPublicKey; + CERT_ID RecipientId; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO, + *PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO; + +typedef struct _CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void *pvKeyEncryptionAuxInfo; + CRYPT_ALGORITHM_IDENTIFIER KeyWrapAlgorithm; + void *pvKeyWrapAuxInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + DWORD dwKeyChoice; + union { + PCRYPT_ALGORITHM_IDENTIFIER pEphemeralAlgorithm; + PCERT_ID pSenderId; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB UserKeyingMaterial; + DWORD cRecipientEncryptedKeys; + PCMSG_RECIPIENT_ENCRYPTED_KEY_ENCODE_INFO *rgpRecipientEncryptedKeys; +} CMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO, *PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO; + +#define CMSG_KEY_AGREE_EPHEMERAL_KEY_CHOICE 1 +#define CMSG_KEY_AGREE_STATIC_KEY_CHOICE 2 + +typedef struct _CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER KeyEncryptionAlgorithm; + void *pvKeyEncryptionAuxInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeyChoice; + union { + HCRYPTKEY hKeyEncryptionKey; + void *pvKeyEncryptionKey; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB KeyId; + FILETIME Date; + PCRYPT_ATTRIBUTE_TYPE_VALUE pOtherAttr; +} CMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO, *PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO; + +#define CMSG_MAIL_LIST_HANDLE_KEY_CHOICE 1 + +typedef struct _CMSG_RECIPIENT_ENCODE_INFO +{ + DWORD dwRecipientChoice; + union { + PCMSG_KEY_TRANS_RECIPIENT_ENCODE_INFO pKeyTrans; + PCMSG_KEY_AGREE_RECIPIENT_ENCODE_INFO pKeyAgree; + PCMSG_MAIL_LIST_RECIPIENT_ENCODE_INFO pMailList; + } DUMMYUNIONNAME; +} CMSG_RECIPIENT_ENCODE_INFO, *PCMSG_RECIPIENT_ENCODE_INFO; + +#define CMSG_KEY_TRANS_RECIPIENT 1 +#define CMSG_KEY_AGREE_RECIPIENT 2 +#define CMSG_MAIL_LIST_RECIPIENT 3 + +typedef struct _CMSG_ENVELOPED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void *pvEncryptionAuxInfo; + DWORD cRecipients; + PCERT_INFO *rgpRecipientCert; +#ifdef CMSG_ENVELOPED_ENCODE_INFO_HAS_CMS_FIELDS + PCMSG_RECIPIENT_ENCODE_INFO rgCmsRecipients; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; + DWORD cUnprotectedAttr; + PCRYPT_ATTRIBUTE rgUnprotectedAttr; +#endif } CMSG_ENVELOPED_ENCODE_INFO, *PCMSG_ENVELOPED_ENCODE_INFO; typedef struct _CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO

1 0

Mikołaj Zalewski : msxml3/tests: Avoid a crash that happens on some native systems.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 3c29359286f2e0db5559862ef1c15cc679ce2607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c29359286f2e0db5559862ef… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 12 00:11:59 2007 +0200 msxml3/tests: Avoid a crash that happens on some native systems. --- dlls/msxml3/tests/xmldoc.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 0c68896..feada7c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -268,11 +268,14 @@ static void test_createElement(void) ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(element != NULL, "Expected non-NULL element\n"); - hr = IXMLElement_get_type(element, &type); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(type == XMLELEMTYPE_OTHER, "Expected XMLELEMTYPE_OTHER, got %ld\n", type); + if (element != NULL) + { + hr = IXMLElement_get_type(element, &type); + ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(type == XMLELEMTYPE_OTHER, "Expected XMLELEMTYPE_OTHER, got %ld\n", type); - IXMLElement_Release(element); + IXMLElement_Release(element); + } /* invalid vName type */ V_VT(&vType) = VT_I4;

1 0