March 2009 - Wine-Commits - list.winehq.org

Mike Ruprecht : dbghelp: Don't define 32-bit structs in 64-bit mode.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: e976158fe7ad1050c71ce51631332517e51f6953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e976158fe7ad1050c71ce5163… Author: Mike Ruprecht <cmaiku(a)gmail.com> Date: Fri Mar 6 01:36:18 2009 -0600 dbghelp: Don't define 32-bit structs in 64-bit mode. --- include/dbghelp.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index a67daf3..03898f2 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -58,12 +58,17 @@ typedef enum AddrModeFlat } ADDRESS_MODE; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define ADDRESS ADDRESS64 +#define LPADDRESS LPADDRESS64 +#else typedef struct _tagADDRESS { DWORD Offset; WORD Segment; ADDRESS_MODE Mode; } ADDRESS, *LPADDRESS; +#endif typedef struct _tagADDRESS64 { @@ -102,6 +107,10 @@ typedef enum NumSymTypes } SYM_TYPE; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_SYMBOL IMAGEHLP_SYMBOL64 +#define PIMAGEHLP_SYMBOL PIMAGEHLP_SYMBOL64 +#else typedef struct _IMAGEHLP_SYMBOL { DWORD SizeOfStruct; @@ -111,6 +120,7 @@ typedef struct _IMAGEHLP_SYMBOL DWORD MaxNameLength; CHAR Name[1]; } IMAGEHLP_SYMBOL, *PIMAGEHLP_SYMBOL; +#endif typedef struct _IMAGEHLP_SYMBOL64 { @@ -132,6 +142,12 @@ typedef struct _IMAGEHLP_SYMBOLW64 WCHAR Name[1]; } IMAGEHLP_SYMBOLW64, *PIMAGEHLP_SYMBOLW64; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_MODULE IMAGEHLP_MODULE64 +#define PIMAGEHLP_MODULE PIMAGEHLP_MODULE64 +#define IMAGEHLP_MODULEW IMAGEHLP_MODULEW64 +#define PIMAGEHLP_MODULEW PIMAGEHLP_MODULEW64 +#else typedef struct _IMAGEHLP_MODULE { DWORD SizeOfStruct; @@ -159,6 +175,7 @@ typedef struct _IMAGEHLP_MODULEW WCHAR ImageName[256]; WCHAR LoadedImageName[256]; } IMAGEHLP_MODULEW, *PIMAGEHLP_MODULEW; +#endif typedef struct _IMAGEHLP_MODULE64 { @@ -214,6 +231,12 @@ typedef struct _IMAGEHLP_MODULEW64 BOOL Publics; } IMAGEHLP_MODULEW64, *PIMAGEHLP_MODULEW64; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_LINE IMAGEHLP_LINE64 +#define PIMAGEHLP_LINE PIMAGEHLP_LINE64 +#define IMAGEHLP_LINEW IMAGEHLP_LINEW64 +#define PIMAGEHLP_LINEW PIMAGEHLP_LINEW64 +#else typedef struct _IMAGEHLP_LINE { DWORD SizeOfStruct; @@ -231,6 +254,7 @@ typedef struct _IMAGEHLP_LINEW PWSTR FileName; DWORD Address; } IMAGEHLP_LINEW, *PIMAGEHLP_LINEW; +#endif typedef struct _IMAGEHLP_LINE64 { @@ -311,6 +335,10 @@ typedef struct _IMAGEHLP_CBA_EVENTW PVOID object; } IMAGEHLP_CBA_EVENTW, *PIMAGEHLP_CBA_EVENTW; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_DEFERRED_SYMBOL_LOAD IMAGEHLP_DEFERRED_SYMBOL_LOAD64 +#define PIMAGEHLP_DEFERRED_SYMBOL_LOAD PIMAGEHLP_DEFERRED_SYMBOL_LOAD64 +#else typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD { DWORD SizeOfStruct; @@ -321,6 +349,7 @@ typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD BOOLEAN Reparse; HANDLE hFile; } IMAGEHLP_DEFERRED_SYMBOL_LOAD, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD; +#endif typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD64 { @@ -346,6 +375,10 @@ typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOADW64 DWORD Flags; } IMAGEHLP_DEFERRED_SYMBOL_LOADW64, *PIMAGEHLP_DEFERRED_SYMBOL_LOADW64; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define IMAGEHLP_DUPLICATE_SYMBOL IMAGEHLP_DUPLICATE_SYMBOL64 +#define PIMAGEHLP_DUPLICATE_SYMBOL PIMAGEHLP_DUPLICATE_SYMBOL64 +#else typedef struct _IMAGEHLP_DUPLICATE_SYMBOL { DWORD SizeOfStruct; @@ -353,6 +386,7 @@ typedef struct _IMAGEHLP_DUPLICATE_SYMBOL PIMAGEHLP_SYMBOL Symbol; DWORD SelectedSymbol; } IMAGEHLP_DUPLICATE_SYMBOL, *PIMAGEHLP_DUPLICATE_SYMBOL; +#endif typedef struct _IMAGEHLP_DUPLICATE_SYMBOL64 { @@ -1176,6 +1210,10 @@ BOOL WINAPI SymSetContext(HANDLE, PIMAGEHLP_STACK_FRAME, PIMAGEHLP_CONTEXT); * Stack management * *************************/ +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define KDHELP KDHELP64 +#define PKDHELP PKDHELP64 +#else typedef struct _KDHELP { DWORD Thread; @@ -1186,6 +1224,7 @@ typedef struct _KDHELP DWORD KeUserCallbackDispatcher; DWORD SystemRangeStart; } KDHELP, *PKDHELP; +#endif typedef struct _KDHELP64 { @@ -1200,6 +1239,10 @@ typedef struct _KDHELP64 DWORD64 Reserved[8]; } KDHELP64, *PKDHELP64; +#if !defined(_IMAGEHLP_SOURCE_) && defined(_IMAGEHLP64) +#define STACKFRAME STACKFRAME64 +#define LPSTACKFRAME LPSTACKFRAME64 +#else typedef struct _STACKFRAME { ADDRESS AddrPC; @@ -1214,6 +1257,7 @@ typedef struct _STACKFRAME KDHELP KdHelp; ADDRESS AddrBStore; } STACKFRAME, *LPSTACKFRAME; +#endif typedef struct _STACKFRAME64 {

1 0

Jeremy White : sane.ds: Add suport for CAP_AUTOFEED, make batch scans the default.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 513b2b54a472c7aef0939a03ba83b749ca00c705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513b2b54a472c7aef0939a03b… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Mar 5 13:15:13 2009 -0600 sane.ds: Add suport for CAP_AUTOFEED, make batch scans the default. --- dlls/sane.ds/capability.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ dlls/sane.ds/options.c | 27 ++++++++++++++ dlls/sane.ds/sane_i.h | 3 ++ dlls/sane.ds/sane_main.c | 13 +++++-- dlls/twain_32/tests/dsm.c | 6 +++ 5 files changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 4faab59..7a37399 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -166,6 +166,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; static const UINT16 supported_caps[] = { CAP_SUPPORTEDCAPS, CAP_XFERCOUNT, CAP_UICONTROLLABLE, + CAP_AUTOFEED, ICAP_XFERMECH, ICAP_PIXELTYPE, ICAP_UNITS, ICAP_BITDEPTH, ICAP_COMPRESSION, ICAP_PIXELFLAVOR, ICAP_XRESOLUTION, ICAP_YRESOLUTION, ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH }; @@ -815,6 +816,72 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act return twCC; } +/* CAP_AUTOFEED */ +static TW_UINT16 SANE_CAPAutofeed (pTW_CAPABILITY pCapability, TW_UINT16 action) +{ + TW_UINT16 twCC = TWCC_BADCAP; +#ifdef SONAME_LIBSANE + TW_UINT32 val; + SANE_Bool autofeed; + SANE_Status status; + + TRACE("CAP_AUTOFEED\n"); + + if (sane_option_get_bool(activeDS.deviceHandle, "batch-scan", &autofeed, NULL) != SANE_STATUS_GOOD) + return TWCC_BADCAP; + + switch (action) + { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET ); + break; + + case MSG_GET: + twCC = set_onevalue(pCapability, TWTY_BOOL, autofeed); + break; + + case MSG_SET: + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) + { + if (val) + autofeed = SANE_TRUE; + else + autofeed = SANE_FALSE; + + status = sane_option_set_bool(activeDS.deviceHandle, "batch-scan", autofeed, NULL); + if (status != SANE_STATUS_GOOD) + { + ERR("Error %s: Could not set batch-scan to %d\n", psane_strstatus(status), autofeed); + return sane_status_to_twcc(status); + } + } + break; + + case MSG_GETDEFAULT: + twCC = set_onevalue(pCapability, TWTY_BOOL, SANE_TRUE); + break; + + case MSG_RESET: + autofeed = SANE_TRUE; + status = sane_option_set_bool(activeDS.deviceHandle, "batch-scan", autofeed, NULL); + if (status != SANE_STATUS_GOOD) + { + ERR("Error %s: Could not reset batch-scan to SANE_TRUE\n", psane_strstatus(status)); + return sane_status_to_twcc(status); + } + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_BOOL, autofeed); + break; + } +#endif + return twCC; +} + + TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) { @@ -839,6 +906,10 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) twCC = SANE_CAPUiControllable (pCapability, action); break; + case CAP_AUTOFEED: + twCC = SANE_CAPAutofeed (pCapability, action); + break; + case ICAP_PIXELTYPE: twCC = SANE_ICAPPixelType (pCapability, action); break; @@ -891,3 +962,17 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) return twCC; } + +TW_UINT16 SANE_SaneSetDefaults (void) +{ + TW_CAPABILITY cap; + + memset(&cap, 0, sizeof(cap)); + cap.Cap = CAP_AUTOFEED; + cap.ConType = TWON_DONTCARE16; + + if (SANE_SaneCapability(&cap, MSG_RESET) == TWCC_SUCCESS) + GlobalFree(cap.hContainer); + + return TWCC_SUCCESS; +} diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 4793883..1997abc 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -85,6 +85,33 @@ SANE_Status sane_option_set_int(SANE_Handle h, const char *option_name, SANE_Int return psane_control_option(h, optno, SANE_ACTION_SET_VALUE, (void *) &val, status); } +SANE_Status sane_option_get_bool(SANE_Handle h, const char *option_name, SANE_Bool *val, SANE_Int *status) +{ + SANE_Status rc; + int optno; + const SANE_Option_Descriptor *opt; + + rc = sane_find_option(h, option_name, &opt, &optno, SANE_TYPE_BOOL); + if (rc != SANE_STATUS_GOOD) + return rc; + + return psane_control_option(h, optno, SANE_ACTION_GET_VALUE, (void *) val, status); +} + +SANE_Status sane_option_set_bool(SANE_Handle h, const char *option_name, SANE_Bool val, SANE_Int *status) +{ + SANE_Status rc; + int optno; + const SANE_Option_Descriptor *opt; + + rc = sane_find_option(h, option_name, &opt, &optno, SANE_TYPE_BOOL); + if (rc != SANE_STATUS_GOOD) + return rc; + + return psane_control_option(h, optno, SANE_ACTION_SET_VALUE, (void *) &val, status); +} + + /* Important: SANE has the side effect of of overwriting val with the returned value */ SANE_Status sane_option_set_str(SANE_Handle h, const char *option_name, SANE_String val, SANE_Int *status) { diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 18fd8bb..81c9a9e 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -85,6 +85,7 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action); +extern TW_UINT16 SANE_SaneSetDefaults (void); /* Implementation of operation triplets * From Application to Source (Control Information) */ @@ -228,6 +229,8 @@ SANE_Status sane_option_probe_resolution(SANE_Handle h, const char *option_name, SANE_Status sane_option_probe_mode(SANE_Handle h, SANE_String_Const **choices, char *current, int current_size); SANE_Status sane_option_probe_scan_area(SANE_Handle h, const char *option_name, SANE_Fixed *val, SANE_Unit *unit, SANE_Fixed *min, SANE_Fixed *max, SANE_Fixed *quant); +SANE_Status sane_option_get_bool(SANE_Handle h, const char *option_name, SANE_Bool *val, SANE_Int *status); +SANE_Status sane_option_set_bool(SANE_Handle h, const char *option_name, SANE_Bool val, SANE_Int *status); #endif diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 49a7cb3..d8ba9b5 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -661,11 +661,16 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { } status = psane_open(sane_devlist[i]->name,&activeDS.deviceHandle); if (status == SANE_STATUS_GOOD) { - activeDS.currentState = 4; - activeDS.twCC = TWRC_SUCCESS; - return TWRC_SUCCESS; + activeDS.twCC = SANE_SaneSetDefaults(); + if (activeDS.twCC == TWCC_SUCCESS) { + activeDS.currentState = 4; + return TWRC_SUCCESS; + } + else + psane_close(activeDS.deviceHandle); } - ERR("sane_open(%s): %s\n", sane_devlist[i]->name, psane_strstatus (status)); + else + ERR("sane_open(%s): %s\n", sane_devlist[i]->name, psane_strstatus (status)); return TWRC_FAILURE; } #endif diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 46d0c5a..c4744f9 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -578,6 +578,12 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) if (capabilities[ICAP_YRESOLUTION]) test_resolution(appid, source, ICAP_YRESOLUTION, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + + /* Optional capabilities */ + if (capabilities[CAP_AUTOFEED]) + test_onevalue_cap(appid, source, CAP_AUTOFEED, TWTY_BOOL, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + } }

1 0

Jeremy White : sane.ds: Implement support for ICAP_PHYSICALHEIGHT and ICAP_PHYSICALWIDTH.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: eae4ac9e8f211dc8ffb1301a7bab2cd11e0c8f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae4ac9e8f211dc8ffb1301a7… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Mar 5 13:15:06 2009 -0600 sane.ds: Implement support for ICAP_PHYSICALHEIGHT and ICAP_PHYSICALWIDTH. --- dlls/sane.ds/capability.c | 88 +++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/options.c | 26 +++++++++++++ dlls/sane.ds/sane_i.h | 2 + dlls/twain_32/tests/dsm.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 203 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eae4ac9e8f211dc8ffb13…

1 0

Rein Klazes : user32: Check for invalid menu handle passed to TrackPopupMenu and TrackPopupMenuEx .
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 366334c2fa6dd8ea54d114339b2e0f0fcb3be448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366334c2fa6dd8ea54d114339… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Mar 6 09:27:48 2009 +0100 user32: Check for invalid menu handle passed to TrackPopupMenu and TrackPopupMenuEx. --- dlls/user32/menu.c | 42 ++++++++++------- dlls/user32/tests/menu.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 17 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 8f8a7b4..fc6f981 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3447,21 +3447,26 @@ track_menu: MENU_ExitTracking( hwnd ); } - /********************************************************************** - * TrackPopupMenu (USER32.@) - * - * Like the win32 API, the function return the command ID only if the - * flag TPM_RETURNCMD is on. - * + * TrackPopupMenuEx (USER32.@) */ -BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, - INT nReserved, HWND hWnd, const RECT *lpRect ) +BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, + HWND hWnd, LPTPMPARAMS lpTpm ) { BOOL ret = FALSE; - TRACE("hmenu %p flags %04x (%d,%d) reserved %d hwnd %p rect %s\n", - hMenu, wFlags, x, y, nReserved, hWnd, wine_dbgstr_rect(lpRect)); + TRACE("hmenu %p flags %04x (%d,%d) hwnd %p lpTpm %p rect %s\n", + hMenu, wFlags, x, y, hWnd, lpTpm, + lpTpm ? wine_dbgstr_rect( &lpTpm->rcExclude) : "-" ); + + /* Parameter check */ + /* FIXME: this check is performed several times, here and in the called + functions. That could be optimized */ + if (!MENU_GetMenu( hMenu )) + { + SetLastError( ERROR_INVALID_MENU_HANDLE ); + return FALSE; + } MENU_InitTracking(hWnd, hMenu, TRUE, wFlags); @@ -3470,21 +3475,24 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0); if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) - ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpRect ); + ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, + lpTpm ? &lpTpm->rcExclude : NULL ); MENU_ExitTracking(hWnd); return ret; } /********************************************************************** - * TrackPopupMenuEx (USER32.@) + * TrackPopupMenu (USER32.@) + * + * Like the win32 API, the function return the command ID only if the + * flag TPM_RETURNCMD is on. + * */ -BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, - HWND hWnd, LPTPMPARAMS lpTpm ) +BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, + INT nReserved, HWND hWnd, const RECT *lpRect ) { - FIXME("not fully implemented\n" ); - return TrackPopupMenu( hMenu, wFlags, x, y, 0, hWnd, - lpTpm ? &lpTpm->rcExclude : NULL ); + return TrackPopupMenuEx( hMenu, wFlags, x, y, hWnd, NULL); } /*********************************************************************** diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 747970f..06fa350 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -140,12 +140,25 @@ static int MOD_odheight; static SIZE MODsizes[MOD_NRMENUS]= { {MOD_SIZE, MOD_SIZE},{MOD_SIZE, MOD_SIZE}, {MOD_SIZE, MOD_SIZE},{MOD_SIZE, MOD_SIZE}}; static int MOD_GotDrawItemMsg = FALSE; +static int gflag_initmenupopup, + gflag_entermenuloop, + gflag_initmenu; + /* wndproc used by test_menu_ownerdraw() */ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) { + case WM_INITMENUPOPUP: + gflag_initmenupopup++; + break; + case WM_ENTERMENULOOP: + gflag_entermenuloop++; + break; + case WM_INITMENU: + gflag_initmenu++; + break; case WM_MEASUREITEM: { MEASUREITEMSTRUCT* pmis = (MEASUREITEMSTRUCT*)lparam; @@ -2628,6 +2641,113 @@ static void test_menu_setmenuinfo(void) return; } +/* little func to easy switch either TrackPopupMenu() or TrackPopupMenuEx() */ +static DWORD MyTrackPopupMenu( int ex, HMENU hmenu, UINT flags, INT x, INT y, HWND hwnd, LPTPMPARAMS ptpm) +{ + return ex + ? TrackPopupMenuEx( hmenu, flags, x, y, hwnd, ptpm) + : TrackPopupMenu( hmenu, flags, x, y, 0, hwnd, NULL); +} + +/* some TrackPopupMenu and TrackPopupMenuEx tests */ +/* the LastError values differ between NO_ERROR and invalid handle */ +/* between all windows versions tested. The first value is that valid on XP */ +/* Vista was the only that made returned different error values */ +/* between the TrackPopupMenu and TrackPopupMenuEx functions */ +static void test_menu_trackpopupmenu(void) +{ + BOOL ret; + HMENU hmenu; + DWORD gle; + int Ex; + HWND hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + if (!hwnd) return; + SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_ownerdraw_wnd_proc); + for( Ex = 0; Ex < 2; Ex++) + { + hmenu = CreatePopupMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + if (!hmenu) + { + DestroyWindow(hwnd); + return; + } + /* display the menu */ + /* start with an invalid menu handle */ + gle = 0xdeadbeef; + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; + ret = MyTrackPopupMenu( Ex, NULL, 0x100, 100,100, hwnd, NULL); + gle = GetLastError(); + ok( !ret, "TrackPopupMenu%s should have failed\n", Ex ? "Ex" : ""); + ok( gle == ERROR_INVALID_MENU_HANDLE + || broken (gle == 0xdeadbeef) /* win95 */ + || broken (gle == NO_ERROR) /* win98/ME */ + ,"TrackPopupMenu%s error got %u expected %u\n", + Ex ? "Ex" : "", gle, ERROR_INVALID_MENU_HANDLE); + ok( !(gflag_initmenupopup || gflag_entermenuloop || gflag_initmenu), + "got unexpected message(s)%s%s%s\n", + gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ", + gflag_entermenuloop ? "WM_INITMENULOOP ": "", + gflag_initmenu ? "WM_INITMENU": ""); + /* another one but not NULL */ + gle = 0xdeadbeef; + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; + ret = MyTrackPopupMenu( Ex, (HMENU)hwnd, 0x100, 100,100, hwnd, NULL); + gle = GetLastError(); + ok( !ret, "TrackPopupMenu%s should have failed\n", Ex ? "Ex" : ""); + ok( gle == ERROR_INVALID_MENU_HANDLE + || broken (gle == 0xdeadbeef) /* win95 */ + || broken (gle == NO_ERROR) /* win98/ME */ + ,"TrackPopupMenu%s error got %u expected %u\n", + Ex ? "Ex" : "", gle, ERROR_INVALID_MENU_HANDLE); + ok( !(gflag_initmenupopup || gflag_entermenuloop || gflag_initmenu), + "got unexpected message(s)%s%s%s\n", + gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ", + gflag_entermenuloop ? "WM_INITMENULOOP ": "", + gflag_initmenu ? "WM_INITMENU": ""); + /* now a somewhat successfull call */ + gle = 0xdeadbeef; + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; + ret = MyTrackPopupMenu( Ex, hmenu, 0x100, 100,100, hwnd, NULL); + gle = GetLastError(); + ok( ret == 0, "TrackPopupMenu%s returned %d expected zero\n", Ex ? "Ex" : "", ret); + ok( gle == NO_ERROR + || gle == ERROR_INVALID_MENU_HANDLE /* NT4, win2k */ + || broken (gle == 0xdeadbeef) /* win95 */ + ,"TrackPopupMenu%s error got %u expected %u or %u\n", + Ex ? "Ex" : "", gle, NO_ERROR, ERROR_INVALID_MENU_HANDLE); + ok( gflag_initmenupopup && gflag_entermenuloop && gflag_initmenu, + "missed expected message(s)%s%s%s\n", + !gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ", + !gflag_entermenuloop ? "WM_INITMENULOOP ": "", + !gflag_initmenu ? "WM_INITMENU": ""); + /* and another */ + ret = AppendMenuA( hmenu, MF_STRING, 1, "winetest"); + ok( ret, "AppendMenA has failed!\n"); + gle = 0xdeadbeef; + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; + ret = MyTrackPopupMenu( Ex, hmenu, 0x100, 100,100, hwnd, NULL); + gle = GetLastError(); + ok( ret == 0, "TrackPopupMenu%s returned %d expected zero\n", Ex ? "Ex" : "", ret); + ok( gle == NO_ERROR + || gle == ERROR_INVALID_MENU_HANDLE /* NT4, win2k and Vista in the TrackPopupMenuEx case */ + || broken (gle == 0xdeadbeef) /* win95 */ + ,"TrackPopupMenu%s error got %u expected %u or %u\n", + Ex ? "Ex" : "", gle, NO_ERROR, ERROR_INVALID_MENU_HANDLE); + ok( gflag_initmenupopup && gflag_entermenuloop && gflag_initmenu, + "missed expected message(s)%s%s%s\n", + !gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ", + !gflag_entermenuloop ? "WM_INITMENULOOP ": "", + !gflag_initmenu ? "WM_INITMENU": ""); + DestroyMenu(hmenu); + } + /* clean up */ + DestroyWindow(hwnd); +} + START_TEST(menu) { init_function_pointers(); @@ -2663,4 +2783,5 @@ START_TEST(menu) test_menu_flags(); test_menu_hilitemenuitem(); + test_menu_trackpopupmenu(); }

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectPass::Apply().
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 29bd889cf89a75c2293ca588da41f4f2770ecc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29bd889cf89a75c2293ca588d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 08:43:49 2009 +0100 d3d10: Implement ID3D10EffectPass::Apply(). --- dlls/d3d10/effect.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dd4c588..eecf511 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -539,6 +539,32 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) HeapFree(GetProcessHeap(), 0, v->data); } +static HRESULT d3d10_effect_variable_apply(struct d3d10_effect_variable *v) +{ + ID3D10Device *device = v->pass->technique->effect->device; + + TRACE("variable %p, type %#x\n", v, v->type); + + switch(v->type) + { + case D3D10_EVT_VERTEXSHADER: + ID3D10Device_VSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.vs); + return S_OK; + + case D3D10_EVT_PIXELSHADER: + ID3D10Device_PSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.ps); + return S_OK; + + case D3D10_EVT_GEOMETRYSHADER: + ID3D10Device_GSSetShader(device, ((struct d3d10_effect_shader_variable *)v->data)->shader.gs); + return S_OK; + + default: + FIXME("Unhandled variable type %#x\n", v->type); + return E_FAIL; + } +} + static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { TRACE("pass %p\n", p); @@ -954,9 +980,21 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + HRESULT hr = S_OK; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, flags %#x\n", iface, flags); + + if (flags) FIXME("Ignoring flags (%#x)\n", flags); + + for (i = 0; i < This->variable_count; ++i) + { + hr = d3d10_effect_variable_apply(&This->variables[i]); + if (FAILED(hr)) break; + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface,

1 0

Henri Verbeet : d3d10: Create shaders.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 52b24d2284e092c3984553aadea4e669eb904a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b24d2284e092c3984553aad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 08:43:48 2009 +0100 d3d10: Create shaders. --- dlls/d3d10/d3d10_private.h | 9 +++++++ dlls/d3d10/effect.c | 52 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 129a49b..1488b99 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -40,6 +40,7 @@ enum d3d10_effect_variable_type struct d3d10_effect_variable { + struct d3d10_effect_pass *pass; enum d3d10_effect_variable_type type; DWORD idx_offset; void *data; @@ -49,6 +50,12 @@ struct d3d10_effect_shader_variable { char *input_signature; UINT input_signature_size; + union + { + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10GeometryShader *gs; + } shader; }; /* ID3D10EffectPass */ @@ -56,6 +63,7 @@ struct d3d10_effect_pass { const struct ID3D10EffectPassVtbl *vtbl; + struct d3d10_effect_technique *technique; char *name; DWORD start; DWORD variable_count; @@ -67,6 +75,7 @@ struct d3d10_effect_technique { const struct ID3D10EffectTechniqueVtbl *vtbl; + struct d3d10_effect *effect; char *name; DWORD start; DWORD pass_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5e61f6e..dd4c588 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -145,13 +145,17 @@ static HRESULT parse_fx10_pass_index(struct d3d10_effect_pass *p, const char **p for (i = 0; i < p->variable_count; ++i) { - read_dword(ptr, &p->variables[i].type); - TRACE("Variable %u is of type %#x\n", i, p->variables[i].type); + struct d3d10_effect_variable *v = &p->variables[i]; + + v->pass = p; + + read_dword(ptr, &v->type); + TRACE("Variable %u is of type %#x\n", i, v->type); skip_dword_unknown(ptr, 2); - read_dword(ptr, &p->variables[i].idx_offset); - TRACE("Variable %u idx is at offset %#x\n", i, p->variables[i].idx_offset); + read_dword(ptr, &v->idx_offset); + TRACE("Variable %u idx is at offset %#x\n", i, v->idx_offset); } return S_OK; @@ -182,6 +186,7 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons struct d3d10_effect_pass *p = &t->passes[i]; p->vtbl = &d3d10_effect_pass_vtbl; + p->technique = t; hr = parse_fx10_pass_index(p, ptr); if (FAILED(hr)) break; @@ -192,8 +197,7 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) { - struct d3d10_effect_variable *v = ctx; - struct d3d10_effect_shader_variable *s = v->data; + struct d3d10_effect_shader_variable *s = ctx; char tag_str[5]; memcpy(tag_str, &tag, 4); @@ -257,8 +261,11 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag static HRESULT parse_shader(struct d3d10_effect_variable *v, const char *data) { + ID3D10Device *device = v->pass->technique->effect->device; + struct d3d10_effect_shader_variable *s; const char *ptr = data; DWORD dxbc_size; + HRESULT hr; v->data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3d10_effect_shader_variable)); if (!v->data) @@ -267,10 +274,31 @@ static HRESULT parse_shader(struct d3d10_effect_variable *v, const char *data) return E_OUTOFMEMORY; } + if (!ptr) return S_OK; + + s = v->data; + read_dword(&ptr, &dxbc_size); TRACE("dxbc size: %#x\n", dxbc_size); - return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, v); + switch (v->type) + { + case D3D10_EVT_VERTEXSHADER: + hr = ID3D10Device_CreateVertexShader(device, ptr, dxbc_size, &s->shader.vs); + if (FAILED(hr)) return hr; + break; + + case D3D10_EVT_PIXELSHADER: + hr = ID3D10Device_CreatePixelShader(device, ptr, dxbc_size, &s->shader.ps); + if (FAILED(hr)) return hr; + break; + case D3D10_EVT_GEOMETRYSHADER: + hr = ID3D10Device_CreateGeometryShader(device, ptr, dxbc_size, &s->shader.gs); + if (FAILED(hr)) return hr; + break; + } + + return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char *data) @@ -288,10 +316,13 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * if (offset == 1) { WARN("Skipping variable\n"); - return S_OK; + ptr = NULL; + } + else + { + ptr = data + offset; } - ptr = data + offset; switch (v->type) { case D3D10_EVT_VERTEXSHADER: @@ -400,6 +431,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d struct d3d10_effect_technique *t = &e->techniques[i]; t->vtbl = &d3d10_effect_technique_vtbl; + t->effect = e; hr = parse_fx10_technique_index(t, &ptr); if (FAILED(hr)) break; @@ -493,8 +525,6 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) { TRACE("variable %p\n", v); - if (!v->data) return; - switch(v->type) { case D3D10_EVT_VERTEXSHADER:

1 0

Henri Verbeet : d3d10: Implement ID3D10Effect::GetDevice().
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 449be2d316f374e0a70b06c2149dd01807396264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449be2d316f374e0a70b06c21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 6 08:43:48 2009 +0100 d3d10: Implement ID3D10Effect::GetDevice(). --- dlls/d3d10/d3d10_main.c | 2 ++ dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 88fd12b..5746fba 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -224,6 +224,8 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl object->vtbl = &d3d10_effect_vtbl; object->refcount = 1; + ID3D10Device_AddRef(device); + object->device = device; hr = d3d10_effect_parse(object, data, data_size); if (FAILED(hr)) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 01fa69c..129a49b 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -80,6 +80,7 @@ struct d3d10_effect const struct ID3D10EffectVtbl *vtbl; LONG refcount; + ID3D10Device *device; DWORD technique_count; DWORD index_offset; DWORD blendstate_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 02725dd..5e61f6e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -589,6 +589,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) } HeapFree(GetProcessHeap(), 0, This->techniques); } + ID3D10Device_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -613,9 +614,14 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_IsPool(ID3D10Effect *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDevice(ID3D10Effect *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_effect *This = (struct d3d10_effect *)iface; - return E_NOTIMPL; + TRACE("iface %p, device %p\n", iface, device); + + ID3D10Device_AddRef(This->device); + *device = This->device; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDesc(ID3D10Effect *iface, D3D10_EFFECT_DESC *desc)

1 0

Vincent Povirk : wininet: Stub RegisterUrlCacheNotification.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 9da1d844b807dbf0fd4acb08e816babd91150466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da1d844b807dbf0fd4acb08e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 5 11:07:03 2009 -0600 wininet: Stub RegisterUrlCacheNotification. --- dlls/wininet/urlcache.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c22883d..bf67fec 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3626,3 +3626,12 @@ DWORD WINAPI GetDiskInfoA(void *p0, void *p1, void *p2, void *p3) FIXME("(%p, %p, %p, %p)\n", p0, p1, p2, p3); return 0; } + +/*********************************************************************** + * RegisterUrlCacheNotification (WININET.@) + */ +DWORD WINAPI RegisterUrlCacheNotification(LPVOID a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f) +{ + FIXME("(%p %x %x %x %x %x)\n", a, b, c, d, e, f); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 8db462c..78b98cc 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -216,7 +216,7 @@ @ stub PrivacyGetZonePreferenceW # (long long ptr ptr ptr) @ stub PrivacySetZonePreferenceW # (long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) -@ stub RegisterUrlCacheNotification +@ stdcall RegisterUrlCacheNotification(ptr long long long long long) @ stdcall ResumeSuspendedDownload(long long) @ stdcall RetrieveUrlCacheEntryFileA(str ptr ptr long) @ stdcall RetrieveUrlCacheEntryFileW(wstr ptr ptr long)

1 0

Vincent Povirk : advapi32: Stub TraceEvent.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 4351b37d099bc2201181875082503729b903639c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4351b37d099bc220118187508… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 5 09:12:47 2009 -0600 advapi32: Stub TraceEvent. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index bcb2047..9d56c46 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -635,7 +635,7 @@ @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory -@ stub TraceEvent +@ stdcall TraceEvent(double ptr) @ stub TraceEventInstance @ stub TraceMessage @ stub TraceMessageVa diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index d7f50a5..15cf4d5 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -492,6 +492,15 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, } /****************************************************************************** + * TraceEvent [ADVAPI32.@] + */ +ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace ) +{ + FIXME("%s %p\n", wine_dbgstr_longlong(SessionHandle), EventTrace); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * UnregisterTraceGuids [ADVAPI32.@] * * See RegisterTraceGuids

1 0

Juan Lang : crypt32: Fix some test failures on Win9x.
by Alexandre Julliard March 6, 2009

March 6, 2009

Module: wine Branch: master Commit: 93911d781efc5920a684effc9f425c5903618114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93911d781efc5920a684effc9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 5 10:12:02 2009 -0800 crypt32: Fix some test failures on Win9x. --- dlls/crypt32/tests/msg.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index a56a4c6..b0e5bd0 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1685,7 +1685,8 @@ static void test_signed_msg_encoding(void) detachedSignedContent, sizeof(detachedSignedContent)); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); - ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + ok(!ret && (GetLastError() == CRYPT_E_INVALID_INDEX || + broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */)), "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); check_param("detached signed encoded signer", msg, CMSG_ENCODED_SIGNER, signedEncodedSigner, sizeof(signedEncodedSigner)); @@ -2480,7 +2481,8 @@ static void test_decode_msg_get_param(void) ok(value == 1, "Expected 1 signer, got %d\n", value); size = 0; ret = CryptMsgGetParam(msg, CMSG_SIGNER_INFO_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size); else @@ -2502,7 +2504,8 @@ static void test_decode_msg_get_param(void) /* Getting the CMS signer info of a PKCS7 message is possible. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_CMS_SIGNER_INFO_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == CRYPT_E_INVALID_MSG_TYPE /* Win9x */), + "CryptMsgGetParam failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size); else @@ -3096,17 +3099,22 @@ static void test_msg_get_and_verify_signer(void) CryptMsgUpdate(msg, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), TRUE); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); /* the signer index can be retrieved, .. */ signerIndex = 0xdeadbeef; ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, &signerIndex); - ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); - ok(signerIndex == 0, "expected 0, got %d\n", signerIndex); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + if (ret) + ok(signerIndex == 0, "expected 0, got %d\n", signerIndex); /* as can the signer cert. */ signer = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, &signer, NULL); - ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); - ok(signer != NULL && signer != (PCCERT_CONTEXT)0xdeadbeef, + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + if (ret) + ok(signer != NULL && signer != (PCCERT_CONTEXT)0xdeadbeef, "expected a valid signer\n"); if (signer && signer != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(signer); @@ -3124,7 +3132,8 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + ok(!ret && (GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER || + broken(GetLastError() == OSS_DATA_ERROR /* Win9x */)), "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); /* Specifying CMSG_TRUSTED_SIGNER_FLAG and an empty cert store also causes * the message signer not to be found. @@ -3134,7 +3143,8 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + ok(!ret && (GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER || + broken(GetLastError() == OSS_DATA_ERROR /* Win9x */)), "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); ret = CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), @@ -3147,7 +3157,8 @@ static void test_msg_get_and_verify_signer(void) SetLastError(0xdeadbeef); ret = CryptMsgGetAndVerifySigner(msg, 1, &store, CMSG_TRUSTED_SIGNER_FLAG, NULL, NULL); - ok(ret, "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgGetAndVerifySigner failed: 0x%08x\n", GetLastError()); CertCloseStore(store, 0); CryptMsgClose(msg); }

1 0