Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 41319: sync shlguid.h with wine 1.1.23
by cwittich＠svn.reactos.org 07 Jun '09

07 Jun '09

Author: cwittich Date: Sun Jun 7 12:43:36 2009 New Revision: 41319 URL: http://svn.reactos.org/svn/reactos?rev=41319&view=rev Log: sync shlguid.h with wine 1.1.23 Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Sun Jun 7 12:43:36 2009 @@ -19,76 +19,72 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2) +DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); +DEFINE_OLEGUID(CLSID_ShellLink, 0x00021401L, 0, 0); -DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320L, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62); - -DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_SHLGUID(CLSID_ShellLink, 0x00021401L, 0, 0); - -DEFINE_SHLGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); -DEFINE_SHLGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); -DEFINE_SHLGUID(CATID_DeskBand, 0x00021492L, 0, 0); -DEFINE_SHLGUID(CATID_InfoBand, 0x00021493L, 0, 0); -DEFINE_SHLGUID(CATID_CommBand, 0x00021494L, 0, 0); +DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); +DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); +DEFINE_OLEGUID(CATID_DeskBand, 0x00021492L, 0, 0); +DEFINE_OLEGUID(CATID_InfoBand, 0x00021493L, 0, 0); +DEFINE_OLEGUID(CATID_CommBand, 0x00021494L, 0, 0); /* shell32 formatids */ -DEFINE_SHLGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); -DEFINE_SHLGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); +DEFINE_OLEGUID(FMTID_Intshcut, 0x000214A0L, 0, 0); +DEFINE_OLEGUID(FMTID_InternetSite, 0x000214A1L, 0, 0); /* command group ids */ -DEFINE_SHLGUID(CGID_Explorer, 0x000214D0L, 0, 0); -DEFINE_SHLGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); -DEFINE_SHLGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); -DEFINE_SHLGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); +DEFINE_OLEGUID(CGID_Explorer, 0x000214D0L, 0, 0); +DEFINE_OLEGUID(CGID_ShellDocView, 0x000214D1L, 0, 0); +DEFINE_OLEGUID(CGID_ShellServiceObject, 0x000214D2L, 0, 0); +DEFINE_OLEGUID(CGID_ExplorerBarDoc, 0x000214D3L, 0, 0); -DEFINE_SHLGUID(IID_IShellIcon, 0x000214E5L, 0, 0); -DEFINE_SHLGUID(IID_IShellDetails, 0x000214ECL, 0, 0); -DEFINE_SHLGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); -DEFINE_SHLGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); -DEFINE_SHLGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); -DEFINE_SHLGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); -DEFINE_SHLGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); -DEFINE_SHLGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); -DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); +DEFINE_OLEGUID(IID_IShellIcon, 0x000214E5L, 0, 0); +DEFINE_OLEGUID(IID_IShellDetails, 0x000214ECL, 0, 0); +DEFINE_OLEGUID(IID_IDelayedRelease, 0x000214EDL, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookA, 0x000214EFL, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerA, 0x000214F0L, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerSite, 0x000214F3L, 0, 0); +DEFINE_OLEGUID(IID_IPropSheetPage, 0x000214F6L, 0, 0); +DEFINE_OLEGUID(IID_IFileViewerW, 0x000214F8L, 0, 0); +DEFINE_OLEGUID(IID_IShellCopyHookW, 0x000214FCL, 0, 0); +DEFINE_OLEGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); +DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500L, 0, 0); DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); + DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); -DEFINE_GUID(CLSID_NewMenu, 0xd969A300L,0xe7FF,0x11D0,0xA9,0x3B,0x00,0xA0,0xC9,0x0F,0x27,0x19); /* avoid duplicate definitions with shobjidl.h (FIXME) */ -/* DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ -/* DEFINE_SHLGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellView, 0x000214E3L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ -/* DEFINE_SHLGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ -/* DEFINE_SHLGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ -/* DEFINE_SHLGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ -/* DEFINE_SHLGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); -DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); -DEFINE_GUID(SID_STopWindow, 0x49e1b500L, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); -DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233L, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); +DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(SID_STopWindow, 0x49e1b500, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); +DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); #define SID_LinkSite IID_IShellLinkW #define SID_SShellBrowser IID_IShellBrowser @@ -104,6 +100,7 @@ #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) +DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); @@ -123,16 +120,19 @@ DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36, 0x1b, 0x11, 0x03); DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, 0x32, 0xF1, 0xE9, 0x57, 0x5D); + DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57); + DEFINE_GUID(CLSID_QueryAssociations, 0xa07034fd, 0x6caa, 0x4954, 0xac, 0x3f, 0x97, 0xa2, 0x72, 0x16, 0xf9, 0x8a); DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); -DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); -DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); + DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} @@ -165,5 +165,9 @@ DEFINE_GUID(VID_Tile, 0x65f125e5, 0x7be1, 0x4810, 0xba, 0x9d, 0xd2, 0x71, 0xc8, 0x43, 0x2c, 0xe3); DEFINE_GUID(VID_ThumbStrip, 0x8eefa624, 0xd1e9, 0x445b, 0x94, 0xb7, 0x74, 0xfb, 0xce, 0x2e, 0xa1, 0x1a); +/* REACTOS ONLY */ +DEFINE_GUID(CLSID_NewMenu, 0xd969A300L,0xe7FF,0x11D0,0xA9,0x3B,0x00,0xA0,0xC9,0x0F,0x27,0x19); +DEFINE_GUID(IID_IShellFolderViewCB, 0x2047E320L, 0xF2A9, 0x11CE, 0xAE, 0x65, 0x08, 0x00, 0x2B, 0x2E, 0x12, 0x62); +/* END REACTOS ONLY */ #endif /* __WINE_SHLGUID_H */

1 0

[dchapyshev] 41318: - Sync gdiplus with Wine 1.1.23
by dchapyshev＠svn.reactos.org 07 Jun '09

07 Jun '09

Author: dchapyshev Date: Sun Jun 7 11:59:56 2009 New Revision: 41318 URL: http://svn.reactos.org/svn/reactos?rev=41318&view=rev Log: - Sync gdiplus with Wine 1.1.23 Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -29,15 +29,15 @@ @ stdcall GdipAddPathRectangleI(ptr long long long long) @ stdcall GdipAddPathRectangles(ptr ptr long) @ stdcall GdipAddPathRectanglesI(ptr ptr long) -@ stub GdipAddPathString -@ stub GdipAddPathStringI +@ stdcall GdipAddPathString(ptr wstr long ptr long long ptr ptr) +@ stdcall GdipAddPathStringI(ptr wstr long ptr long long ptr ptr) @ stdcall GdipAlloc(long) @ stdcall GdipBeginContainer2(ptr ptr) -@ stub GdipBeginContainer -@ stub GdipBeginContainerI -@ stub GdipBitmapApplyEffect +@ stdcall GdipBeginContainer(ptr ptr ptr long ptr) +@ stdcall GdipBeginContainerI(ptr ptr ptr long ptr) +@ stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) @ stub GdipBitmapConvertFormat -@ stub GdipBitmapCreateApplyEffect +@ stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) @ stub GdipBitmapGetHistogram @ stub GdipBitmapGetHistogramSize @ stdcall GdipBitmapGetPixel(ptr long long ptr) @@ -46,7 +46,7 @@ @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) -@ stub GdipCloneBitmapArea +@ stdcall GdipCloneBitmapArea(long long long long long ptr ptr) @ stdcall GdipCloneBitmapAreaI(long long long long long ptr ptr) @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) @@ -65,7 +65,7 @@ @ stdcall GdipCombineRegionRect(ptr ptr long) @ stdcall GdipCombineRegionRectI(ptr ptr long) @ stdcall GdipCombineRegionRegion(ptr ptr long) -@ stub GdipComment +@ stdcall GdipComment(ptr long ptr) @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream @@ -94,7 +94,7 @@ @ stdcall GdipCreateFromHWND(long ptr) @ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) -@ stub GdipCreateHICONFromBitmap +@ stdcall GdipCreateHICONFromBitmap(ptr ptr) @ stdcall GdipCreateHalftonePalette() @ stdcall GdipCreateHatchBrush(long long long ptr) @ stdcall GdipCreateImageAttributes(ptr) @@ -109,8 +109,8 @@ @ stdcall GdipCreateMatrix3I(ptr ptr ptr) @ stdcall GdipCreateMatrix(ptr) @ stdcall GdipCreateMetafileFromEmf(ptr long ptr) -@ stub GdipCreateMetafileFromFile -@ stub GdipCreateMetafileFromStream +@ stdcall GdipCreateMetafileFromFile(ptr ptr) +@ stdcall GdipCreateMetafileFromStream(ptr ptr) @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stdcall GdipCreateMetafileFromWmfFile(wstr ptr ptr) @ stdcall GdipCreatePath2(ptr ptr long long ptr) @@ -139,7 +139,7 @@ @ stdcall GdipDeleteBrush(ptr) @ stdcall GdipDeleteCachedBitmap(ptr) @ stdcall GdipDeleteCustomLineCap(ptr) -@ stub GdipDeleteEffect +@ stdcall GdipDeleteEffect(ptr) @ stdcall GdipDeleteFont(ptr) @ stdcall GdipDeleteFontFamily(ptr) @ stdcall GdipDeleteGraphics(ptr) @@ -175,10 +175,10 @@ @ stdcall GdipDrawImage(ptr ptr long long) @ stub GdipDrawImageFX @ stdcall GdipDrawImageI(ptr ptr long long) -@ stub GdipDrawImagePointRect -@ stub GdipDrawImagePointRectI -@ stub GdipDrawImagePoints -@ stub GdipDrawImagePointsI +@ stdcall GdipDrawImagePointRect(ptr ptr long long long long long long long) +@ stdcall GdipDrawImagePointRectI(ptr ptr long long long long long long long) +@ stdcall GdipDrawImagePoints(ptr ptr ptr long) +@ stdcall GdipDrawImagePointsI(ptr ptr ptr long) @ stdcall GdipDrawImagePointsRect(ptr ptr ptr long long long long long long ptr ptr ptr) @ stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) @ stdcall GdipDrawImageRect(ptr ptr long long long long) @@ -199,7 +199,7 @@ @ stdcall GdipDrawRectangles(ptr ptr ptr long) @ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) -@ stub GdipEmfToWmfBits +@ stdcall GdipEmfToWmfBits(ptr long ptr long long) @ stdcall GdipEndContainer(ptr ptr) @ stub GdipEnumerateMetafileDestPoint @ stub GdipEnumerateMetafileDestPointI Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -1116,6 +1116,20 @@ return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); } +GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", file, metafile); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream *stream, + GpMetafile **metafile) +{ + FIXME("(%p, %p): stub\n", stream, metafile); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCreateStreamOnFile(GDIPCONST WCHAR * filename, UINT access, IStream **stream) { @@ -1590,6 +1604,36 @@ return Ok; } +GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image, + REAL x, REAL y, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %f, %f, %f, %f, %f, %f, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image, + INT x, INT y, INT srcx, INT srcy, INT srcwidth, INT srcheight, + GpUnit srcUnit) +{ + FIXME("(%p, %p, %d, %d, %d, %d, %d, %d, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPointF *dstpoints, INT count) +{ + FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPoint *dstpoints, INT count) +{ + FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); + return NotImplemented; +} + /* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, @@ -2045,7 +2089,7 @@ POINT corners[4]; WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; - INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, + INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; RECT drawcoord; @@ -2061,8 +2105,21 @@ return NotImplemented; } - if(format) + if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + + /* Should be no need to explicitly test for StringAlignmentNear as + * that is default behavior if no alignment is passed. */ + if(format->vertalign != StringAlignmentNear){ + RectF bounds; + GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + + if(format->vertalign == StringAlignmentCenter) + offsety = (rect->Height - bounds.Height) / 2; + else if(format->vertalign == StringAlignmentFar) + offsety = (rect->Height - bounds.Height); + } + } if(length == -1) length = lstrlenW(string); @@ -2074,9 +2131,9 @@ SetTextColor(graphics->hdc, brush->lb.lbColor); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y; + rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); if (roundr(rect->Width) == 0) @@ -3150,6 +3207,24 @@ *state = 0xdeadbeef; return Ok; +} + +GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) +{ + FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect *dstrect, GDIPCONST GpRect *srcrect, GpUnit unit, GraphicsContainer *state) +{ + FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST BYTE *data) +{ + FIXME("(%p, %d, %p): stub\n", graphics, sizeData, data); + return NotImplemented; } GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsState state) Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -831,6 +831,18 @@ return status; } +GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST Rect* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { TRACE("(%p, %p)\n", path, clone); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Jun 7 11:59:56 2009 @@ -70,6 +70,29 @@ return x; } +GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, + RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) +{ + FIXME("(%p %p %p %d %p %p): stub\n", bitmap, effect, roi, useAuxData, auxData, auxDataSize); + /* + * Note: According to Jose Roca's GDI+ docs, this function is not + * implemented in Windows's GDI+. + */ + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap** inputBitmaps, + INT numInputs, CGpEffect* effect, RECT* roi, RECT* outputRect, + GpBitmap** outputBitmap, BOOL useAuxData, VOID** auxData, INT* auxDataSize) +{ + FIXME("(%p %d %p %p %p %p %d %p %p): stub\n", inputBitmaps, numInputs, effect, roi, outputRect, outputBitmap, useAuxData, auxData, auxDataSize); + /* + * Note: According to Jose Roca's GDI+ docs, this function is not + * implemented in Windows's GDI+. + */ + return NotImplemented; +} + GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { @@ -271,10 +294,18 @@ return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%f,%f,%f,%f,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + FIXME("(%i,%i,%i,%i,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); return NotImplemented; } @@ -655,6 +686,13 @@ return Ok; } +GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap *bitmap, HICON *hicon) +{ + FIXME("(%p, %p)\n", bitmap, hicon); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp) { TRACE("%p\n", cachedbmp); @@ -677,6 +715,13 @@ return InvalidParameter; return GdipDrawImage(graphics, cachedbmp->image, (REAL)x, (REAL)y); +} + +GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE hemf, UINT cbData16, + LPBYTE pData16, INT iMapMode, INT eFlags) +{ + FIXME("(%p, %d, %p, %d, %d): stub\n", hemf, cbData16, pData16, iMapMode, eFlags); + return NotImplemented; } GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) @@ -1586,6 +1631,14 @@ return retval; } +GpStatus WINGDIPAPI GdipDeleteEffect(CGpEffect *effect) +{ + FIXME("(%p): stub\n", effect); + /* note: According to Jose Roca's GDI+ Docs, this is not implemented + * in Windows's gdiplus */ + return NotImplemented; +} + /***************************************************************************** * GdipSetEffectParameters [GDIPLUS.@] */

1 0

[dchapyshev] 41317: - Sync comdlg32, avifil32 with Wine 1.1.23
by dchapyshev＠svn.reactos.org 07 Jun '09

07 Jun '09

Author: dchapyshev Date: Sun Jun 7 11:55:59 2009 New Revision: 41317 URL: http://svn.reactos.org/svn/reactos?rev=41317&view=rev Log: - Sync comdlg32, avifil32 with Wine 1.1.23 Modified: trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/comdlg32/cdlg_De.rc Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Sun Jun 7 11:55:59 2009 @@ -226,7 +226,7 @@ LONG lSkip); static void AVIFILE_UpdateInfo(IAVIFileImpl *This); static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size); HRESULT AVIFILE_CreateAVIFile(REFIID riid, LPVOID *ppv) @@ -2543,7 +2543,7 @@ } static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, - FOURCC ckid, DWORD flags, LPVOID buffer, + FOURCC ckid, DWORD flags, LPCVOID buffer, LONG size) { MMCKINFO ck; Modified: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] Sun Jun 7 11:55:59 2009 @@ -212,40 +212,40 @@ } -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 30, 73, 241, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Suchen" FONT 8, "MS Shell Dlg" { - LTEXT "S&uchen nach:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Richtung", 1072, 107, 26, 68, 28 - CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 + LTEXT "S&uchen nach:", -1, 4, 8, 45, 8 + EDITTEXT 1152, 53, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nu&r ganzes Wort suchen", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Groß-/Klein&schreibung", 1041, 4, 42, 84, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Suchrichtung", 1072, 113, 23, 68, 37 + CONTROL "Nach &oben", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 117, 34, 50, 10 + CONTROL "Nach &unten", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 117, 47, 50, 10 + DEFPUSHBUTTON "&Weitersuchen", IDOK, 187, 5, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 187, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp, 187, 45, 50, 14, WS_GROUP | WS_TABSTOP +} + + +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 44, 240, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ersetzen" FONT 8, "MS Shell Dlg" { - LTEXT "S&uchen nach:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + LTEXT "&Suchen nach:", -1, 4, 9, 48, 8 + EDITTEXT 1152, 56, 7, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Ersetzen &durch:", -1, 4, 26, 52, 8 + EDITTEXT 1153, 56, 24, 112, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nu&r ganzes Wort", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Groß-/Kleins&chreibung", 1041, 5, 62, 86, 12, BS_AUTOCHECKBOX | WS_TABSTOP + DEFPUSHBUTTON "&Weitersuchen", IDOK, 175, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Ersetzen", psh1, 175, 23, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "A&lles ersetzen", psh2, 175, 40, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 175, 57, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp, 175, 74, 60, 14, WS_GROUP | WS_TABSTOP } NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164

1 0

[cwittich] 41316: sync riched20 and riched32 with wine 1.1.23
by cwittich＠svn.reactos.org 07 Jun '09

07 Jun '09

Author: cwittich Date: Sun Jun 7 10:19:03 2009 New Revision: 41316 URL: http://svn.reactos.org/svn/reactos?rev=41316&view=rev Log: sync riched20 and riched32 with wine 1.1.23 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/clipboard.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched32/richedit.c trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -168,7 +168,7 @@ } -void +static void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { Modified: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… ============================================================================== --- trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/clipboard.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -282,6 +282,7 @@ if(dwDirection != DATADIR_GET) { FIXME("Unsupported direction: %d\n", dwDirection); /* WinXP riched20 also returns E_NOTIMPL in this case */ + *ppenumFormatEtc = NULL; return E_NOTIMPL; } return EnumFormatImpl_Create(This->fmtetc, This->fmtetc_cnt, ppenumFormatEtc); Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -2901,7 +2901,7 @@ return ""; } -void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) +static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) { int x,y; ME_DisplayItem *para, *run; @@ -4616,14 +4616,14 @@ return TRUE; } -LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); return DefWindowProcW(hWnd, msg, wParam, lParam); } -LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { +static LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { /* FIXME: Not implemented */ TRACE("hWnd %p msg %04x (%s) %08lx %08lx\n", hWnd, msg, get_msg_name(msg), wParam, lParam); Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -171,9 +171,6 @@ void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height); int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor); void ME_GetSelection(ME_TextEditor *editor, int *from, int *to); int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to); Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -226,10 +226,6 @@ info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } - heap_free (info->inputName); - heap_free (info->outputName); - info->inputName = info->outputName = NULL; - for (i = 0; i < rtfMaxClass; i++) RTFSetClassCallback (info, i, NULL); for (i = 0; i < rtfMaxDestination; i++) @@ -276,39 +272,6 @@ info->canInheritInTbl = FALSE; info->borderType = 0; } - -/* - * Set or get the input or output file name. These are never guaranteed - * to be accurate, only insofar as the calling program makes them so. - */ - -void RTFSetInputName(RTF_Info *info, const char *name) -{ - info->inputName = RTFStrSave (name); - if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory\n"); -} - - -char *RTFGetInputName(const RTF_Info *info) -{ - return (info->inputName); -} - - -void RTFSetOutputName(RTF_Info *info, const char *name) -{ - info->outputName = RTFStrSave (name); - if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory\n"); -} - - -char *RTFGetOutputName(const RTF_Info *info) -{ - return (info->outputName); -} - /* * Install or return a writer callback for a destination type @@ -480,14 +443,6 @@ * twice due to the RTFUngetToken. */ if(RTFCheckCM (info, rtfGroup, rtfEndGroup)) info->stackTop++; -} - - -int RTFPeekToken(RTF_Info *info) -{ - _RTFGetToken (info); - RTFUngetToken (info); - return (info->rtfClass); } @@ -792,29 +747,6 @@ } info->prevChar = c; return (c); -} - - -/* - * Synthesize a token by setting the global variables to the - * values supplied. Typically this is followed with a call - * to RTFRouteToken(). - * - * If a param value other than rtfNoParam is passed, it becomes - * part of the token text. - */ - -static void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) -{ - info->rtfClass = class; - info->rtfMajor = major; - info->rtfMinor = minor; - info->rtfParam = param; - if (param == rtfNoParam) - lstrcpyA(info->rtfTextBuf, text); - else - sprintf (info->rtfTextBuf, "%s%d", text, param); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); } @@ -1281,22 +1213,6 @@ * References to style 0 are mapped onto the Normal style. */ - -static RTFStyle *RTFGetStyle(const RTF_Info *info, int num) -{ - RTFStyle *s; - - if (num == -1) - return (info->styleList); - for (s = info->styleList; s != NULL; s = s->rtfNextStyle) - { - if (s->rtfSNum == num) - break; - } - return (s); /* NULL if not found */ -} - - RTFFont *RTFGetFont(const RTF_Info *info, int num) { RTFFont *f; @@ -1324,59 +1240,6 @@ break; } return (c); /* NULL if not found */ -} - - -/* ---------------------------------------------------------------------- */ - - -/* - * Expand style n, if there is such a style. - */ - -void RTFExpandStyle(RTF_Info *info, int n) -{ - RTFStyle *s; - RTFStyleElt *se; - - if (n == -1) - return; - s = RTFGetStyle (info, n); - if (s == NULL) - return; - if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d\n", n); - s->rtfExpanding = 1; /* set expansion flag for loop detection */ - /* - * Expand "based-on" style (unless it's the same as the current - * style -- Normal style usually gives itself as its own based-on - * style). Based-on style expansion is done by synthesizing - * the token that the writer needs to see in order to trigger - * another style expansion, and feeding to token back through - * the router so the writer sees it. - */ - if (n != s->rtfSBasedOn) - { - RTFSetToken (info, rtfControl, rtfParAttr, rtfStyleNum, - s->rtfSBasedOn, "\\s"); - RTFRouteToken (info); - } - /* - * Now route the tokens unique to this style. RTFSetToken() - * isn't used because it would add the param value to the end - * of the token text, which already has it in. - */ - for (se = s->rtfSSEList; se != NULL; se = se->rtfNextSE) - { - info->rtfClass = se->rtfSEClass; - info->rtfMajor = se->rtfSEMajor; - info->rtfMinor = se->rtfSEMinor; - info->rtfParam = se->rtfSEParam; - lstrcpyA (info->rtfTextBuf, se->rtfSEText); - info->rtfTextLen = lstrlenA (info->rtfTextBuf); - RTFRouteToken (info); - } - s->rtfExpanding = 0; /* done - clear expansion flag */ } @@ -2434,14 +2297,6 @@ } -int RTFHexToChar(int i) -{ - if (i < 10) - return (i + '0'); - return (i - 10 + 'a'); -} - - /* ---------------------------------------------------------------------- */ /* Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -1152,9 +1152,6 @@ int unicodeLength; /* The length of ANSI representation of Unicode characters */ int codePage; /* Current codepage for text conversion */ - char *inputName; - char *outputName; - ME_InStream *stream; ME_TextEditor *editor; @@ -1191,26 +1188,19 @@ void RTFInit (RTF_Info *); void RTFDestroy(RTF_Info *info); -void RTFSetInputName (RTF_Info *, const char *); -char *RTFGetInputName (const RTF_Info *); -void RTFSetOutputName (RTF_Info *, const char *); -char *RTFGetOutputName (const RTF_Info *); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */ -int RTFPeekToken (RTF_Info *); void RTFSetReadHook (RTF_Info *, RTFFuncPtr); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); void RTFReadGroup (RTF_Info *); -void RTFExpandStyle (RTF_Info *, int); int RTFCheckCM (const RTF_Info *, int, int); int RTFCheckCMM (const RTF_Info *, int, int, int); int RTFCheckMM (const RTF_Info *, int, int); RTFFont *RTFGetFont (const RTF_Info *, int); RTFColor *RTFGetColor (const RTF_Info *, int); int RTFCharToHex ( char); -int RTFHexToChar ( int ); void RTFFlushOutputBuffer( RTF_Info *info ); void RTFSetEditStream(RTF_Info *info, ME_InStream *stream); Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/run.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -725,18 +725,6 @@ } /****************************************************************************** - * ME_MustBeWrapped - * - * This should ensure that the given paragraph is wrapped so that its screen - * row structure may be used. But it doesn't, yet. - */ -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para) -{ - assert(para->type == diParagraph); - /* FIXME */ -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor Modified: trunk/reactos/dll/win32/riched32/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched32/richedi… ============================================================================== --- trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched32/richedit.c [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -59,7 +59,7 @@ wndClass.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wndClass.lpfnWndProc = RichEdit10ANSIWndProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = 4; + wndClass.cbWndExtra = sizeof(void *); wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = RICHEDIT_CLASS10A; /* WC_RICHED32A; */ Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/richedit.h [iso-8859-1] Sun Jun 7 10:19:03 2009 @@ -517,7 +517,7 @@ typedef struct _editstream { DWORD_PTR dwCookie; - DWORD_PTR dwError; + DWORD dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM;

1 0

[cwittich] 41315: sync cryptui and crypt32 with wine 1.1.23
by cwittich＠svn.reactos.org 07 Jun '09

07 Jun '09

Author: cwittich Date: Sun Jun 7 09:59:39 2009 New Revision: 41315 URL: http://svn.reactos.org/svn/reactos?rev=41315&view=rev Log: sync cryptui and crypt32 with wine 1.1.23 Added: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc (with props) Modified: trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/cryptui/cryptui.rc Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Sun Jun 7 09:59:39 2009 @@ -197,7 +197,7 @@ struct OIDFunctionSet *set = hFuncSet; char *keyName; HKEY key; - long rc; + LSTATUS rc; TRACE("(%p, %d, %p, %p)\n", hFuncSet, dwEncodingType, pwszDllList, pcchDllList); @@ -299,7 +299,7 @@ char *keyName; const char *funcName; HKEY key; - long rc; + LSTATUS rc; keyName = CRYPT_GetKeyName(dwEncodingType, szFuncName, pszOID); rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key); Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Sun Jun 7 09:59:39 2009 @@ -609,7 +609,7 @@ if ((pInfo->salt.pbData=CryptMemAlloc(CRYPT32_PROTECTDATA_SALT_LEN))) { /* generate random salt */ - if (!CryptGenRandom(hProv, pInfo->salt.cbData, pInfo->salt.pbData)) + if (!CryptGenRandom(hProv, CRYPT32_PROTECTDATA_SALT_LEN, pInfo->salt.pbData)) { ERR("CryptGenRandom\n"); free_protect_data(pInfo); Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rc [iso-8859-1] Sun Jun 7 09:59:39 2009 @@ -48,3 +48,4 @@ #include "cryptui_En.rc" #include "cryptui_Ko.rc" +#include "cryptui_Nl.rc" Added: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc (added) +++ trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc [iso-8859-1] Sun Jun 7 09:59:39 2009 @@ -1,0 +1,461 @@ +/* + * cryptui dll dutch resources + * + * Copyright 2009 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERTIFICATE "Certificaat" + IDS_CERTIFICATEINFORMATION "Certificaat informatie" + IDS_CERT_INFO_BAD_SIG "Dit certificaat heeft een foutieve handtekening. Het certificaat kan gewijzigd of corrupt zijn." + IDS_CERT_INFO_UNTRUSTED_CA "Dit basis certificaat wordt niet vertrouwd. Om het te vertrouwen, voeg het toe aan uw systeem's vertrouwde basis certificatenopslag." + IDS_CERT_INFO_UNTRUSTED_ROOT "Dit certificaat kon niet worden getraceerd naar een vertrouwd basis certificaat." + IDS_CERT_INFO_PARTIAL_CHAIN "De uitgever van dit certificaat kon niet gevonden worden." + IDS_CERT_INFO_BAD_PURPOSES "De doeleinden voor dit certificaat konden niet geverifieerd worden." + IDS_CERT_INFO_PURPOSES "Dit certificaat is bedoeld voor de volgende doeleinden:" + IDS_SUBJECT_HEADING "Verstrekt aan: " + IDS_ISSUER_HEADING "Uitgegeven door: " + IDS_VALID_FROM "geldig vanaf " + IDS_VALID_TO " tot " + IDS_CERTIFICATE_BAD_SIGNATURE "Dit certificaat heeft een foutieve handtekening." + IDS_CERTIFICATE_BAD_TIME "Dit certificaat is verlopen of is nog niet geldig." + IDS_CERTIFICATE_BAD_TIMENEST "De geldigheidsperiode van dit certificaat is groter dan die van zijn uitgever." + IDS_CERTIFICATE_REVOKED "Dit certificaat was teruggeroepen door de uitgever." + IDS_CERTIFICATE_VALID "Dit certificaat is OK." + IDS_FIELD "Veld" + IDS_VALUE "Waarde" + IDS_FIELDS_ALL "<Alle>" + IDS_FIELDS_V1 "Alleen versie 1 velden" + IDS_FIELDS_EXTENSIONS "Alleen extensies" + IDS_FIELDS_CRITICAL_EXTENSIONS "Alleen kritieke extensies" + IDS_FIELDS_PROPERTIES "Alleen eigenschappen" + IDS_FIELD_VERSION "Versie" + IDS_FIELD_SERIAL_NUMBER "Serienummer" + IDS_FIELD_ISSUER "Uitgever" + IDS_FIELD_VALID_FROM "Geldig vanaf" + IDS_FIELD_VALID_TO "Geldig tot" + IDS_FIELD_SUBJECT "Onderwerp" + IDS_FIELD_PUBLIC_KEY "Publieke sleutel" + IDS_FIELD_PUBLIC_KEY_FORMAT "%s (%d bits)" + IDS_PROP_HASH "SHA1 hash" + IDS_PROP_ENHKEY_USAGE "Uitgebreid sleutel gebruik (eigenschap)" + IDS_PROP_FRIENDLY_NAME "Naam alias" + IDS_PROP_DESCRIPTION "Beschrijving" + IDS_CERTIFICATE_PROPERTIES "Certificaat eigenschappen" + IDS_CERTIFICATE_PURPOSE_ERROR "Geef aub. een OID in in de vorm van 1.2.3.4" + IDS_CERTIFICATE_PURPOSE_EXISTS "De ingegeven OID bestaat reeds." + IDS_SELECT_STORE_TITLE "Selecteer certificatenopslag" + IDS_SELECT_STORE "Selecteer aub. een certificatenopslag." + IDS_IMPORT_WIZARD "Certificaat importeerhulp" + IDS_IMPORT_TYPE_MISMATCH "Het bestand bevat objecten die niet voldoen aan de opgegeven criteria. Selecteer aub. een ander bestand." + IDS_IMPORT_FILE_TITLE "Bestand om te importeren" + IDS_IMPORT_FILE_SUBTITLE "Specificeer het bestand dat u wilt importeren." + IDS_IMPORT_STORE_TITLE "Certificatenopslag" + IDS_IMPORT_STORE_SUBTITLE "Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten." + IDS_IMPORT_FILTER_CERT "X.509 Certificaat (*.cer; *.crt)" + IDS_IMPORT_FILTER_PFX "Persoonlijke informatie uitwisseling (*.pfx; *.p12)" + IDS_IMPORT_FILTER_CRL "Certificaat terugroeplijst (*.crl)" + IDS_IMPORT_FILTER_CTL "Certificaat vertrouwenslijst (*.stl)" + IDS_IMPORT_FILTER_SERIALIZED_STORE "Microsoft seriële certificatenopslag (*.sst)" + IDS_IMPORT_FILTER_CMS "CMS/PKCS #7 berichten (*.spc; *.p7b)" + IDS_IMPORT_FILTER_ALL "Alle bestanden (*.*)" + IDS_IMPORT_EMPTY_FILE "Selecteer een bestand." + IDS_IMPORT_BAD_FORMAT "Het bestandsformaat wordt niet herkend. Selecteer aub. een ander bestand." + IDS_IMPORT_OPEN_FAILED "Openen mislukt voor " + IDS_IMPORT_DEST_DETERMINED "Bepaald door het programma" + IDS_IMPORT_SELECT_STORE "Selecteer een opslag" + IDS_IMPORT_STORE_SELECTION "Geselecteerde certificatenopslag" + IDS_IMPORT_DEST_AUTOMATIC "Automatisch bepaald door het programma" + IDS_IMPORT_FILE "Bestand" + IDS_IMPORT_CONTENT "Inhoud" + IDS_IMPORT_CONTENT_CERT "Certificaat" + IDS_IMPORT_CONTENT_CRL "Certificaat terugroeplijst" + IDS_IMPORT_CONTENT_CTL "Certificaat vertrouwenslijst" + IDS_IMPORT_CONTENT_CMS "CMS/PKCS #7 bericht" + IDS_IMPORT_CONTENT_PFX "Persoonlijke informatie uitwisseling" + IDS_IMPORT_CONTENT_STORE "Certificatenopslag" + IDS_IMPORT_SUCCEEDED "Het importeren was succesvol." + IDS_IMPORT_FAILED "Het importeren is mislukt." + IDS_WIZARD_TITLE_FONT "Arial" + IDS_PURPOSE_ALL "<Alle>" + IDS_PURPOSE_ADVANCED "<Geadvanceerde doeleinden>" + IDS_SUBJECT_COLUMN "Verstrekt aan" + IDS_ISSUER_COLUMN "Uitgegeven door" + IDS_EXPIRATION_COLUMN "Verloop datum" + IDS_FRIENDLY_NAME_COLUMN "Naam alias" + IDS_ALLOWED_PURPOSE_ALL "<Alle>" + IDS_ALLOWED_PURPOSE_NONE "<Geen>" + IDS_WARN_REMOVE_MY "U kunt niet langer berichten ontcijferen of ondertekenen met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_MY "U kunt niet langer berichten ontcijferen of ondertekenen met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?" + IDS_WARN_REMOVE_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met dit certificaat.\nWeet u zeker dat u dit certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "U kunt niet langer berichten coderen of verifiëren met deze certificaten.\nWeet u zeker dat u deze certificaten wilt verwijderen?" + IDS_WARN_REMOVE_CA "Certificaten uitgegeven door deze certificaten autoriteit zullen niet meer vertrouwd worden.\nWeet u zeker dat u dit certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_CA "Certificaten uitgegeven door deze certificaten autoriteiten zullen niet meer vertrouwd worden.\nWeet u zeker dat u deze certificaten wilt verwijderen?" + IDS_WARN_REMOVE_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteit, alsmede enige certificatie autoriteit die hij verstrekt, zullen niet meer vertrouwd worden.\nWeet u zeker dat u dit vertrouwde basic certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_ROOT "Certificaten uitgegeven door deze basic certificaten autoriteiten, alsmede enige certificatie autoriteit die zij verstrekken, zullen niet meer vertrouwd worden.\nWeet u zeker dat u deze vertrouwde basic certificaten wilt verwijderen?" + IDS_WARN_REMOVE_TRUSTEDPUBLISHER "Software ondertekend door deze uitgever zal niet meer vertrouwd worden.\nWeet u zeker dat u dit certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_TRUSTEDPUBLISHER "Software ondertekend door deze uitgevers zal niet meer vertrouwd worden.\nWeet u zeker dat u deze certificaten wilt verwijderen?" + IDS_WARN_REMOVE_DEFAULT "Weet u zeker dat u dit certificaat wilt verwijderen?" + IDS_WARN_REMOVE_PLURAL_DEFAULT "Weet u zeker dat u deze certificaten wilt verwijderen?" + IDS_CERT_MGR "Certificaten" + IDS_PURPOSE_SERVER_AUTH "Bewijst de identiteit van een remote computer" + IDS_PURPOSE_CLIENT_AUTH "Bewijst uw identiteit aan een remote computer" + IDS_PURPOSE_CODE_SIGNING "Bewijst dat de software kwam van de software uitgever\nBeschermt software tegen wijzigingen na publicatie" + IDS_PURPOSE_EMAIL_PROTECTION "Beschermt e-mail berichten" + IDS_PURPOSE_IPSEC "Staat beveiligde communicatie over het Internet toe" + IDS_PURPOSE_TIMESTAMP_SIGNING "Laat data ondertekend worden met de huidige tijd" + IDS_PURPOSE_CTL_USAGE_SIGNING "Laat u een certificaat vertrouwenslijst digitaal ondertekenen" + IDS_PURPOSE_EFS "Laat data op de disk gecodeerd worden" + IDS_PURPOSE_EFS_RECOVERY "Bestandsherstel" + IDS_PURPOSE_WHQL "Windows Hardware Driver Verificatie" + IDS_PURPOSE_NT5 "Windows System Component Verificatie" + IDS_PURPOSE_OEM_WHQL "OEM Windows Systeem Component Verificatie" + IDS_PURPOSE_EMBEDDED_NT "Ingebed Windows Systeem Component Verificatie" + IDS_PURPOSE_ROOT_LIST_SIGNER "Basislijst Ondertekenaar" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Gekwalificeerde ondergeschiktheid" + IDS_PURPOSE_KEY_RECOVERY "Sleutel herstellen" + IDS_PURPOSE_DOCUMENT_SIGNING "Document ondertekening" + IDS_PURPOSE_LIFETIME_SIGNING "Levenslang ondertekenen" + IDS_PURPOSE_DRM "Digitale rechten" + IDS_PURPOSE_LICENSES "Sleutelbos licenties" + IDS_PURPOSE_LICENSE_SERVER "Licentieserver verificatie" + IDS_PURPOSE_ENROLLMENT_AGENT "Certificaatverzoek agent" + IDS_PURPOSE_SMARTCARD_LOGON "Smartcard aanloggen" + IDS_PURPOSE_CA_EXCHANGE "Persoonlijke sleutel archiefbescheiden" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Sleutel herstel agent" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory service email replicatie" + IDS_EXPORT_WIZARD "Certificaat Exporteerhulp" + IDS_EXPORT_FORMAT_TITLE "Export formaat" + IDS_EXPORT_FORMAT_SUBTITLE "Selecteer het formaat waarin de inhoud zal worden opgeslagen." + IDS_EXPORT_FILE_TITLE "Exporteer bestandsnaam" + IDS_EXPORT_FILE_SUBTITLE "Geef de naam van het bestand waarin de inhoud zal worden opgeslagen." + IDS_EXPORT_FILE_EXISTS "Het gekozen bestand bestaat reeds. Wilt u het overschrijven?" + IDS_EXPORT_FILTER_CERT "DER-Encoded Binary X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-geëncodeerd X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "Certificaat terugroeplijst (*.crl)" + IDS_EXPORT_FILTER_CTL "Certificaat vertrouwenslijst (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 berichten (*.p7b)" + IDS_EXPORT_FILTER_PFX "Persoonlijke informatie uitwisseling (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "Seriële certificatenopslag (*.sst)" + IDS_EXPORT_FORMAT "Bestandsformaat" + IDS_EXPORT_INCLUDE_CHAIN "Neem alle certificaten in het certificatiepad op" + IDS_EXPORT_KEYS "Exporteer sleutels" + IDS_YES "Ja" + IDS_NO "Nee" + IDS_EXPORT_SUCCEEDED "Het exporteren is gelukt." + IDS_EXPORT_FAILED "Het exporteren is mislukt." + IDS_EXPORT_PRIVATE_KEY_TITLE "Exporteer persoonlijke sleutel" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "Het certificaat bevat een persoonlijke sleutel die mee kan worden geëxporteerd met het certificaat." + IDS_EXPORT_PASSWORD_TITLE "Voer wachtwoord in" + IDS_EXPORT_PASSWORD_SUBTITLE "U kunt een persoonlijke sleutel beveiligen met een wachtwoord." + IDS_EXPORT_PASSWORD_MISMATCH "De wachtwoorden zijn niet gelijk." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "NB: De persoonlijke sleutel voor dit certificaat kon niet geopend worden." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Note: De persoonlijke sleutel voor dit certificaat kan niet geëxporteerd worden." +} + +IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Algemeen" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200 + CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W", + ES_READONLY|WS_DISABLED,8,11,26,26 + CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W", + ES_READONLY|WS_DISABLED,34,11,212,26 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1 + CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", + ES_READONLY|ES_MULTILINE,8,38,238,78 + CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 + CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 + PUSHBUTTON "&Installeer certificaat...", IDC_ADDTOSTORE,103,216,70,14 + PUSHBUTTON "Uitgevers &verklaring", IDC_ISSUERSTATEMENT,177,216,70,14 +END + +IDD_DETAIL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Details" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Toon:", -1, 6,12,40,14 + COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_DETAIL_LIST, "SysListView32", + LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 6,28,241,100 + CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", + ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 + PUSHBUTTON "&Wijzig eigenschappen...", IDC_EDITPROPERTIES,103,216,70,14 + PUSHBUTTON "&Kopieer naar bestand...", IDC_EXPORT,177,216,70,14 +END + +IDD_HIERARCHY DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Certificatie pad" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Certification &pad", -1,6,10,245,165, BS_GROUPBOX + CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, + 13,22,231,130 + PUSHBUTTON "&Bekijk certificaat", IDC_VIEWCERTIFICATE,175,156,70,14 + LTEXT "Certificaat &status:", IDC_CERTIFICATESTATUS,6,183,70,14 + CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 +END + +IDD_USERNOTICE DIALOG DISCARDABLE 0, 0, 255, 256 +CAPTION "Disclaimer" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERNOTICE,"RichEdit20W", + WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 + PUSHBUTTON "&Sluiten", IDOK,103,216,70,14 + PUSHBUTTON "Meer &informatie", IDC_CPS,177,216,70,14 +END + +IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 +CAPTION "Algemeen" +STYLE WS_VISIBLE +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Naam alias:", -1, 6,14,60,14 + EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Beschrijving:", -1, 6,32,60,14 + EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Certificaat doeleinden", -1,6,48,245,165, BS_GROUPBOX + AUTORADIOBUTTON "Schakel alle doeleinden voor dit certificaat &in", + IDC_ENABLE_ALL_PURPOSES, 12,58,180,14, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Schakel alle doeleinden voor dit certificaat &uit", + IDC_DISABLE_ALL_PURPOSES, 12,70,180,14, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Schakel &alleen de volgende doeleinden voor dit certificaat in:", + IDC_ENABLE_SELECTED_PURPOSES, 12,82,180,14, BS_AUTORADIOBUTTON + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 24,100,220,90 + PUSHBUTTON "Voeg &doeleinde toe...", IDC_ADD_PURPOSE,184,194,60,14 +END + +IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 +CAPTION "Voeg doeleinde toe" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Voer het object id. (OID) in voor het toe te voegen certificaat doeleinde:", + -1, 6,6,190,28 + EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL + PUSHBUTTON "OK", IDOK, 33,48,60,14 + PUSHBUTTON "Annuleren", IDCANCEL, 100,48,60,14 +END + +IDD_SELECT_STORE DIALOG DISCARDABLE 0,0,200,136 +CAPTION "Selecteer certificatenopslag" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Selecteer de certificatenopslag die u wilt gebruiken:", IDC_STORE_TEXT, 6,6,190,28 + CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, + 6,28,188,70 + CHECKBOX "&Toon fysieke opslagen", IDC_SHOW_PHYSICAL_STORES, 6,102,90,14, + BS_AUTOCHECKBOX|WS_TABSTOP + PUSHBUTTON "OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Annuleren", IDCANCEL, 144,118,50,14 +END + +IDD_IMPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat importeerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welkom bij de certificaat importeerhulp", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "Deze hulp helps u met het importeren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten uit een bestand naar een certificatenopslag.", + -1, 115,33,195,16 + LTEXT "Een certificaat kan gebruikt worden om u of de computer waarmee u werkt te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten.", + -1, 115,56,195,40 + LTEXT "Om verder te gaan, click op Volgende.", + -1, 115,103,195,8 +END + +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat importeerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bestands&naam:", -1, 21,1,195,10 + EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "B&laderen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + LTEXT "NB: De volgende bestandsformaten kunnen meer dan één certificaat, certificaat terugroeplijst of certificaat vertrouwenslijst bevatten:", + -1, 21,26,265,16 + LTEXT "Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)", + -1, 31,49,265,10 + LTEXT "Persoonlijke informatie uitwisseling/PKCS #12 (.pfx, .p12)", + -1, 31,64,265,10 + LTEXT "Microsoft seriële certificatenopslag (.sst)", + -1, 31,79,265,10 +END + +IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat importeerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wine kan automatisch de certificatenopslag selecteren, of u kunt een locatie opgeven voor de certificaten.", + -1, 21,1,195,20 + AUTORADIOBUTTON "&Automatisch certificatenopslag selecteren", + IDC_IMPORT_AUTO_STORE, 31,18,180,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Plaats alle certificaten in de volgende opslag:", + IDC_IMPORT_SPECIFY_STORE, 31,30,180,12, BS_AUTORADIOBUTTON + EDITTEXT IDC_IMPORT_STORE, 44,49,185,14, ES_READONLY + PUSHBUTTON "B&laderen...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 +END + +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat importeerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Afronden van de certificaat importeerhulp", IDC_IMPORT_TITLE, + 115,1,195,40 + LTEXT "U heeft de certificaat importeerhulp succesvol afgerond.", + -1, 115,33,195,24 + LTEXT "U heeft de volgende instellingen ingegeven:", + -1, 115,57,195,12 + CONTROL "", IDC_IMPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END + +IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270 +CAPTION "Certificaten" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Doeleinden:", -1, 7,9,100,12 + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, + CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + CONTROL "", IDC_MGR_STORES, "SysTabControl32", + WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 + CONTROL "", IDC_MGR_CERTS, "SysListView32", + LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 + PUSHBUTTON "&Importeer...", IDC_MGR_IMPORT, 7,172,51,14 + PUSHBUTTON "&Exporteer...", IDC_MGR_EXPORT, 62,172,51,14, WS_DISABLED + PUSHBUTTON "&Verwijder", IDC_MGR_REMOVE, 117,172,51,14, WS_DISABLED + PUSHBUTTON "Ge&avanceerd...", IDC_MGR_ADVANCED, 277,172,51,14 + GROUPBOX "Certificaat doeleinden", -1,7,194,321,47, BS_GROUPBOX + LTEXT "", IDC_MGR_PURPOSES, 13,208,252,30 + PUSHBUTTON "&Bekijken...", IDC_MGR_VIEW, 269,218,51,14, WS_DISABLED + PUSHBUTTON "&Sluiten", IDCANCEL, 277,249,51,14, BS_DEFPUSHBUTTON +END + +IDD_CERT_MGR_ADVANCED DIALOG DISCARDABLE 0,0,248,176 +CAPTION "Geavanceerde opties" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Certificaat doeleinde", -1, 7,7,234,141, BS_GROUPBOX + LTEXT "Selecteer een of meerdere doelen om te tonen als Geavanceerde doeleinden wordt geselecteerd.", + -1, 14,18,220,16 + LTEXT "&Certificaat doeleinden:", -1, 14,41,90,12, WS_TABSTOP + CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 14,51,220,90 + PUSHBUTTON "OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "Annuleren", IDCANCEL, 190,155,51,14 +END + +IDD_EXPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat exporteerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Welkom bij de Certificaat exporteerhulp", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "Deze hulp assisteerd u bij het exporteren van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten vanuit een certificatenopslag naar een bestand.", + -1, 115,33,195,16 + LTEXT "Een certificaat kan gebruikt worden om u of de computer waarmee u werkt te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Certificatenopslagen zijn verzamelingen van certificaten, certificaat terugroeplijsten en certificaat vertrouwenslijsten.", + -1, 115,56,195,40 + LTEXT "Om verder te gaan, click op Volgende.", + -1, 115,103,195,8 +END + +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat exporteerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Als u de persoonlijke sleutel wilt exporteren zult u later verzocht worden een wachtwoord in te geven om de sleutel te beveiligen.", -1, 21,1,195,23 + LTEXT "Wilt u de persoonlijke sleutel exporteren?", -1, 21,24,195,15 + AUTORADIOBUTTON "&Ja, exporteer de persoonlijke sleutel", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "&Nee, exporteer de persoonlijke sleutel niet", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat exporteerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wachtwoord:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + LTEXT "&Bevestig wachtwoord:", -1, 21,35,195,10 + EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + +IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat exporteerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Selecteer het formaat dat u wilt gebruiken:", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Cryptographisch berichtsyntaxis standaard/PKCS #7 berichten (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + CHECKBOX "Neem &alle certificaten in het certificatiepad op indien mogelijk", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "&Persoonlijke informatie uitwisseling/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "Nee&m alle certificaten in het certificatiepad op indien mogelijk", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "&Gebruikt sterke encryptie", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "Verwijder de persoonlijke s&leutel als de export succesvol is", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat exporteerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bestands&naam:", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "&Bladeren...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "Certificaat exporteerhulp" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Afronden van de Certificaat exporteerhulp", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "U heeft de Certificaat exporteerhulp succesvol afgerond.", + -1, 115,33,195,24 + LTEXT "U heeft de volgende instellingen gespecificeerd:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END Propchange: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjmartin] 41314: - IopUnloadDriver: Only add the DOE_UNLOAD_PENDING to the Device's DeviceExtensions Flags and check for attached devices and reference counts if the DriverObject->DriverUnload is valid. Verified on XP. - IopLoadUnloadDriver: Add a check to verify that ImagePath.Buffer is non null before freeing it.
by mjmartin＠svn.reactos.org 07 Jun '09

07 Jun '09

Author: mjmartin Date: Sun Jun 7 05:18:15 2009 New Revision: 41314 URL: http://svn.reactos.org/svn/reactos?rev=41314&view=rev Log: - IopUnloadDriver: Only add the DOE_UNLOAD_PENDING to the Device's DeviceExtensions Flags and check for attached devices and reference counts if the DriverObject->DriverUnload is valid. Verified on XP. - IopLoadUnloadDriver: Add a check to verify that ImagePath.Buffer is non null before freeing it. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Jun 7 05:18:15 2009 @@ -1083,35 +1083,6 @@ ExFreePool(ImagePath.Buffer); - /* Loop through each device object of the driver - and set DOE_UNLOAD_PENDING flag */ - DeviceObject = DriverObject->DeviceObject; - while (DeviceObject) - { - /* Set the unload pending flag for the device */ - DeviceExtension = IoGetDevObjExtension(DeviceObject); - DeviceExtension->ExtensionFlags |= DOE_UNLOAD_PENDING; - - /* Make sure there are no attached devices or no reference counts */ - if ((DeviceObject->ReferenceCount) || (DeviceObject->AttachedDevice)) - { - /* Not safe to unload */ - DPRINT1("Drivers device object is referenced or has attached devices\n"); - - SafeToUnload = FALSE; - } - - DeviceObject = DeviceObject->NextDevice; - } - - /* If not safe to unload, then return success */ - if (!SafeToUnload) - { - ObDereferenceObject(DriverObject); - return STATUS_SUCCESS; - } - - /* * Unload the module and release the references to the device object */ @@ -1119,6 +1090,34 @@ /* Call the load/unload routine, depending on current process */ if (DriverObject->DriverUnload && DriverObject->DriverSection) { + /* Loop through each device object of the driver + and set DOE_UNLOAD_PENDING flag */ + DeviceObject = DriverObject->DeviceObject; + while (DeviceObject) + { + /* Set the unload pending flag for the device */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); + DeviceExtension->ExtensionFlags |= DOE_UNLOAD_PENDING; + + /* Make sure there are no attached devices or no reference counts */ + if ((DeviceObject->ReferenceCount) || (DeviceObject->AttachedDevice)) + { + /* Not safe to unload */ + DPRINT1("Drivers device object is referenced or has attached devices\n"); + + SafeToUnload = FALSE; + } + + DeviceObject = DeviceObject->NextDevice; + } + + /* If not safe to unload, then return success */ + if (!SafeToUnload) + { + ObDereferenceObject(DriverObject); + return STATUS_SUCCESS; + } + /* Set the unload invoked flag */ DriverObject->Flags |= DRVO_UNLOAD_INVOKED; @@ -1681,7 +1680,8 @@ if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - ExFreePool(ImagePath.Buffer); + if (ImagePath.Buffer) + ExFreePool(ImagePath.Buffer); LoadParams->Status = Status; (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); return;

1 0

[cwittich] 41313: sync shell32 shelllink to wine 1.1.23
by cwittich＠svn.reactos.org 06 Jun '09

06 Jun '09

Author: cwittich Date: Sat Jun 6 21:17:11 2009 New Revision: 41313 URL: http://svn.reactos.org/svn/reactos?rev=41313&view=rev Log: sync shell32 shelllink to wine 1.1.23 Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Sat Jun 6 21:17:11 2009 @@ -575,20 +575,20 @@ /* convert to unicode if necessary */ if( !unicode ) { - count = MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, NULL, 0 ); + count = MultiByteToWideChar( CP_ACP, 0, temp, len, NULL, 0 ); str = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) ); if( !str ) { HeapFree( GetProcessHeap(), 0, temp ); return E_OUTOFMEMORY; } - MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, str, count ); + MultiByteToWideChar( CP_ACP, 0, temp, len, str, count ); HeapFree( GetProcessHeap(), 0, temp ); } else { count /= 2; - str = (LPWSTR) temp; + str = temp; } str[count] = 0; @@ -627,7 +627,7 @@ TRACE("Read %d bytes\n",chunk->size); - *data = (LPVOID) chunk; + *data = chunk; return S_OK; } @@ -676,7 +676,7 @@ char *p = NULL; LOCATION_INFO *loc; HRESULT r; - int n; + DWORD n; r = Stream_ReadChunk( stm, (LPVOID*) &p ); if( FAILED(r) ) @@ -1073,7 +1073,7 @@ memset(&header, 0, sizeof(header)); header.dwSize = sizeof(header); header.fStartup = This->iShowCmd; - memcpy(&header.MagicGuid, &CLSID_ShellLink, sizeof(header.MagicGuid) ); + header.MagicGuid = CLSID_ShellLink; header.wHotKey = This->wHotKey; header.nIcon = This->iIcoNdx; @@ -1308,7 +1308,7 @@ hr = E_FAIL; if (SUCCEEDED(hr)) - *ppv = (IUnknown*) psl; + *ppv = psl; IPersistFile_Release(ppf); } @@ -1539,12 +1539,12 @@ if (SUCCEEDED(hr)) { IExtractIconA* pei; - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); + hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconA, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { - hr = pei->lpVtbl->GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); - - pei->lpVtbl->Release(pei); + hr = IExtractIconA_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); + + IExtractIconA_Release(pei); } IShellFolder_Release(psf); @@ -1919,12 +1919,12 @@ if (SUCCEEDED(hr)) { IExtractIconW* pei; - hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); + hr = IShellFolder_GetUIObjectOf(psf, 0, 1, &pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { - hr = pei->lpVtbl->GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, &wFlags); - - pei->lpVtbl->Release(pei); + hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, &wFlags); + + IExtractIconW_Release(pei); } IShellFolder_Release(psf);

1 0

[cwittich] 41312: update TOKEN_INFORMATION_CLASS enum
by cwittich＠svn.reactos.org 06 Jun '09

06 Jun '09

Author: cwittich Date: Sat Jun 6 20:24:27 2009 New Revision: 41312 URL: http://svn.reactos.org/svn/reactos?rev=41312&view=rev Log: update TOKEN_INFORMATION_CLASS enum Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jun 6 20:24:27 2009 @@ -3082,13 +3082,39 @@ DWORD Sacl; DWORD Dacl; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; + typedef enum _TOKEN_INFORMATION_CLASS { - TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner, - TokenPrimaryGroup,TokenDefaultDacl,TokenSource,TokenType, - TokenImpersonationLevel,TokenStatistics,TokenRestrictedSids, - TokenSessionId,TokenGroupsAndPrivileges,TokenSessionReference, - TokenSandBoxInert,TokenAuditPolicy,TokenOrigin, + TokenUser = 1, + TokenGroups, + TokenPrivileges, + TokenOwner, + TokenPrimaryGroup, + TokenDefaultDacl, + TokenSource, + TokenType, + TokenImpersonationLevel, + TokenStatistics, + TokenRestrictedSids, + TokenSessionId, + TokenGroupsAndPrivileges, + TokenSessionReference, + TokenSandBoxInert, + TokenAuditPolicy, + TokenOrigin, + TokenElevationType, + TokenLinkedToken, + TokenElevation, + TokenHasRestrictions, + TokenAccessInformation, + TokenVirtualizationAllowed, + TokenVirtualizationEnabled, + TokenIntegrityLevel, + TokenUIAccess, + TokenMandatoryPolicy, + TokenLogonSid, + MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; + #endif typedef enum _SID_NAME_USE { SidTypeUser=1,SidTypeGroup,SidTypeDomain,SidTypeAlias,

1 0

[cwittich] 41311: sync kernel32_winetest with wine 1.1.23
by cwittich＠svn.reactos.org 06 Jun '09

06 Jun '09

Author: cwittich Date: Sat Jun 6 20:10:47 2009 New Revision: 41311 URL: http://svn.reactos.org/svn/reactos?rev=41311&view=rev Log: sync kernel32_winetest with wine 1.1.23 Modified: trunk/rostests/winetests/kernel32/comm.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/directory.c trunk/rostests/winetests/kernel32/drive.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/profile.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/kernel32/volume.c Modified: trunk/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/comm.c… ============================================================================== --- trunk/rostests/winetests/kernel32/comm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/comm.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -571,7 +571,10 @@ result = BuildCommDCBW(wide_string, &dcb); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBW", ptest, initial_value, result); @@ -595,7 +598,10 @@ result = BuildCommDCBAndTimeoutsW(wide_string, &dcb, &timeouts); if(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("BuildCommDCBAndTimeoutsW is not available\n"); return; + } /* check results */ check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result); Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… ============================================================================== --- trunk/rostests/winetests/kernel32/debugger.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/debugger.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -282,15 +282,16 @@ /* If, after attaching to the debuggee, the debugger exits without * detaching, then the debuggee gets a special exit code. */ - ok(exit_code == 0xffffffff || /* Win 9x */ - exit_code == 0x80 || /* NT4 */ - exit_code == STATUS_DEBUGGER_INACTIVE, /* Win >= XP */ + ok(exit_code == STATUS_DEBUGGER_INACTIVE || + broken(exit_code == 0xffffffff) || /* Win9x */ + broken(exit_code == WAIT_ABANDONED), /* NT4, W2K */ "wrong exit code : %08x\n", exit_code); } else - ok(exit_code == STATUS_ACCESS_VIOLATION || - exit_code == WAIT_ABANDONED, /* win2k3 */ - "exit code = %08x instead of STATUS_ACCESS_VIOLATION or WAIT_ABANDONED\n", exit_code); + ok(exit_code == STATUS_ACCESS_VIOLATION || + broken(exit_code == WAIT_ABANDONED) || /* NT4, W2K, W2K3 */ + broken(exit_code == 0xffffffff), /* Win9x, WinME */ + "wrong exit code : %08x\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */ @@ -412,8 +413,12 @@ crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (pDebugSetProcessKillOnExit) crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); + else + win_skip("DebugSetProcessKillOnExit is not available\n"); if (pDebugActiveProcessStop) crash_and_debug(hkey, test_exe, "dbg,attach,event,detach"); + else + win_skip("DebugActiveProcessStop is not available\n"); if (disposition == REG_CREATED_NEW_KEY) { Modified: trunk/rostests/winetests/kernel32/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/direct… ============================================================================== --- trunk/rostests/winetests/kernel32/directory.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/directory.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -61,8 +61,11 @@ static const WCHAR fooW[] = {'f','o','o',0}; len_with_null = GetWindowsDirectoryW(NULL, 0); - if (len_with_null==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (len_with_null == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetWindowsDirectoryW is not implemented\n"); return; + } ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n"); lstrcpyW(buf, fooW); @@ -124,8 +127,11 @@ static const WCHAR fooW[] = {'f','o','o',0}; len_with_null = GetSystemDirectoryW(NULL, 0); - if (len_with_null==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (len_with_null == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetSystemDirectoryW is not available\n"); return; + } ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n"); lstrcpyW(buf, fooW); @@ -337,8 +343,11 @@ static const WCHAR questionW[] = {'?',0}; ret = CreateDirectoryW(NULL, NULL); - if (!ret && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("CreateDirectoryW is not available\n"); return; + } ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, "should not create NULL path ret %u err %u\n", ret, GetLastError()); @@ -441,8 +450,11 @@ GetTempPathW(MAX_PATH, tmpdir); lstrcatW(tmpdir, tmp_dir_name); ret = CreateDirectoryW(tmpdir, NULL); - if (!ret && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) - return; + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("CreateDirectoryW is not available\n"); + return; + } ok(ret == TRUE, "CreateDirectoryW should always succeed\n"); Modified: trunk/rostests/winetests/kernel32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/drive.… ============================================================================== --- trunk/rostests/winetests/kernel32/drive.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/drive.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -39,7 +39,8 @@ for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { type = GetDriveTypeA(drive); - ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); + ok(type > DRIVE_UNKNOWN && type <= DRIVE_RAMDISK, + "not a valid drive %c: type %u\n", drive[0], type); if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR, @@ -62,12 +63,13 @@ for (drive[0] = 'A'; drive[0] <= 'Z'; drive[0]++) { type = GetDriveTypeW(drive); - if (type == DRIVE_UNKNOWN && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (type == DRIVE_UNKNOWN && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - /* Must be Win9x which doesn't support the Unicode functions */ + win_skip("GetDriveTypeW is not available on Win9x\n"); return; } - ok(type > 0 && type <= 6, "not a valid drive %c: type %u\n", drive[0], type); + ok(type > DRIVE_UNKNOWN && type <= DRIVE_RAMDISK, + "not a valid drive %c: type %u\n", drive[0], type); if (!(logical_drives & 1)) ok(type == DRIVE_NO_ROOT_DIR, @@ -165,9 +167,9 @@ static const WCHAR unix_style_root_pathW[] = { '/', 0 }; ret = GetDiskFreeSpaceW(NULL, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - if (ret == 0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) - { - /* Must be Win9x which doesn't support the Unicode functions */ + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetDiskFreeSpaceW is not available\n"); return; } ok(ret, "GetDiskFreeSpaceW error %d\n", GetLastError()); Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… ============================================================================== --- trunk/rostests/winetests/kernel32/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/file.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdlib.h> #include <time.h> +#include <stdio.h> #include "wine/test.h" #include "windef.h" @@ -36,6 +37,7 @@ static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); +static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -52,6 +54,13 @@ "1234 43 4kljf lf &%%%&&&&&& 34 4 34 3############# 33 3 3 3 # 3## 3" "sdlkfjasdlkfj a dslkj adsklf \n \nasdklf askldfa sdlkf \nsadklf asdklf asdf "; +struct test_list { + const char *file; + const DWORD err; + const DWORD options; + const BOOL todo_flag; +} ; + static void InitFunctionPointers(void) { HMODULE hkernel32 = GetModuleHandleA("kernel32"); @@ -60,6 +69,7 @@ pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); pReplaceFileW=(void*)GetProcAddress(hkernel32, "ReplaceFileW"); pGetSystemWindowsDirectoryA=(void*)GetProcAddress(hkernel32, "GetSystemWindowsDirectoryA"); + pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hkernel32, "GetVolumeNameForVolumeMountPointA"); } static void test__hread( void ) @@ -633,8 +643,11 @@ DWORD ret; ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -657,13 +670,68 @@ ok(ret, "DeleteFileW: error %d\n", GetLastError()); } + +/* + * Debugging routine to dump a buffer in a hexdump-like fashion. + */ +static void dumpmem(unsigned char* mem, int len) { + int x,y; + char buf[200]; + int ln=0; + + for (x=0; x<len; x+=16) { + ln += sprintf(buf+ln, "%04x: ",x); + for (y=0; y<16; y++) { + if ((x+y)>len) { + ln += sprintf(buf+ln, " "); + } else { + ln += sprintf(buf+ln, "%02hhx ",mem[x+y]); + } + } + ln += sprintf(buf+ln, "- "); + for (y=0; y<16; y++) { + if ((x+y)<=len) { + if (mem[x+y]<32 || mem[x+y]>127) { + ln += sprintf(buf+ln, "."); + } else { + ln += sprintf(buf+ln, "%c",mem[x+y]); + } + } + } + sprintf(buf+ln, "\n"); + trace(buf); + ln = 0; + } +} + static void test_CreateFileA(void) { HANDLE hFile; - char temp_path[MAX_PATH]; + char temp_path[MAX_PATH], dirname[MAX_PATH]; char filename[MAX_PATH]; static const char prefix[] = "pfx"; - DWORD ret; + char windowsdir[MAX_PATH]; + char Volume_1[MAX_PATH]; + unsigned char buffer[512]; + char directory[] = "removeme"; + static const char nt_drive[] = "\\\\?\\A:"; + DWORD i, ret, len; + struct test_list p[] = { + {"", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ + {"", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ + {"a", ERROR_FILE_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ + {"a\\", ERROR_FILE_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ + {"removeme", ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ + {"removeme\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ + {"c:", ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ + {"c:", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ + {"c:\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ + {"c:\\", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ + {"\\\\?\\c:", ERROR_SUCCESS, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ + {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ + {NULL, 0, 0, FALSE} + }; + BY_HANDLE_FILE_INFORMATION Finfo; ret = GetTempPathA(MAX_PATH, temp_path); ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); @@ -707,6 +775,263 @@ ret = DeleteFileA(filename); ok(ret, "DeleteFileA: error %d\n", GetLastError()); + + /* get windows drive letter */ + ret = GetWindowsDirectory(windowsdir, sizeof(windowsdir)); + ok(ret < sizeof(windowsdir), "windowsdir is abnormally long!\n"); + ok(ret != 0, "GetWindowsDirectory: error %d\n", GetLastError()); + + /* test error return codes from CreateFile for some cases */ + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); + strcpy(dirname, temp_path); + strcat(dirname, directory); + ret = CreateDirectory(dirname, NULL); + ok( ret, "Createdirectory failed, gle=%d\n", GetLastError() ); + /* set current drive & directory to known location */ + SetCurrentDirectoryA( temp_path ); + i = 0; + while (p[i].file) + { + filename[0] = 0; + /* update the drive id in the table entry with the current one */ + if (p[i].file[1] == ':') + { + strcpy(filename, p[i].file); + filename[0] = windowsdir[0]; + } + else if (p[i].file[0] == '\\' && p[i].file[5] == ':') + { + strcpy(filename, p[i].file); + filename[4] = windowsdir[0]; + } + else + { + /* prefix the table entry with the current temp directory */ + strcpy(filename, temp_path); + strcat(filename, p[i].file); + } + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + p[i].options, NULL ); + /* if we get ACCESS_DENIED when we do not expect it, assume + * no access to the volume + */ + if (hFile == INVALID_HANDLE_VALUE && + GetLastError() == ERROR_ACCESS_DENIED && + p[i].err != ERROR_ACCESS_DENIED) + { + if (p[i].todo_flag) + skip("Either no authority to volume, or is todo_wine for %s err=%d should be %d\n", filename, GetLastError(), p[i].err); + else + skip("Do not have authority to access volumes. Test for %s skipped\n", filename); + } + /* otherwise validate results with expectations */ + else if (p[i].todo_flag) + todo_wine ok((hFile == INVALID_HANDLE_VALUE && p[i].err == GetLastError()) || + (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), + "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", + filename, hFile, GetLastError(), p[i].err); + else + ok((hFile == INVALID_HANDLE_VALUE && p[i].err == GetLastError()) || + (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), + "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", + filename, hFile, GetLastError(), p[i].err); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); + i++; + } + ret = RemoveDirectoryA(dirname); + ok(ret, "RemoveDirectoryA: error %d\n", GetLastError()); + + + /* test opening directory as a directory */ + hFile = CreateFileA( temp_path, GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_SUCCESS, + "CreateFileA did not work, last error %u on volume <%s>\n", + GetLastError(), temp_path ); + + if (hFile != INVALID_HANDLE_VALUE) + { + ret = GetFileInformationByHandle( hFile, &Finfo ); + if (ret) + { + ok(Finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY, + "CreateFileA probably did not open temp directory %s correctly\n file information does not include FILE_ATTRIBUTE_DIRECTORY, actual=0x%08x\n", + temp_path, Finfo.dwFileAttributes); + } + CloseHandle( hFile ); + } + + + /* *** Test opening volumes/devices using drive letter *** */ + + /* test using drive letter in non-rewrite format without trailing \ */ + /* this should work */ + strcpy(filename, nt_drive); + filename[4] = windowsdir[0]; + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); + if (hFile != INVALID_HANDLE_VALUE || GetLastError() != ERROR_ACCESS_DENIED) + { + /* if we have adm rights to volume, then try rest of tests */ + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + { + /* if we opened the volume/device, try to read it. Since it */ + /* opened, we should be able to read it. We don't care about*/ + /* what the data is at this time. */ + len = 512; + ret = ReadFile( hFile, buffer, len, &len, NULL ); + todo_wine ok(ret, "Failed to read volume, last error %u, %u, for %s\n", + GetLastError(), ret, filename); + if (ret) + { + trace("buffer is\n"); + dumpmem(buffer, 64); + } + CloseHandle( hFile ); + } + + /* test using drive letter with trailing \ and in non-rewrite */ + /* this should not work */ + strcpy(filename, nt_drive); + filename[4] = windowsdir[0]; + strcat( filename, "\\" ); + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); + todo_wine + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, + "CreateFileA should have returned ERROR_PATH_NOT_FOUND on %s, but got %u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); + + /* test using temp path with trailing \ and in non-rewrite as dir */ + /* this should work */ + strcpy(filename, nt_drive); + filename[4] = 0; + strcat( filename, temp_path ); + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL ); + ok(hFile != INVALID_HANDLE_VALUE, + "CreateFileA should have worked on %s, but got %u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); + + /* test using drive letter without trailing \ and in device ns */ + /* this should work */ + strcpy(filename, nt_drive); + filename[4] = windowsdir[0]; + filename[2] = '.'; + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); + } + else + skip("Do not have authority to access volumes. Tests skipped\n"); + + + /* *** Test opening volumes/devices using GUID *** */ + + if (pGetVolumeNameForVolumeMountPointA) + { + strcpy(filename, "c:\\"); + filename[0] = windowsdir[0]; + ret = pGetVolumeNameForVolumeMountPointA( filename, Volume_1, MAX_PATH ); + ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); + ok(strlen(Volume_1) == 49, "GetVolumeNameForVolumeMountPointA returned wrong length name %s\n", Volume_1); + + /* test the result of opening a unique volume name (GUID) */ + /* with the trailing \ */ + /* this should error out */ + strcpy(filename, Volume_1); + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); + todo_wine + ok(hFile == INVALID_HANDLE_VALUE, + "CreateFileA should not have opened %s, hFile %p\n", + filename, hFile); + todo_wine + ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND, + "CreateFileA should have returned ERROR_PATH_NOT_FOUND on %s, but got %u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); + + /* test the result of opening a unique volume name (GUID) */ + /* with the temp path string as dir */ + /* this should work */ + strcpy(filename, Volume_1); + strcat(filename, temp_path+3); + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL ); + todo_wine + ok(hFile != INVALID_HANDLE_VALUE, + "CreateFileA should have opened %s, but got %u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle( hFile ); + + /* test the result of opening a unique volume name (GUID) */ + /* without the trailing \ and in device namespace */ + /* this should work */ + strcpy(filename, Volume_1); + filename[2] = '.'; + filename[48] = 0; + hFile = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); + if (hFile != INVALID_HANDLE_VALUE || GetLastError() != ERROR_ACCESS_DENIED) + { + /* if we have adm rights to volume, then try rest of tests */ + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", + filename, GetLastError()); + if (hFile != INVALID_HANDLE_VALUE) + { + /* if we opened the volume/device, try to read it. Since it */ + /* opened, we should be able to read it. We don't care about*/ + /* what the data is at this time. */ + len = 512; + ret = ReadFile( hFile, buffer, len, &len, NULL ); + todo_wine ok(ret, "Failed to read volume, last error %u, %u, for %s\n", + GetLastError(), ret, filename); + if (ret) + { + trace("buffer is\n"); + dumpmem(buffer, 64); + } + CloseHandle( hFile ); + } + } + else + skip("Do not have authority to access volumes. Tests skipped\n"); + } + else + win_skip("GetVolumeNameForVolumeMountPointA not found\n"); } static void test_CreateFileW(void) @@ -720,8 +1045,11 @@ DWORD ret; ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -864,8 +1192,11 @@ static const WCHAR emptyW[]={'\0'}; ret = DeleteFileW(NULL); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("DeleteFileW is not available\n"); return; + } ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "DeleteFileW(NULL) returned ret=%d error=%d\n",ret,GetLastError()); @@ -984,8 +1315,11 @@ DWORD ret; ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); @@ -1364,7 +1698,12 @@ /* try FindFirstFileA on "C:\foo\" */ SetLastError( 0xdeadbeaf ); - GetTempFileNameA( buffer, "foo", 0, nonexistent ); + if (!GetTempFileNameA( buffer, "foo", 0, nonexistent ) && GetLastError() == ERROR_ACCESS_DENIED) + { + char tmp[MAX_PATH]; + GetTempPathA( sizeof(tmp), tmp ); + GetTempFileNameA( tmp, "foo", 0, nonexistent ); + } DeleteFileA( nonexistent ); strcpy(buffer2, nonexistent); strcat(buffer2, "\\"); @@ -2352,8 +2691,11 @@ } ret = GetTempPathW(MAX_PATH, temp_path); - if (ret==0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… ============================================================================== --- trunk/rostests/winetests/kernel32/format_msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/format_msg.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -1,4 +1,4 @@ -/* Unit test suite for FormatMessageA +/* Unit test suite for FormatMessageA/W * * Copyright 2002 Mike McCormack for CodeWeavers * @@ -22,6 +22,7 @@ #include "wine/test.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" /* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */ @@ -38,6 +39,297 @@ return r; } +static DWORD doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, + LPWSTR out, DWORD outsize, ... ) +{ + va_list list; + DWORD r; + + va_start(list, outsize); + r = FormatMessageW(flags, src, msg_id, + lang_id, out, outsize, &list); + va_end(list); + return r; +} + +static char buf[1024]; +static const char *debugstr_w(const WCHAR *str) +{ + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + +static void test_message_from_string_wide(void) +{ + static const WCHAR test[] = {'t','e','s','t',0}; + static const WCHAR te[] = {'t','e',0}; + static const WCHAR st[] = {'s','t',0}; + static const WCHAR t[] = {'t',0}; + static const WCHAR e[] = {'e',0}; + static const WCHAR s[] = {'s',0}; + static const WCHAR fmt_1[] = {'%','1',0}; + static const WCHAR fmt_12[] = {'%','1','%','2',0}; + static const WCHAR fmt_123[] = {'%','1','%','3','%','2','%','1',0}; + static const WCHAR fmt_123c[] = {'%','1','!','c','!','%','2','!','c','!','%','3','!','c','!','%','1','!','c','!',0}; + static const WCHAR fmt_123lc[] = {'%','1','!','l','c','!','%','2','!','l','c','!','%','3','!','l','c','!','%','1','!','l','c','!',0}; + static const WCHAR fmt_123wc[] = {'%','1','!','w','c','!','%','2','!','w','c','!','%','3','!','w','c','!','%','1','!','w','c','!',0}; + static const WCHAR fmt_123C[] = {'%','1','!','C','!','%','2','!','C','!','%','3','!','C','!','%','1','!','C','!',0}; + static const WCHAR fmt_123d[] = {'%','1','!','d','!','%','2','!','d','!','%','3','!','d','!',0}; + static const WCHAR fmt_1s[] = {'%','1','!','s','!',0}; + static const WCHAR fmt_s[] = {'%','!','s','!',0}; + static const WCHAR fmt_ls[] = {'%','!','l','s','!',0}; + static const WCHAR fmt_ws[] = {'%','!','w','s','!',0}; + static const WCHAR fmt_S[] = {'%','!','S','!',0}; + static const WCHAR fmt_14d[] = {'%','1','!','4','d','!',0}; + static const WCHAR fmt_14x[] = {'%','1','!','4','x','!',0}; + static const WCHAR fmt_14X[] = {'%','1','!','4','X','!',0}; + static const WCHAR fmt_1_4X[] = {'%','1','!','-','4','X','!',0}; + static const WCHAR fmt_1_4d[] = {'%','1','!','-','4','d','!',0}; + static const WCHAR fmt_2pct[] = {' ','%','%','%','%',' ',0}; + static const WCHAR fmt_2dot1d[] = {' ', '%','.','%','.',' ',' ','%','1','!','d','!',0}; + static const WCHAR fmt_t0t[] = {'t','e','s','t','%','0','t','e','s','t',0}; + static const WCHAR fmt_yah[] = {'y','a','h','%','!','%','0',' ',' ',' ',0}; + static const WCHAR fmt_space[] = {'%',' ','%',' ',' ',' ',0}; + static const WCHAR fmt_hi_lf[] = {'h','i','\n',0}; + static const WCHAR fmt_hi_crlf[] = {'h','i','\r','\n',0}; + static const WCHAR fmt_cr[] = {'\r',0}; + static const WCHAR fmt_crcrlf[] = {'\r','\r','\n',0}; + static const WCHAR s_123d[] = {'1','2','3',0}; + static const WCHAR s_14d[] = {' ',' ',' ','1',0}; + static const WCHAR s_14x[] = {' ',' ',' ','b',0}; + static const WCHAR s_14X[] = {' ',' ',' ','B',0}; + static const WCHAR s_1_4X[] = {'B',' ',' ',' ',0}; + static const WCHAR s_14d2[] = {' ',' ','1','1',0}; + static const WCHAR s_1_4d[] = {'1',' ',' ',' ',0}; + static const WCHAR s_1AB[] = {' ','1','A','B',0}; + static const WCHAR s_2pct[] = {' ','%','%',' ',0}; + static const WCHAR s_2dot147[] = {' ','.','.',' ',' ','4','2','7',0}; + static const WCHAR s_yah[] = {'y','a','h','!',0}; + static const WCHAR s_space[] = {' ',' ',' ',' ',0}; + static const WCHAR s_hi_crlf[] = {'h','i','\r','\n',0}; + static const WCHAR s_crlf[] = {'\r','\n',0}; + static const WCHAR s_crlfcrlf[] = {'\r','\n','\r','\n',0}; + static const WCHAR s_hi_sp[] = {'h','i',' ',0}; + static const WCHAR s_sp[] = {' ',0}; + static const WCHAR s_2sp[] = {' ',' ',0}; + WCHAR out[0x100] = {0}; + DWORD r, error; + + SetLastError(0xdeadbeef); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); + error = GetLastError(); + if (!r && error == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FormatMessageW is not implemented\n"); + return; + } + + /* the basics */ + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4, "failed: r=%d\n", r); + + /* using the format feature */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1s, 0, + 0, out, sizeof(out)/sizeof(WCHAR), test); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* no format */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1, 0, + 0, out, sizeof(out)/sizeof(WCHAR), test); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* two pieces */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_12, 0, + 0, out, sizeof(out)/sizeof(WCHAR), te, st); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* three pieces */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123, 0, + 0, out, sizeof(out)/sizeof(WCHAR), t, s, e); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* s doesn't seem to work in format strings */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_s, 0, + 0, out, sizeof(out)/sizeof(WCHAR), test); + ok(!lstrcmpW(&fmt_s[1], out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==3, "failed: r=%d\n", r); + + /* nor ls */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_ls, 0, + 0, out, sizeof(out)/sizeof(WCHAR), test); + ok(!lstrcmpW(&fmt_ls[1], out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4, "failed: r=%d\n", r); + + /* nor S */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_S, 0, + 0, out, sizeof(out)/sizeof(WCHAR), test); + ok(!lstrcmpW(&fmt_S[1], out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==3, "failed: r=%d\n", r); + + /* nor ws */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_ws, 0, + 0, out, sizeof(out)/sizeof(WCHAR), test); + ok(!lstrcmpW(&fmt_ws[1], out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4, "failed: r=%d\n", r); + + /* as characters */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123c, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* lc is unicode */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123lc, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* wc is unicode */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123wc, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* C is unicode */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123C, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 't', 'e', 's'); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* some numbers */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_123d, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 1, 2, 3); + ok(!lstrcmpW(s_123d, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + + /* a single digit with some spacing */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 1); + ok(!lstrcmpW(s_14d, out), "failed out=[%s]\n", debugstr_w(out)); + + /* a single digit, left justified */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4d, 0, + 0, out, sizeof(out)/sizeof(CHAR), 1); + ok(!lstrcmpW(s_1_4d, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* two digit decimal number */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14d, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 11); + ok(!lstrcmpW(s_14d2, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* a hex number */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14x, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 11); + ok(!lstrcmpW(s_14x, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* a hex number, upper case */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14X, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 11); + ok(!lstrcmpW(s_14X, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* a hex number, upper case, left justified */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1_4X, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 11); + ok(!lstrcmpW(s_1_4X, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* a long hex number, upper case */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_14X, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 0x1ab); + ok(!lstrcmpW(s_1AB, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* two percent... */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_2pct, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_2pct, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* periods are special cases */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_2dot1d, 0, + 0, out, sizeof(out)/sizeof(WCHAR), 0x1ab); + ok(!lstrcmpW(s_2dot147, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==8,"failed: r=%d\n", r); + + /* %0 ends the line */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_t0t, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(test, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* %! prints an exclamation */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_yah, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_yah, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* %space */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_space, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_space, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* line feed */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_lf, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_hi_crlf, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* carriage return line feed */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_crlf, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_hi_crlf, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* carriage return */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_cr, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_crlf, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==2,"failed: r=%d\n", r); + + /* double carriage return line feed */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_crcrlf, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_crlfcrlf, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + + /* change of pace... test the low byte of dwflags */ + + /* line feed */ + r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_hi_lf, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_hi_sp, out) || !lstrcmpW(s_hi_crlf, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==3 || r==4,"failed: r=%d\n", r); + + /* carriage return line feed */ + r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_hi_crlf, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_hi_sp, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + + /* carriage return */ + r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_cr, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_sp, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==1,"failed: r=%d\n", r); + + /* double carriage return line feed */ + r = doitW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, fmt_crcrlf, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_2sp, out), "failed out=[%s]\n", debugstr_w(out)); + ok(r==2,"failed: r=%d\n", r); +} + static void test_message_from_string(void) { CHAR out[0x100] = {0}; @@ -80,14 +372,44 @@ ok(!strcmp("!s!", out),"failed out=[%s]\n",out); ok(r==3,"failed: r=%d\n",r); + /* ls is unicode */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ls!", 0, + 0, out, sizeof(out)/sizeof(CHAR), szwTest); + ok(!strcmp("test", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + /* S is unicode */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!S!", 0, 0, out, sizeof(out)/sizeof(CHAR), szwTest); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* ws is unicode */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!ws!", 0, + 0, out, sizeof(out)/sizeof(CHAR), szwTest); + ok(!strcmp("test", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + /* as characters */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!c!%2!c!%3!c!%1!c!", 0, + 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + ok(!strcmp("test", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + + /* lc is unicode */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!lc!%2!lc!%3!lc!%1!lc!", 0, + 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + ok(!strcmp("test", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + + /* wc is unicode */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!wc!%2!wc!%3!wc!%1!wc!", 0, + 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); + ok(!strcmp("test", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + + /* C is unicode */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!C!%2!C!%3!C!%1!C!", 0, 0, out, sizeof(out)/sizeof(CHAR), 't','e','s'); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); @@ -182,19 +504,20 @@ ok(!strcmp("hi\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); - /* carriage return line feed */ + /* carriage return */ r = doit(FORMAT_MESSAGE_FROM_STRING, "\r", 0, 0, out, sizeof(out)/sizeof(CHAR)); ok(!strcmp("\r\n", out),"failed out=[%s]\n",out); ok(r==2,"failed: r=%d\n",r); - /* carriage return line feed */ + /* double carriage return line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING, "\r\r\n", 0, 0, out, sizeof(out)/sizeof(CHAR)); ok(!strcmp("\r\n\r\n", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); /* change of pace... test the low byte of dwflags */ + /* line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "hi\n", 0, 0, out, sizeof(out)/sizeof(CHAR)); @@ -207,13 +530,13 @@ ok(!strcmp("hi ", out),"failed out=[%s]\n",out); ok(r==3,"failed: r=%d\n",r); - /* carriage return line feed */ + /* carriage return */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r", 0, 0, out, sizeof(out)/sizeof(CHAR)); ok(!strcmp(" ", out),"failed out=[%s]\n",out); ok(r==1,"failed: r=%d\n",r); - /* carriage return line feed */ + /* double carriage return line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_MAX_WIDTH_MASK, "\r\r\n", 0, 0, out, sizeof(out)/sizeof(CHAR)); ok(!strcmp(" ", out),"failed out=[%s]\n",out); @@ -248,5 +571,6 @@ START_TEST(format_msg) { test_message_from_string(); + test_message_from_string_wide(); test_message_null_buffer(); } Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… ============================================================================== --- trunk/rostests/winetests/kernel32/heap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/heap.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -362,9 +362,58 @@ GlobalFree(gbl); } +static void test_obsolete_flags(void) +{ + static struct { + UINT flags; + UINT globalflags; + } test_global_flags[] = { + {GMEM_FIXED | GMEM_NOTIFY, 0}, + {GMEM_FIXED | GMEM_DISCARDABLE, 0}, + {GMEM_MOVEABLE | GMEM_NOTIFY, 0}, + {GMEM_MOVEABLE | GMEM_DDESHARE, GMEM_DDESHARE}, + {GMEM_MOVEABLE | GMEM_NOT_BANKED, 0}, + {GMEM_MOVEABLE | GMEM_NODISCARD, 0}, + {GMEM_MOVEABLE | GMEM_DISCARDABLE, GMEM_DISCARDABLE}, + {GMEM_MOVEABLE | GMEM_DDESHARE | GMEM_DISCARDABLE | GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NODISCARD | + GMEM_NOT_BANKED | GMEM_NOTIFY, GMEM_DDESHARE | GMEM_DISCARDABLE}, + }; + + unsigned int i; + HGLOBAL gbl; + UINT resultflags; + + UINT (WINAPI *pGlobalFlags)(HGLOBAL); + + pGlobalFlags = (void *) GetProcAddress(GetModuleHandleA("kernel32"), "GlobalFlags"); + + if (!pGlobalFlags) + { + win_skip("GlobalFlags is not available\n"); + return; + } + + for (i = 0; i < sizeof(test_global_flags)/sizeof(test_global_flags[0]); i++) + { + gbl = GlobalAlloc(test_global_flags[i].flags, 4); + ok(gbl != NULL, "GlobalAlloc failed\n"); + + SetLastError(MAGIC_DEAD); + resultflags = pGlobalFlags(gbl); + + ok( resultflags == test_global_flags[i].globalflags || + broken(resultflags == (test_global_flags[i].globalflags & ~GMEM_DDESHARE)), /* win9x */ + "%u: expected 0x%08x, but returned 0x%08x with %d\n", + i, test_global_flags[i].globalflags, resultflags, GetLastError() ); + + GlobalFree(gbl); + } +} + START_TEST(heap) { test_heap(); + test_obsolete_flags(); /* Test both short and very long blocks */ test_sized_HeapAlloc(1); Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… ============================================================================== --- trunk/rostests/winetests/kernel32/locale.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/locale.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -118,25 +118,77 @@ static void test_GetLocaleInfoA(void) { int ret; + int len; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); char buffer[BUFFER_SIZE]; + char expected[BUFFER_SIZE]; ok(lcid == 0x409, "wrong LCID calculated - %d\n", lcid); + + /* en, ar and zh use SUBLANG_NEUTRAL, but GetLocaleInfo assume SUBLANG_DEFAULT */ + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_ENGLISH, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_ARABIC, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + if (len) { + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_ARABIC, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + } + else + win_skip("LANG_ARABIC not installed\n"); + + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_CHINESE, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + if (len) { + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_CHINESE, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + } + else + win_skip("LANG_CHINESE not installed\n"); + + /* SUBLANG_DEFAULT is required for mlang.dll, but optional for GetLocaleInfo */ + memset(expected, 0, COUNTOF(expected)); + len = GetLocaleInfoA(MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), LOCALE_SLANGUAGE, expected, COUNTOF(expected)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); + ret = GetLocaleInfoA(LANG_GERMAN, LOCALE_SLANGUAGE, buffer, COUNTOF(buffer)); + ok((ret == len) && !lstrcmpA(buffer, expected), + "got %d with '%s' (expected %d with '%s')\n", + ret, buffer, len, expected); + /* HTMLKit and "Font xplorer lite" expect GetLocaleInfoA to * partially fill the buffer even if it is too short. See bug 637. */ - SetLastError(0); memset(buffer, 0, COUNTOF(buffer)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(lcid, NUO|LOCALE_SDAYNAME1, buffer, 0); ok(ret == 7 && !buffer[0], "Expected len=7, got %d\n", ret); - SetLastError(0); memset(buffer, 0, COUNTOF(buffer)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(lcid, NUO|LOCALE_SDAYNAME1, buffer, 3); ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); ok(!strcmp(buffer, "Mon"), "Expected 'Mon', got '%s'\n", buffer); - SetLastError(0); memset(buffer, 0, COUNTOF(buffer)); + SetLastError(0xdeadbeef); + memset(buffer, 0, COUNTOF(buffer)); ret = GetLocaleInfoA(lcid, NUO|LOCALE_SDAYNAME1, buffer, 10); ok(ret == 7, "Expected ret == 7, got %d, error %d\n", ret, GetLastError()); ok(!strcmp(buffer, "Monday"), "Expected 'Monday', got '%s'\n", buffer); @@ -432,7 +484,10 @@ ret = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, DATE_LONGDATE, NULL, input, buffer, COUNTOF(buffer)); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - return; + { + win_skip("GetDateFormatW is not implemented\n"); + return; + } ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); EXPECT_EQW; @@ -1631,8 +1686,11 @@ /* MAP_FOLDDIGITS */ SetLastError(0); ret = pFoldStringA(MAP_FOLDDIGITS, digits_src, -1, dst, 256); - if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FoldStringA is not implemented\n"); return; + } ok(ret == 4, "Expected ret == 4, got %d, error %d\n", ret, GetLastError()); ok(strcmp(dst, digits_dst) == 0, "MAP_FOLDDIGITS: Expected '%s', got '%s'\n", digits_dst, dst); Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… ============================================================================== --- trunk/rostests/winetests/kernel32/module.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/module.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -249,10 +249,24 @@ SetLastError(0xdeadbeef); hmodule = LoadLibraryExA("testfile.dll", hfile, 0); ok(hmodule == 0, "Expected 0, got %p\n", hmodule); - ok(GetLastError() == ERROR_SHARING_VIOLATION || - GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ - GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ - "Unexpected last error, got %d\n", GetLastError()); + todo_wine + { + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ + GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ + "Unexpected last error, got %d\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA("testfile.dll", (HANDLE)0xdeadbeef, 0); + ok(hmodule == 0, "Expected 0, got %p\n", hmodule); + todo_wine + { + ok(GetLastError() == ERROR_SHARING_VIOLATION || + GetLastError() == ERROR_INVALID_PARAMETER || /* win2k3 */ + GetLastError() == ERROR_FILE_NOT_FOUND, /* win9x */ + "Unexpected last error, got %d\n", GetLastError()); + } /* try to open a file that is locked */ SetLastError(0xdeadbeef); @@ -304,6 +318,12 @@ GetLastError() == ERROR_SUCCESS, /* win9x */ "Expected 0xdeadbeef or ERROR_SUCCESS, got %d\n", GetLastError()); + /* try invalid file handle */ + SetLastError(0xdeadbeef); + hmodule = LoadLibraryExA(path, (HANDLE)0xdeadbeef, 0); + if (!hmodule) /* succeeds on xp and older */ + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); + CloseHandle(hmodule); /* load kernel32.dll with no path */ Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… ============================================================================== --- trunk/rostests/winetests/kernel32/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/path.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -878,8 +878,11 @@ lstrcpyW(buf, fooW); len = GetTempPathW(MAX_PATH, buf); - if (len==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + if (len == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("GetTempPathW is not available\n"); return; + } ok(lstrcmpiW(buf, tmp_dirW) == 0, "GetTempPathW returned an incorrect temporary path\n"); ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… ============================================================================== --- trunk/rostests/winetests/kernel32/process.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/process.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -388,7 +388,7 @@ ret = SetConsoleCP(1252); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - win_skip("Setting the codepage is not implemented"); + win_skip("Setting the codepage is not implemented\n"); } else { @@ -927,6 +927,72 @@ okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); assert(DeleteFileA(resfile) != 0); + + if (0) /* Test crashes on NT-based Windows. */ + { + /* Test NULL application name and command line parameters. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + buffer[0] = '\0'; + + /* Test empty application name parameter. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND || + broken(GetLastError() == ERROR_FILE_NOT_FOUND) /* Win9x/WinME */ || + broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + + buffer2[0] = '\0'; + + /* Test empty application name and command line parameters. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND || + broken(GetLastError() == ERROR_FILE_NOT_FOUND) /* Win9x/WinME */ || + broken(GetLastError() == ERROR_ACCESS_DENIED) /* Win98 */, + "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + + /* Test empty command line parameter. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || + GetLastError() == ERROR_PATH_NOT_FOUND /* NT4 */ || + GetLastError() == ERROR_BAD_PATHNAME /* Win98 */, + "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + strcpy(buffer, "doesnotexist.exe"); + strcpy(buffer2, "does not exist.exe"); + + /* Test nonexistent application name. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer2, NULL, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + /* Test nonexistent command line parameter. */ + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(!ret, "CreateProcessA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } static void test_Directory(void) Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… ============================================================================== --- trunk/rostests/winetests/kernel32/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/profile.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -822,17 +822,11 @@ DeleteFileA(filename); } -static DWORD timeout = 0; - static BOOL check_binary_file_data(LPCSTR path, const VOID *data, DWORD size) { HANDLE file; CHAR buf[MAX_PATH]; BOOL ret; - - /* Sleep() is needed on Win9x and WinME */ - if (timeout) - Sleep(timeout); file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) @@ -863,6 +857,19 @@ LPCSTR data; CHAR path[MAX_PATH]; CHAR temp[MAX_PATH]; + + SetLastError(0xdeadbeef); + ret = WritePrivateProfileStringW(NULL, NULL, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + /* Win9x/WinME needs (variable) timeouts between tests and even long timeouts don't + * guarantee a correct result. + * Win9x/WinMe also produces different ini files where there is always a newline before + * a section start (except for the first one). + */ + win_skip("WritePrivateProfileString on Win9x/WinME is hard to test reliably\n"); + return; + } GetTempPathA(MAX_PATH, temp); GetTempFileNameA(temp, "wine", 0, path); @@ -878,8 +885,6 @@ broken(GetLastError() == ERROR_INVALID_PARAMETER) || /* NT4 */ broken(GetLastError() == 0xdeadbeef), /* Win9x and WinME */ "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); - if (GetLastError() == 0xdeadbeef) - timeout = 1000; ok(GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES, "Expected path to not exist\n"); Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… ============================================================================== --- trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -693,7 +693,10 @@ SetLastError(0xdeadbeef); rc=pGetThreadPriorityBoost(curthread,&disabled); if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) - return; /* WinME */ + { + win_skip("GetThreadPriorityBoost is not implemented on WinME\n"); + return; + } todo_wine ok(rc!=0,"error=%d\n",GetLastError()); @@ -755,7 +758,10 @@ /* GetThreadTimes should set all of the parameters passed to it */ error=GetThreadTimes(thread,&creationTime,&exitTime, &kernelTime,&userTime); - if (error!=0 || GetLastError()!=ERROR_CALL_NOT_IMPLEMENTED) { + + if (error == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + win_skip("GetThreadTimes is not implemented\n"); + else { ok(error!=0,"GetThreadTimes failed\n"); ok(creationTime.dwLowDateTime!=99 || creationTime.dwHighDateTime!=99, "creationTime was invalid\n"); Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… ============================================================================== --- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -328,7 +328,7 @@ { static const char testfile[] = "testfile.xxx"; const char *name; - HANDLE file, mapping; + HANDLE file, mapping, map2; void *ptr, *ptr2; MEMORY_BASIC_INFORMATION info; BOOL ret; @@ -365,6 +365,39 @@ ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ|FILE_MAP_WRITE, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); + UnmapViewOfFile( ptr ); + CloseHandle( map2 ); + + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); + if (!ptr) + { + ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + CloseHandle( map2 ); + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, 0, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); + ok( !ptr, "MapViewOfFile succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + CloseHandle( map2 ); + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile NO_ACCESS error %u\n", GetLastError() ); + } + else win_skip( "no access checks on win9x\n" ); + + UnmapViewOfFile( ptr ); + CloseHandle( map2 ); CloseHandle( mapping ); /* read-only mapping */ Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume… ============================================================================== --- trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] Sat Jun 6 20:10:47 2009 @@ -67,7 +67,8 @@ } for (;drivestr[0] <= 'z'; drivestr[0]++) { - ret = QueryDosDeviceA( drivestr, buffer, buflen); + /* Older W2K fails with ERROR_INSUFFICIENT_BUFFER when buflen is > 32767 */ + ret = QueryDosDeviceA( drivestr, buffer, buflen - 1); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p); if (strstr(buffer, "HARDDISK") || strstr(buffer, "RAMDISK")) found = TRUE; @@ -114,7 +115,8 @@ { BOOL ret; char volume[MAX_PATH], path[] = "c:\\"; - DWORD len = sizeof(volume); + DWORD len = sizeof(volume), reti; + char temp_path[MAX_PATH]; /* not present before w2k */ if (!pGetVolumeNameForVolumeMountPointA) { @@ -122,8 +124,15 @@ return; } + reti = GetTempPathA(MAX_PATH, temp_path); + ok(reti != 0, "GetTempPathA error %d\n", GetLastError()); + ok(reti < MAX_PATH, "temp path should fit into MAX_PATH\n"); + ret = pGetVolumeNameForVolumeMountPointA(path, volume, 0); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ + "wrong error, last=%d\n", GetLastError()); if (0) { /* these crash on XP */ ret = pGetVolumeNameForVolumeMountPointA(path, NULL, len); @@ -135,6 +144,43 @@ ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); + ok(!strncmp( volume, "\\\\?\\Volume{", 11), + "GetVolumeNameForVolumeMountPointA failed to return valid string <%s>\n", + volume); + + /* test with too small buffer */ + ret = pGetVolumeNameForVolumeMountPointA(path, volume, 10); + ok(ret == FALSE && GetLastError() == ERROR_FILENAME_EXCED_RANGE, + "GetVolumeNameForVolumeMountPointA failed, wrong error returned, was %d, should be ERROR_FILENAME_EXCED_RANGE\n", + GetLastError()); + + /* Try on a arbitrary directory */ + ret = pGetVolumeNameForVolumeMountPointA(temp_path, volume, len); + ok(ret == FALSE && GetLastError() == ERROR_NOT_A_REPARSE_POINT, + "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", + temp_path, GetLastError()); + + /* Try on a non-existent dos drive */ + path[2] = 0; + for (;path[0] <= 'z'; path[0]++) { + ret = QueryDosDeviceA( path, volume, len); + if(!ret) break; + } + if (path[0] <= 'z') + { + path[2] = '\\'; + ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); + ok(ret == FALSE && GetLastError() == ERROR_FILE_NOT_FOUND, + "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", + path, GetLastError()); + + /* Try without trailing \ and on a non-existent dos drive */ + path[2] = 0; + ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); + ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME, + "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", + path, GetLastError()); + } } static void test_GetVolumeNameForVolumeMountPointW(void) @@ -151,6 +197,9 @@ ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ + "wrong error, last=%d\n", GetLastError()); if (0) { /* these crash on XP */ ret = pGetVolumeNameForVolumeMountPointW(path, NULL, len); @@ -340,7 +389,6 @@ /* get the unique volume name for the windows drive */ ret = pGetVolumeNameForVolumeMountPointA( path, Volume_1, MAX_PATH ); ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); -todo_wine ok(strlen(Volume_1) == 49, "GetVolumeNameForVolumeMountPointA returned wrong length name %s\n", Volume_1); /* get first unique volume name of list */ @@ -358,7 +406,6 @@ break; } } while (pFindNextVolumeA( hFind, Volume_2, MAX_PATH )); -todo_wine ok(found, "volume name %s not found by Find[First/Next]Volume\n", Volume_1); pFindVolumeClose( hFind ); }

1 0

[cwittich] 41310: sync cabinet, jscript, msi and msxml3 with wine 1.1.23
by cwittich＠svn.reactos.org 06 Jun '09

06 Jun '09

Author: cwittich Date: Sat Jun 6 19:59:47 2009 New Revision: 41310 URL: http://svn.reactos.org/svn/reactos?rev=41310&view=rev Log: sync cabinet, jscript, msi and msxml3 with wine 1.1.23 Modified: trunk/reactos/dll/win32/cabinet/fdi.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/math.c trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/string.c trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/alter.c trunk/reactos/dll/win32/msi/create.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/drop.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/join.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/sql.tab.h trunk/reactos/dll/win32/msi/sql.y trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/update.c trunk/reactos/dll/win32/msxml3/node.c Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -2260,7 +2260,7 @@ return DECR_OK; } -static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, +static void free_decompression_temps(HFDI hfdi, const struct fdi_folder *fol, fdi_decomp_state *decomp_state) { switch (fol->comp_type & cffoldCOMPTYPE_MASK) { Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -25,11 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +/* 1601 to 1970 is 369 years plus 89 leap days */ +#define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000) + typedef struct { DispatchEx dispex; /* ECMA-262 3rd Edition 15.9.1.1 */ DOUBLE time; + + LONG bias; } DateInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -81,11 +86,8 @@ /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { - /* FIXME: Handle inf */ - if(8.64e15 < time || time < -8.64e15) { - FIXME("return NaN\n"); - return 0.0; + return ret_nan(); } return floor(time); @@ -308,8 +310,33 @@ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + date = (DateInstance*)dispex; + date->time = time_clip(num_val(&v)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_setMiliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -477,6 +504,9 @@ { DateInstance *date; HRESULT hres; + TIME_ZONE_INFORMATION tzi; + + GetTimeZoneInformation(&tzi); date = heap_alloc_zero(sizeof(DateInstance)); if(!date) @@ -492,6 +522,7 @@ } date->time = time; + date->bias = tzi.Bias; *ret = &date->dispex; return S_OK; @@ -511,12 +542,13 @@ /* ECMA-262 3rd Edition 15.9.3.3 */ case 0: { FILETIME time; + LONGLONG lltime; GetSystemTimeAsFileTime(&time); - - hres = create_date(dispex->ctx, TRUE, - floor((DOUBLE)(time.dwLowDateTime/1e6) + (DOUBLE)time.dwHighDateTime*((DOUBLE)UINT_MAX+1.0)/1.e6), - &date); + lltime = ((LONGLONG)time.dwHighDateTime<<32) + + time.dwLowDateTime; + + hres = create_date(dispex->ctx, TRUE, lltime/10000-TIME_EPOCH, &date); if(FAILED(hres)) return hres; break; Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -351,8 +351,8 @@ HRESULT hres; if(!arg_cnt(dp)) { - FIXME("NAN\n"); - return E_NOTIMPL; + if(retv) num_set_nan(retv); + return S_OK; } if(arg_cnt(dp) >= 2) { Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -255,6 +255,13 @@ #endif } +static inline DOUBLE ret_nan() +{ + VARIANT v; + num_set_nan(&v); + return V_R8(&v); +} + static inline void num_set_inf(VARIANT *v, BOOL positive) { V_VT(v) = VT_R8; Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… ============================================================================== --- trunk/reactos/dll/win32/jscript/lex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lex.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -17,6 +17,7 @@ */ #include <math.h> +#include <limits.h> #include "jscript.h" #include "activscp.h" @@ -29,6 +30,8 @@ #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +#define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) static const WCHAR breakW[] = {'b','r','e','a','k',0}; static const WCHAR caseW[] = {'c','a','s','e',0}; @@ -372,16 +375,42 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **literal) { - double d, tmp = 1.0; - - if(ctx->ptr == ctx->end || !isdigitW(*ctx->ptr)) { - ERR("No digit after point\n"); + LONGLONG d, hlp; + int exp = 0; + + if(ctx->ptr == ctx->end || (!isdigitW(*ctx->ptr) && + *ctx->ptr!='.' && *ctx->ptr!='e' && *ctx->ptr!='E')) { + ERR("Illegal character\n"); return 0; } d = int_part; + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) { + exp++; + break; + } + else + d = hlp; + } + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + exp++; + ctx->ptr++; + } + + if(*ctx->ptr == '.') ctx->ptr++; + + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + hlp = d*10 + *(ctx->ptr++) - '0'; + if(d>LONGLONG_MAX/10 || hlp<0) + break; + + d = hlp; + exp--; + } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - d += (tmp /= 10.0)*(*ctx->ptr++ - '0'); + ctx->ptr++; if(ctx->ptr < ctx->end && (*ctx->ptr == 'e' || *ctx->ptr == 'E')) { int sign = 1, e = 0; @@ -404,16 +433,20 @@ return lex_error(ctx, E_FAIL); } - while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - e = e*10 + *ctx->ptr++ - '0'; + while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + if(e > INT_MAX/10 || (e = e*10 + *ctx->ptr++ - '0')<0) + e = INT_MAX; + } e *= sign; - d *= pow(10, e); + if(exp<0 && e<0 && e+exp>0) exp = INT_MIN; + else if(exp>0 && e>0 && e+exp<0) exp = INT_MAX; + else exp += e; } *literal = parser_alloc(ctx, sizeof(literal_t)); (*literal)->vt = VT_R8; - (*literal)->u.dval = d; + (*literal)->u.dval = (double)d*pow(10, exp); return tNumericLiteral; } @@ -458,13 +491,20 @@ } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - l = l*10 + *(ctx->ptr++)-'0'; + { + d = l*10 + *(ctx->ptr)-'0'; + + /* Check for integer overflow */ + if (l > INT_MAX/10 || d < 0) + return parse_double_literal(ctx, l, literal); + + l = d; + ctx->ptr++; + } if(ctx->ptr < ctx->end) { - if(*ctx->ptr == '.') { - ctx->ptr++; + if(*ctx->ptr == '.' || *ctx->ptr == 'e' || *ctx->ptr == 'E') return parse_double_literal(ctx, l, literal); - } if(is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -105,8 +105,8 @@ static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_LN10, flags, retv); } /* ECMA-262 3rd Edition 15.8.1.6 */ @@ -120,15 +120,15 @@ static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT2, flags, retv); } static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return math_constant(M_SQRT1_2, flags, retv); } /* ECMA-262 3rd Edition 15.8.2.12 */ @@ -160,29 +160,89 @@ static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, acos(num_val(&v))); + return S_OK; } static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, asin(num_val(&v))); + return S_OK; } static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, atan(num_val(&v))); + return S_OK; } static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v1, v2; + HRESULT hres; + + TRACE("\n"); + + if(arg_cnt(dp)<2) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v1); + if(FAILED(hres)) + return hres; + + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v2); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, atan2(num_val(&v1), num_val(&v2))); + return S_OK; } /* ECMA-262 3rd Edition 15.8.2.6 */ @@ -233,8 +293,22 @@ static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, exp(num_val(&v))); + return S_OK; } static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -263,8 +337,24 @@ static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) + num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, log(num_val(&v))); + return S_OK; } /* ECMA-262 3rd Edition 15.8.2.11 */ @@ -351,8 +441,8 @@ TRACE("\n"); if(arg_cnt(dp) < 2) { - FIXME("unimplemented arg_cnt %d\n", arg_cnt(dp)); - return E_NOTIMPL; + if(retv) num_set_nan(retv); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &x); @@ -411,22 +501,64 @@ static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, sin(num_val(&v))); + return S_OK; } static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, sqrt(num_val(&v))); + return S_OK; } static HRESULT Math_tan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, tan(num_val(&v))); + return S_OK; } static const builtin_prop_t Math_props[] = { Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -3396,7 +3396,7 @@ } if(FAILED(hres)) - return hres; + break; if(ret_size == i) { if(ret) Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -254,8 +254,8 @@ return hres; if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) { - FIXME("NAN\n"); - return E_FAIL; + if(retv) num_set_nan(&v); + return S_OK; } idx = V_I4(&v); Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -6076,7 +6076,7 @@ /* FIXME: we should probably check the manifest file here */ if (!MsiGetFileVersionW(assembly->file->TargetPath, version, &size, NULL, NULL) && - strcmpW(version, assembly->file->Version) >= 0) + (!assembly->file->Version || strcmpW(version, assembly->file->Version) >= 0)) { assembly->installed = TRUE; } Modified: trunk/reactos/dll/win32/msi/alter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/alter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/alter.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -257,8 +257,11 @@ return ERROR_FUNCTION_FAILED; r = TABLE_CreateView( db, name, &av->table ); - if (r != ERROR_SUCCESS || !av->table) + if (r != ERROR_SUCCESS) + { + msi_free( av ); return r; + } if (colinfo) colinfo->table = name; Modified: trunk/reactos/dll/win32/msi/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/create.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/create.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -42,7 +42,7 @@ { MSIVIEW view; MSIDATABASE *db; - LPWSTR name; + LPCWSTR name; BOOL bIsTemp; BOOL hold; column_info *col_info; @@ -145,9 +145,9 @@ NULL, }; -static UINT check_columns( column_info *col_info ) -{ - column_info *c1, *c2; +static UINT check_columns( const column_info *col_info ) +{ + const column_info *c1, *c2; /* check for two columns with the same name */ for( c1 = col_info; c1; c1 = c1->next ) @@ -158,7 +158,7 @@ return ERROR_SUCCESS; } -UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *col_info, BOOL hold ) { MSICREATEVIEW *cv = NULL; @@ -180,7 +180,7 @@ for( col = col_info; col; col = col->next ) { if (!col->table) - col->table = strdupW(table); + col->table = table; if( !col->temporary ) temp = FALSE; Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -377,6 +377,7 @@ static const WCHAR type_char[] = {'C','H','A','R',0}; static const WCHAR type_int[] = {'I','N','T',0}; static const WCHAR type_long[] = {'L','O','N','G',0}; + static const WCHAR type_object[] = {'O','B','J','E','C','T',0}; static const WCHAR type_notnull[] = {' ','N','O','T',' ','N','U','L','L',0}; static const WCHAR localizable[] = {' ','L','O','C','A','L','I','Z','A','B','L','E',0}; @@ -421,6 +422,11 @@ else type = type_long; break; + case 'v': + lstrcpyW(extra, type_notnull); + case 'V': + type = type_object; + break; default: ERR("Unknown type: %c\n", types[i][0]); msi_free(columns); @@ -522,8 +528,32 @@ return r; } +static LPWSTR msi_import_stream_filename(LPCWSTR path, LPCWSTR name) +{ + DWORD len; + LPWSTR fullname, ptr; + + len = lstrlenW(path) + lstrlenW(name) + 1; + fullname = msi_alloc(len*sizeof(WCHAR)); + if (!fullname) + return NULL; + + lstrcpyW( fullname, path ); + + /* chop off extension from path */ + ptr = strrchrW(fullname, '.'); + if (!ptr) + { + msi_free (fullname); + return NULL; + } + *ptr++ = '\\'; + lstrcpyW( ptr, name ); + return fullname; +} + static UINT construct_record(DWORD num_columns, LPWSTR *types, - LPWSTR *data, MSIRECORD **rec) + LPWSTR *data, LPWSTR path, MSIRECORD **rec) { UINT i; @@ -542,6 +572,20 @@ if (*data[i]) MSI_RecordSetInteger(*rec, i + 1, atoiW(data[i])); break; + case 'V': case 'v': + if (*data[i]) + { + UINT r; + LPWSTR file = msi_import_stream_filename(path, data[i]); + if (!file) + return ERROR_FUNCTION_FAILED; + + r = MSI_RecordSetStreamFromFileW(*rec, i + 1, file); + msi_free (file); + if (r != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + } + break; default: ERR("Unhandled column type: %c\n", types[i][0]); msiobj_release(&(*rec)->hdr); @@ -554,7 +598,8 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, LPWSTR *labels, LPWSTR **records, - int num_columns, int num_records) + int num_columns, int num_records, + LPWSTR path) { UINT r; int i; @@ -579,7 +624,7 @@ for (i = 0; i < num_records; i++) { - r = construct_record(num_columns, types, records[i], &rec); + r = construct_record(num_columns, types, records[i], path, &rec); if (r != ERROR_SUCCESS) goto done; @@ -683,7 +728,7 @@ } } - r = msi_add_records_to_table( db, columns, types, labels, records, num_columns, num_records ); + r = msi_add_records_to_table( db, columns, types, labels, records, num_columns, num_records, path ); } done: @@ -1011,6 +1056,12 @@ struct list rows; LPWSTR name; DWORD numconflicts; + LPWSTR *columns; + DWORD numcolumns; + LPWSTR *types; + DWORD numtypes; + LPWSTR *labels; + DWORD numlabels; } MERGETABLE; typedef struct _tagMERGEROW @@ -1129,8 +1180,8 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) { MSIRECORD *colnames; - LPWSTR str; - UINT r, i = 0; + LPWSTR str, val; + UINT r, i = 0, sz = 0; int cmp; r = MSI_ViewGetColumnInfo(view, MSICOLINFO_NAMES, &colnames); @@ -1145,7 +1196,43 @@ } while (cmp); msiobj_release(&colnames->hdr); - return msi_dup_record_field(rec, i); + + r = MSI_RecordGetStringW(rec, i, NULL, &sz); + if (r != ERROR_SUCCESS) + return NULL; + sz++; + + if (MSI_RecordGetString(rec, i)) /* check record field is a string */ + { + /* quote string record fields */ + const WCHAR szQuote[] = {'\'', 0}; + sz += 2; + val = msi_alloc(sz*sizeof(WCHAR)); + if (!val) + return NULL; + + lstrcpyW(val, szQuote); + r = MSI_RecordGetStringW(rec, i, val+1, &sz); + lstrcpyW(val+1+sz, szQuote); + } + else + { + /* do not quote integer record fields */ + val = msi_alloc(sz*sizeof(WCHAR)); + if (!val) + return NULL; + + r = MSI_RecordGetStringW(rec, i, val, &sz); + } + + if (r != ERROR_SUCCESS) + { + ERR("failed to get string!\n"); + msi_free(val); + return NULL; + } + + return val; } static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, @@ -1219,31 +1306,34 @@ MERGEDATA *data = param; MERGETABLE *table = data->curtable; MERGEROW *mergerow; - MSIQUERY *dbview; + MSIQUERY *dbview = NULL; MSIRECORD *row = NULL; - LPWSTR query; - UINT r; - - query = create_diff_row_query(data->merge, data->curview, table->name, rec); - if (!query) - return ERROR_OUTOFMEMORY; - - r = MSI_DatabaseOpenViewW(data->db, query, &dbview); - if (r != ERROR_SUCCESS) - goto done; - - r = MSI_ViewExecute(dbview, NULL); - if (r != ERROR_SUCCESS) - goto done; - - r = MSI_ViewFetch(dbview, &row); - if (r == ERROR_SUCCESS && !MSI_RecordsAreEqual(rec, row)) - { - table->numconflicts++; - goto done; - } - else if (r != ERROR_NO_MORE_ITEMS) - goto done; + LPWSTR query = NULL; + UINT r = ERROR_SUCCESS; + + if (TABLE_Exists(data->db, table->name)) + { + query = create_diff_row_query(data->merge, data->curview, table->name, rec); + if (!query) + return ERROR_OUTOFMEMORY; + + r = MSI_DatabaseOpenViewW(data->db, query, &dbview); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewExecute(dbview, NULL); + if (r != ERROR_SUCCESS) + goto done; + + r = MSI_ViewFetch(dbview, &row); + if (r == ERROR_SUCCESS && !MSI_RecordsAreEqual(rec, row)) + { + table->numconflicts++; + goto done; + } + else if (r != ERROR_NO_MORE_ITEMS) + goto done; + } mergerow = msi_alloc(sizeof(MERGEROW)); if (!mergerow) @@ -1269,11 +1359,188 @@ return r; } +static UINT msi_get_table_labels(MSIDATABASE *db, LPCWSTR table, LPWSTR **labels, DWORD *numlabels) +{ + UINT r, i, count; + MSIRECORD *prec = NULL; + + r = MSI_DatabaseGetPrimaryKeys(db, table, &prec); + if (r != ERROR_SUCCESS) + return r; + + count = MSI_RecordGetFieldCount(prec); + *numlabels = count + 1; + *labels = msi_alloc((*numlabels)*sizeof(LPWSTR)); + if (!*labels) + { + r = ERROR_OUTOFMEMORY; + goto end; + } + + (*labels)[0] = strdupW(table); + for (i=1; i<=count; i++ ) + { + (*labels)[i] = strdupW(MSI_RecordGetString(prec, i)); + } + +end: + msiobj_release( &prec->hdr ); + return r; +} + +static UINT msi_get_query_columns(MSIQUERY *query, LPWSTR **columns, DWORD *numcolumns) +{ + UINT r, i, count; + MSIRECORD *prec = NULL; + + r = MSI_ViewGetColumnInfo(query, MSICOLINFO_NAMES, &prec); + if (r != ERROR_SUCCESS) + return r; + + count = MSI_RecordGetFieldCount(prec); + *columns = msi_alloc(count*sizeof(LPWSTR)); + if (!*columns) + { + r = ERROR_OUTOFMEMORY; + goto end; + } + + for (i=1; i<=count; i++ ) + { + (*columns)[i-1] = strdupW(MSI_RecordGetString(prec, i)); + } + + *numcolumns = count; + +end: + msiobj_release( &prec->hdr ); + return r; +} + +static UINT msi_get_query_types(MSIQUERY *query, LPWSTR **types, DWORD *numtypes) +{ + UINT r, i, count; + MSIRECORD *prec = NULL; + + r = MSI_ViewGetColumnInfo(query, MSICOLINFO_TYPES, &prec); + if (r != ERROR_SUCCESS) + return r; + + count = MSI_RecordGetFieldCount(prec); + *types = msi_alloc(count*sizeof(LPWSTR)); + if (!*types) + { + r = ERROR_OUTOFMEMORY; + goto end; + } + + for (i=1; i<=count; i++ ) + { + (*types)[i-1] = strdupW(MSI_RecordGetString(prec, i)); + } + +end: + msiobj_release( &prec->hdr ); + return r; +} + +static void merge_free_rows(MERGETABLE *table) +{ + struct list *item, *cursor; + + LIST_FOR_EACH_SAFE(item, cursor, &table->rows) + { + MERGEROW *row = LIST_ENTRY(item, MERGEROW, entry); + + list_remove(&row->entry); + msiobj_release(&row->data->hdr); + msi_free(row); + } +} + +static void free_merge_table(MERGETABLE *table) +{ + UINT i; + + if (table->labels != NULL) + { + for (i = 0; i < table->numlabels; i++) + msi_free(table->labels[i]); + msi_free(table->labels); + } + + if (table->columns != NULL) + { + for (i = 0; i < table->numcolumns; i++) + msi_free(table->columns[i]); + msi_free(table->columns); + } + + if (table->types != NULL) + { + for (i = 0; i < table->numtypes; i++) + msi_free(table->types[i]); + msi_free(table->types); + } + msi_free(table->name); + merge_free_rows(table); + + msi_free(table); +} + +static UINT msi_get_merge_table (MSIDATABASE *db, LPCWSTR name, MERGETABLE **ptable) +{ + UINT r; + MERGETABLE *table; + MSIQUERY *mergeview = NULL; + + static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ','`','%','s','`',0}; + + table = msi_alloc_zero(sizeof(MERGETABLE)); + if (!table) + { + *ptable = NULL; + return ERROR_OUTOFMEMORY; + } + + r = msi_get_table_labels(db, name, &table->labels, &table->numlabels); + if (r != ERROR_SUCCESS) + goto err; + + r = MSI_OpenQuery(db, &mergeview, query, name); + if (r != ERROR_SUCCESS) + goto err; + + r = msi_get_query_columns(mergeview, &table->columns, &table->numcolumns); + if (r != ERROR_SUCCESS) + goto err; + + r = msi_get_query_types(mergeview, &table->types, &table->numtypes); + if (r != ERROR_SUCCESS) + goto err; + + list_init(&table->rows); + + table->name = strdupW(name); + table->numconflicts = 0; + + msiobj_release(&mergeview->hdr); + *ptable = table; + return ERROR_SUCCESS; + +err: + msiobj_release(&mergeview->hdr); + free_merge_table(table); + *ptable = NULL; + return r; +} + static UINT merge_diff_tables(MSIRECORD *rec, LPVOID param) { MERGEDATA *data = param; MERGETABLE *table; - MSIQUERY *dbview; + MSIQUERY *dbview = NULL; MSIQUERY *mergeview = NULL; LPCWSTR name; UINT r; @@ -1283,40 +1550,35 @@ name = MSI_RecordGetString(rec, 1); - r = MSI_OpenQuery(data->db, &dbview, query, name); - if (r != ERROR_SUCCESS) - return r; - r = MSI_OpenQuery(data->merge, &mergeview, query, name); if (r != ERROR_SUCCESS) goto done; - r = merge_verify_colnames(dbview, mergeview); + if (TABLE_Exists(data->db, name)) + { + r = MSI_OpenQuery(data->db, &dbview, query, name); + if (r != ERROR_SUCCESS) + goto done; + + r = merge_verify_colnames(dbview, mergeview); + if (r != ERROR_SUCCESS) + goto done; + + r = merge_verify_primary_keys(data->db, data->merge, name); + if (r != ERROR_SUCCESS) + goto done; + } + + r = msi_get_merge_table(data->merge, name, &table); if (r != ERROR_SUCCESS) goto done; - r = merge_verify_primary_keys(data->db, data->merge, name); - if (r != ERROR_SUCCESS) - goto done; - - table = msi_alloc(sizeof(MERGETABLE)); - if (!table) - { - r = ERROR_OUTOFMEMORY; - goto done; - } - - list_init(&table->rows); - table->name = strdupW(name); - table->numconflicts = 0; data->curtable = table; data->curview = mergeview; - r = MSI_IterateRecords(mergeview, NULL, merge_diff_row, data); if (r != ERROR_SUCCESS) { - msi_free(table->name); - msi_free(table); + free_merge_table(table); goto done; } @@ -1356,6 +1618,14 @@ UINT r; MERGEROW *row; MSIVIEW *tv; + + if (!TABLE_Exists(db, table->name)) + { + r = msi_add_table_to_db(db, table->columns, table->types, + table->labels, table->numlabels, table->numcolumns); + if (r != ERROR_SUCCESS) + return ERROR_FUNCTION_FAILED; + } LIST_FOR_EACH_ENTRY(row, &table->rows, MERGEROW, entry) { @@ -1415,21 +1685,6 @@ return r; } -static void merge_free_rows(MERGETABLE *table) -{ - struct list *item, *cursor; - - LIST_FOR_EACH_SAFE(item, cursor, &table->rows) - { - MERGEROW *row = LIST_ENTRY(item, MERGEROW, entry); - - list_remove(&row->entry); - merge_free_rows(table); - msiobj_release(&row->data->hdr); - msi_free(row); - } -} - UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LPCWSTR szTableName) { @@ -1483,9 +1738,7 @@ MERGETABLE *table = LIST_ENTRY(item, MERGETABLE, entry); list_remove(&table->entry); - merge_free_rows(table); - msi_free(table->name); - msi_free(table); + free_merge_table(table); } if (conflicts) Modified: trunk/reactos/dll/win32/msi/drop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/drop.c?rev=4… ============================================================================== --- trunk/reactos/dll/win32/msi/drop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/drop.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -113,8 +113,11 @@ return ERROR_FUNCTION_FAILED; r = TABLE_CreateView(db, name, &dv->table); - if (r != ERROR_SUCCESS || !dv->table) + if (r != ERROR_SUCCESS) + { + msi_free( dv ); return r; + } dv->view.ops = &drop_ops; dv->db = db; Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/format.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -869,7 +869,7 @@ DWORD len; UINT rc = ERROR_INVALID_PARAMETER; - TRACE("%p %p %p %i\n", package, record ,buffer, *size); + TRACE("%p %p %p %p\n", package, record, buffer, size); rec = msi_dup_record_field(record,0); if (!rec) Modified: trunk/reactos/dll/win32/msi/join.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/join.c?rev=4… ============================================================================== --- trunk/reactos/dll/win32/msi/join.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/join.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -338,7 +338,10 @@ table = msi_alloc(sizeof(JOINTABLE)); if (!table) - return ERROR_OUTOFMEMORY; + { + r = ERROR_OUTOFMEMORY; + goto end; + } r = TABLE_CreateView( db, tables, &table->view ); if( r != ERROR_SUCCESS ) Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msipriv.h [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -701,8 +701,10 @@ extern UINT MSI_RecordGetStringA( MSIRECORD *, UINT, LPSTR, LPDWORD); extern int MSI_RecordGetInteger( MSIRECORD *, UINT ); extern UINT MSI_RecordReadStream( MSIRECORD *, UINT, char *, LPDWORD); +extern UINT MSI_RecordSetStream(MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetFieldCount( const MSIRECORD *rec ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, UINT, LPCWSTR ); +extern UINT MSI_RecordSetStreamFromFileW( MSIRECORD *, UINT, LPCWSTR ); extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ); extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ); extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ); Modified: trunk/reactos/dll/win32/msi/query.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/query.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/query.h [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -98,7 +98,7 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, struct expr *cond ); -UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/record.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/record.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -661,7 +661,7 @@ return ERROR_SUCCESS; } -static UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) +UINT MSI_RecordSetStream(MSIRECORD *rec, UINT iField, IStream *stream) { if ( (iField == 0) || (iField > rec->count) ) return ERROR_INVALID_PARAMETER; @@ -673,7 +673,7 @@ return ERROR_SUCCESS; } -static UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) +UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, UINT iField, LPCWSTR szFilename) { IStream *stm = NULL; HRESULT r; @@ -930,6 +930,7 @@ msiobj_release(&clone->hdr); return NULL; } + clone->fields[i].type = MSIFIELD_STREAM; } else { Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -1822,7 +1822,7 @@ LPWSTR patch, LPWSTR targetprod, MSIINSTALLCONTEXT *targetctx, LPWSTR targetsid, DWORD *sidsize, LPWSTR *transforms) { - MSIPATCHSTATE state; + MSIPATCHSTATE state = MSIPATCHSTATE_INVALID; LPWSTR ptr, patches = NULL; HKEY prod, patchkey = 0; HKEY localprod = 0, localpatch = 0; Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/sql.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/sql.tab.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -111,6 +111,7 @@ #include "query.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unicode.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info @@ -133,7 +134,7 @@ static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); -static LPWSTR parser_add_table( LPWSTR list, LPWSTR table ); +static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ); static void *parser_alloc( void *info, unsigned int sz ); static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ); @@ -149,7 +150,7 @@ /* Line 189 of yacc.c */ -#line 153 "sql.tab.c" +#line 154 "sql.tab.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -247,7 +248,7 @@ { /* Line 214 of yacc.c */ -#line 75 "sql.y" +#line 76 "sql.y" struct sql_str str; LPWSTR string; @@ -260,7 +261,7 @@ /* Line 214 of yacc.c */ -#line 264 "sql.tab.c" +#line 265 "sql.tab.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -272,7 +273,7 @@ /* Line 264 of yacc.c */ -#line 276 "sql.tab.c" +#line 277 "sql.tab.c" #ifdef short # undef short @@ -594,12 +595,12 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 125, 125, 133, 134, 135, 136, 137, 138, 139, - 143, 153, 166, 182, 197, 207, 220, 233, 243, 253, - 266, 270, 277, 290, 300, 310, 317, 326, 330, 334, - 341, 345, 352, 356, 360, 364, 368, 372, 376, 383, - 392, 405, 409, 413, 429, 450, 451, 455, 462, 463, - 479, 489, 502, 507, 516, 522, 528, 534, 540, 546, + 0, 126, 126, 134, 135, 136, 137, 138, 139, 140, + 144, 154, 167, 183, 198, 208, 221, 234, 244, 254, + 267, 271, 278, 291, 301, 311, 318, 327, 331, 335, + 342, 346, 353, 357, 361, 365, 369, 373, 377, 384, + 393, 406, 410, 414, 430, 451, 452, 456, 463, 464, + 480, 490, 502, 507, 516, 522, 528, 534, 540, 546, 552, 558, 564, 570, 576, 585, 586, 590, 597, 608, 609, 617, 625, 631, 637, 643, 652, 661, 667, 676, 683, 691 @@ -1611,7 +1612,7 @@ case 2: /* Line 1455 of yacc.c */ -#line 126 "sql.y" +#line 127 "sql.y" { SQL_input* sql = (SQL_input*) info; *sql->view = (yyvsp[(1) - (1)].query); @@ -1621,7 +1622,7 @@ case 10: /* Line 1455 of yacc.c */ -#line 144 "sql.y" +#line 145 "sql.y" { SQL_input *sql = (SQL_input*) info; MSIVIEW *insert = NULL; @@ -1636,7 +1637,7 @@ case 11: /* Line 1455 of yacc.c */ -#line 154 "sql.y" +#line 155 "sql.y" { SQL_input *sql = (SQL_input*) info; MSIVIEW *insert = NULL; @@ -1651,7 +1652,7 @@ case 12: /* Line 1455 of yacc.c */ -#line 167 "sql.y" +#line 168 "sql.y" { SQL_input* sql = (SQL_input*) info; MSIVIEW *create = NULL; @@ -1672,7 +1673,7 @@ case 13: /* Line 1455 of yacc.c */ -#line 183 "sql.y" +#line 184 "sql.y" { SQL_input* sql = (SQL_input*) info; MSIVIEW *create = NULL; @@ -1689,7 +1690,7 @@ case 14: /* Line 1455 of yacc.c */ -#line 198 "sql.y" +#line 199 "sql.y" { SQL_input* sql = (SQL_input*) info; MSIVIEW *update = NULL; @@ -1704,7 +1705,7 @@ case 15: /* Line 1455 of yacc.c */ -#line 208 "sql.y" +#line 209 "sql.y" { SQL_input* sql = (SQL_input*) info; MSIVIEW *update = NULL; @@ -1719,7 +1720,7 @@ case 16: /* Line 1455 of yacc.c */ -#line 221 "sql.y" +#line 222 "sql.y" { SQL_input* sql = (SQL_input*) info; MSIVIEW *delete = NULL; @@ -1734,7 +1735,7 @@ case 17: /* Line 1455 of yacc.c */ -#line 234 "sql.y" +#line 235 "sql.y" { SQL_input* sql = (SQL_input*) info; MSIVIEW *alter = NULL; @@ -1749,7 +1750,7 @@ case 18: /* Line 1455 of yacc.c */ -#line 244 "sql.y" +#line 245 "sql.y" { SQL_input *sql = (SQL_input *)info; MSIVIEW *alter = NULL; @@ -1764,7 +1765,7 @@ case 19: /* Line 1455 of yacc.c */ -#line 254 "sql.y" +#line 255 "sql.y" { SQL_input *sql = (SQL_input *)info; MSIVIEW *alter = NULL; @@ -1779,7 +1780,7 @@ case 20: /* Line 1455 of yacc.c */ -#line 267 "sql.y" +#line 268 "sql.y" { (yyval.integer) = 1; ;} @@ -1788,7 +1789,7 @@ case 21: /* Line 1455 of yacc.c */ -#line 271 "sql.y" +#line 272 "sql.y" { (yyval.integer) = -1; ;} @@ -1797,7 +1798,7 @@ case 22: /* Line 1455 of yacc.c */ -#line 278 "sql.y" +#line 279 "sql.y" { SQL_input* sql = (SQL_input*) info; UINT r; @@ -1812,7 +1813,7 @@ case 23: /* Line 1455 of yacc.c */ -#line 291 "sql.y" +#line 292 "sql.y" { if( SQL_MarkPrimaryKeys( &(yyvsp[(1) - (4)].column_list), (yyvsp[(4) - (4)].column_list) ) ) (yyval.column_list) = (yyvsp[(1) - (4)].column_list); @@ -1824,7 +1825,7 @@ case 24: /* Line 1455 of yacc.c */ -#line 301 "sql.y" +#line 302 "sql.y" { column_info *ci; @@ -1839,7 +1840,7 @@ case 25: /* Line 1455 of yacc.c */ -#line 311 "sql.y" +#line 312 "sql.y" { (yyval.column_list) = (yyvsp[(1) - (1)].column_list); ;} @@ -1848,7 +1849,7 @@ case 26: /* Line 1455 of yacc.c */ -#line 318 "sql.y" +#line 319 "sql.y" { (yyval.column_list) = (yyvsp[(1) - (2)].column_list); (yyval.column_list)->type = ((yyvsp[(2) - (2)].column_type) | MSITYPE_VALID); @@ -1859,7 +1860,7 @@ case 27: /* Line 1455 of yacc.c */ -#line 327 "sql.y" +#line 328 "sql.y" { (yyval.column_type) = (yyvsp[(1) - (1)].column_type); ;} @@ -1868,7 +1869,7 @@ case 28: /* Line 1455 of yacc.c */ -#line 331 "sql.y" +#line 332 "sql.y" { (yyval.column_type) = (yyvsp[(1) - (2)].column_type) | MSITYPE_LOCALIZABLE; ;} @@ -1877,7 +1878,7 @@ case 29: /* Line 1455 of yacc.c */ -#line 335 "sql.y" +#line 336 "sql.y" { (yyval.column_type) = (yyvsp[(1) - (2)].column_type) | MSITYPE_TEMPORARY; ;} @@ -1886,7 +1887,7 @@ case 30: /* Line 1455 of yacc.c */ -#line 342 "sql.y" +#line 343 "sql.y" { (yyval.column_type) |= MSITYPE_NULLABLE; ;} @@ -1895,7 +1896,7 @@ case 31: /* Line 1455 of yacc.c */ -#line 346 "sql.y" +#line 347 "sql.y" { (yyval.column_type) = (yyvsp[(1) - (3)].column_type); ;} @@ -1904,7 +1905,7 @@ case 32: /* Line 1455 of yacc.c */ -#line 353 "sql.y" +#line 354 "sql.y" { (yyval.column_type) = MSITYPE_STRING | 1; ;} @@ -1913,7 +1914,7 @@ case 33: /* Line 1455 of yacc.c */ -#line 357 "sql.y" +#line 358 "sql.y" { (yyval.column_type) = MSITYPE_STRING | 0x400 | (yyvsp[(3) - (4)].column_type); ;} @@ -1922,7 +1923,7 @@ case 34: /* Line 1455 of yacc.c */ -#line 361 "sql.y" +#line 362 "sql.y" { (yyval.column_type) = MSITYPE_STRING | 0x400; ;} @@ -1931,7 +1932,7 @@ case 35: /* Line 1455 of yacc.c */ -#line 365 "sql.y" +#line 366 "sql.y" { (yyval.column_type) = 2 | 0x400; ;} @@ -1940,7 +1941,7 @@ case 36: /* Line 1455 of yacc.c */ -#line 369 "sql.y" +#line 370 "sql.y" { (yyval.column_type) = 2 | 0x400; ;} @@ -1949,7 +1950,7 @@ case 37: /* Line 1455 of yacc.c */ -#line 373 "sql.y" +#line 374 "sql.y" { (yyval.column_type) = 4; ;} @@ -1958,7 +1959,7 @@ case 38: /* Line 1455 of yacc.c */ -#line 377 "sql.y" +#line 378 "sql.y" { (yyval.column_type) = MSITYPE_STRING | MSITYPE_VALID; ;} @@ -1967,7 +1968,7 @@ case 39: /* Line 1455 of yacc.c */ -#line 384 "sql.y" +#line 385 "sql.y" { if( ( (yyvsp[(1) - (1)].integer) > 255 ) || ( (yyvsp[(1) - (1)].integer) < 0 ) ) YYABORT; @@ -1978,7 +1979,7 @@ case 40: /* Line 1455 of yacc.c */ -#line 393 "sql.y" +#line 394 "sql.y" { UINT r; @@ -1996,7 +1997,7 @@ case 42: /* Line 1455 of yacc.c */ -#line 410 "sql.y" +#line 411 "sql.y" { (yyval.query) = (yyvsp[(2) - (2)].query); ;} @@ -2005,7 +2006,7 @@ case 43: /* Line 1455 of yacc.c */ -#line 414 "sql.y" +#line 415 "sql.y" { SQL_input* sql = (SQL_input*) info; UINT r; @@ -2023,7 +2024,7 @@ case 44: /* Line 1455 of yacc.c */ -#line 430 "sql.y" +#line 431 "sql.y" { SQL_input* sql = (SQL_input*) info; UINT r; @@ -2046,7 +2047,7 @@ case 46: /* Line 1455 of yacc.c */ -#line 452 "sql.y" +#line 453 "sql.y" { (yyvsp[(1) - (3)].column_list)->next = (yyvsp[(3) - (3)].column_list); ;} @@ -2055,7 +2056,7 @@ case 47: /* Line 1455 of yacc.c */ -#line 456 "sql.y" +#line 457 "sql.y" { (yyval.column_list) = NULL; ;} @@ -2064,7 +2065,7 @@ case 49: /* Line 1455 of yacc.c */ -#line 464 "sql.y" +#line 465 "sql.y" { SQL_input* sql = (SQL_input*) info; UINT r; @@ -2082,7 +2083,7 @@ case 50: /* Line 1455 of yacc.c */ -#line 480 "sql.y" +#line 481 "sql.y" { SQL_input* sql = (SQL_input*) info; UINT r; @@ -2097,13 +2098,12 @@ case 51: /* Line 1455 of yacc.c */ -#line 490 "sql.y" +#line 491 "sql.y" { SQL_input* sql = (SQL_input*) info; UINT r; r = JOIN_CreateView( sql->db, &(yyval.query), (yyvsp[(2) - (2)].string) ); - msi_free( (yyvsp[(2) - (2)].string) ); if( r != ERROR_SUCCESS ) YYABORT; ;} @@ -2114,7 +2114,7 @@ /* Line 1455 of yacc.c */ #line 503 "sql.y" { - (yyval.string) = strdupW((yyvsp[(1) - (1)].string)); + (yyval.string) = (yyvsp[(1) - (1)].string); ;} break; @@ -2123,7 +2123,7 @@ /* Line 1455 of yacc.c */ #line 508 "sql.y" { - (yyval.string) = parser_add_table((yyvsp[(3) - (3)].string), (yyvsp[(1) - (3)].string)); + (yyval.string) = parser_add_table( info, (yyvsp[(3) - (3)].string), (yyvsp[(1) - (3)].string) ); if (!(yyval.string)) YYABORT; ;} @@ -2618,17 +2618,20 @@ #line 697 "sql.y" -static LPWSTR parser_add_table(LPWSTR list, LPWSTR table) -{ - DWORD size = lstrlenW(list) + lstrlenW(table) + 2; +static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ) +{ static const WCHAR space[] = {' ',0}; - - list = msi_realloc(list, size * sizeof(WCHAR)); - if (!list) return NULL; - - lstrcatW(list, space); - lstrcatW(list, table); - return list; + DWORD len = strlenW( list ) + strlenW( table ) + 2; + LPWSTR ret; + + ret = parser_alloc( info, len * sizeof(WCHAR) ); + if( ret ) + { + strcpyW( ret, list ); + strcatW( ret, space ); + strcatW( ret, table ); + } + return ret; } static void *parser_alloc( void *info, unsigned int sz ) Modified: trunk/reactos/dll/win32/msi/sql.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.h?re… ============================================================================== --- trunk/reactos/dll/win32/msi/sql.tab.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/sql.tab.h [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -110,7 +110,7 @@ { /* Line 1676 of yacc.c */ -#line 75 "sql.y" +#line 76 "sql.y" struct sql_str str; LPWSTR string; Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=41… ============================================================================== --- trunk/reactos/dll/win32/msi/sql.y [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/sql.y [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -32,6 +32,7 @@ #include "query.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unicode.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info @@ -54,7 +55,7 @@ static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); -static LPWSTR parser_add_table( LPWSTR list, LPWSTR table ); +static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ); static void *parser_alloc( void *info, unsigned int sz ); static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ); @@ -492,7 +493,6 @@ UINT r; r = JOIN_CreateView( sql->db, &$$, $2 ); - msi_free( $2 ); if( r != ERROR_SUCCESS ) YYABORT; } @@ -501,12 +501,12 @@ tablelist: table { - $$ = strdupW($1); + $$ = $1; } | table TK_COMMA tablelist { - $$ = parser_add_table($3, $1); + $$ = parser_add_table( info, $3, $1 ); if (!$$) YYABORT; } @@ -696,17 +696,20 @@ %% -static LPWSTR parser_add_table(LPWSTR list, LPWSTR table) -{ - DWORD size = lstrlenW(list) + lstrlenW(table) + 2; +static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ) +{ static const WCHAR space[] = {' ',0}; - - list = msi_realloc(list, size * sizeof(WCHAR)); - if (!list) return NULL; - - lstrcatW(list, space); - lstrcatW(list, table); - return list; + DWORD len = strlenW( list ) + strlenW( table ) + 2; + LPWSTR ret; + + ret = parser_alloc( info, len * sizeof(WCHAR) ); + if( ret ) + { + strcpyW( ret, list ); + strcatW( ret, space ); + strcatW( ret, table ); + } + return ret; } static void *parser_alloc( void *info, unsigned int sz ) Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -559,8 +559,10 @@ rows = add_storages_to_table(sv); if (rows < 0) + { + msi_free( sv ); return ERROR_FUNCTION_FAILED; - + } sv->num_rows = rows; *view = (MSIVIEW *)sv; Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -523,7 +523,10 @@ sv->db = db; rows = add_streams_to_table(sv); if (rows < 0) + { + msi_free( sv ); return ERROR_FUNCTION_FAILED; + } sv->num_rows = rows; *view = (MSIVIEW *)sv; Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -1158,6 +1158,93 @@ return ERROR_SUCCESS; } +static UINT msi_stream_name( const MSITABLEVIEW *tv, UINT row, LPWSTR *pstname ) +{ + LPWSTR p, stname = NULL; + UINT i, r, type, ival; + DWORD len; + LPCWSTR sval; + MSIVIEW *view = (MSIVIEW *) tv; + + TRACE("%p %d\n", tv, row); + + len = lstrlenW( tv->name ) + 1; + stname = msi_alloc( len*sizeof(WCHAR) ); + if ( !stname ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + + lstrcpyW( stname, tv->name ); + + for ( i = 0; i < tv->num_cols; i++ ) + { + type = tv->columns[i].type; + if ( type & MSITYPE_KEY ) + { + static const WCHAR szDot[] = { '.', 0 }; + + r = TABLE_fetch_int( view, row, i+1, &ival ); + if ( r != ERROR_SUCCESS ) + goto err; + + if ( tv->columns[i].type & MSITYPE_STRING ) + { + sval = msi_string_lookup_id( tv->db->strings, ival ); + if ( !sval ) + { + r = ERROR_INVALID_PARAMETER; + goto err; + } + } + else + { + static const WCHAR fmt[] = { '%','d',0 }; + WCHAR number[0x20]; + UINT n = bytes_per_column( tv->db, &tv->columns[i] ); + + switch( n ) + { + case 2: + sprintfW( number, fmt, ival^0x8000 ); + break; + case 4: + sprintfW( number, fmt, ival^0x80000000 ); + break; + default: + ERR( "oops - unknown column width %d\n", n ); + r = ERROR_FUNCTION_FAILED; + goto err; + } + sval = number; + } + + len += lstrlenW( szDot ) + lstrlenW( sval ); + p = msi_realloc ( stname, len*sizeof(WCHAR) ); + if ( !p ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + stname = p; + + lstrcatW( stname, szDot ); + lstrcatW( stname, sval ); + } + else + continue; + } + + *pstname = stname; + return ERROR_SUCCESS; + +err: + msi_free( stname ); + *pstname = NULL; + return r; +} + /* * We need a special case for streams, as we need to reference column with * the name of the stream in the same table, and the table name @@ -1166,57 +1253,18 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - UINT ival = 0, refcol = 0, r; - LPCWSTR sval; - LPWSTR full_name; - DWORD len; - static const WCHAR szDot[] = { '.', 0 }; - WCHAR number[0x20]; + UINT r; + LPWSTR full_name = NULL; if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; - /* - * The column marked with the type stream data seems to have a single number - * which references the column containing the name of the stream data - * - * Fetch the column to reference first. - */ - r = view->ops->fetch_int( view, row, col, &ival ); - if( r != ERROR_SUCCESS ) + r = msi_stream_name( tv, row, &full_name ); + if ( r != ERROR_SUCCESS ) + { + ERR("fetching stream, error = %d\n", r); return r; - - /* check the column value is in range */ - if (ival > tv->num_cols || ival == col) - { - ERR("bad column ref (%u) for stream\n", ival); - return ERROR_FUNCTION_FAILED; - } - - if ( tv->columns[ival - 1].type & MSITYPE_STRING ) - { - /* now get the column with the name of the stream */ - r = view->ops->fetch_int( view, row, ival, &refcol ); - if ( r != ERROR_SUCCESS ) - return r; - - /* lookup the string value from the string table */ - sval = msi_string_lookup_id( tv->db->strings, refcol ); - if ( !sval ) - return ERROR_INVALID_PARAMETER; - } - else - { - static const WCHAR fmt[] = { '%','d',0 }; - sprintfW( number, fmt, ival ); - sval = number; - } - - len = lstrlenW( tv->name ) + 2 + lstrlenW( sval ); - full_name = msi_alloc( len*sizeof(WCHAR) ); - lstrcpyW( full_name, tv->name ); - lstrcatW( full_name, szDot ); - lstrcatW( full_name, sval ); + } r = db_get_raw_stream( tv->db, full_name, stm ); if( r ) @@ -1285,6 +1333,46 @@ return msi_view_get_row(tv->db, view, row, rec); } +static UINT msi_addstreamW( MSIDATABASE *db, LPCWSTR name, IStream *data ) +{ + UINT r; + MSIQUERY *query = NULL; + MSIRECORD *rec = NULL; + + static const WCHAR insert[] = { + 'I','N','S','E','R','T',' ','I','N','T','O',' ', + '`','_','S','t','r','e','a','m','s','`',' ', + '(','`','N','a','m','e','`',',', + '`','D','a','t','a','`',')',' ', + 'V','A','L','U','E','S',' ','(','?',',','?',')',0}; + + TRACE("%p %s %p\n", db, debugstr_w(name), data); + + rec = MSI_CreateRecord( 2 ); + if ( !rec ) + return ERROR_OUTOFMEMORY; + + r = MSI_RecordSetStringW( rec, 1, name ); + if ( r != ERROR_SUCCESS ) + goto err; + + r = MSI_RecordSetIStream( rec, 2, data ); + if ( r != ERROR_SUCCESS ) + goto err; + + r = MSI_DatabaseOpenViewW( db, insert, &query ); + if ( r != ERROR_SUCCESS ) + goto err; + + r = MSI_ViewExecute( query, rec ); + +err: + msiobj_release( &query->hdr ); + msiobj_release( &rec->hdr ); + + return r; +} + static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; @@ -1315,6 +1403,27 @@ { if ( MSITYPE_IS_BINARY(tv->columns[ i ].type) ) { + IStream *stm; + LPWSTR stname; + + r = MSI_RecordGetIStream( rec, i + 1, &stm ); + if ( r != ERROR_SUCCESS ) + return r; + + r = msi_stream_name( tv, row, &stname ); + if ( r != ERROR_SUCCESS ) + { + IStream_Release( stm ); + return r; + } + + r = msi_addstreamW( tv->db, stname, stm ); + IStream_Release( stm ); + msi_free ( stname ); + + if ( r != ERROR_SUCCESS ) + return r; + val = 1; /* refers to the first key column */ } else if ( tv->columns[i].type & MSITYPE_STRING ) @@ -2264,7 +2373,67 @@ return ret; } +static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) +{ + static const WCHAR szDot[] = { '.', 0 }; + LPWSTR stname = NULL, sval, p; + DWORD len; + UINT i, r; + + TRACE("%p %p\n", tv, rec); + + len = lstrlenW( tv->name ) + 1; + stname = msi_alloc( len*sizeof(WCHAR) ); + if ( !stname ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + + lstrcpyW( stname, tv->name ); + + for ( i = 0; i < tv->num_cols; i++ ) + { + if ( tv->columns[i].type & MSITYPE_KEY ) + { + sval = msi_dup_record_field( rec, i + 1 ); + if ( !sval ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + + len += lstrlenW( szDot ) + lstrlenW ( sval ); + p = msi_realloc ( stname, len*sizeof(WCHAR) ); + if ( !p ) + { + r = ERROR_OUTOFMEMORY; + goto err; + } + stname = p; + + lstrcatW( stname, szDot ); + lstrcatW( stname, sval ); + + msi_free( sval ); + } + else + continue; + } + + *pstname = encode_streamname( FALSE, stname ); + msi_free( stname ); + + return ERROR_SUCCESS; + +err: + msi_free ( stname ); + *pstname = NULL; + return r; +} + static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st, + IStorage *stg, const BYTE *rawdata, UINT bytes_per_strref ) { UINT i, val, ofs = 0; @@ -2288,8 +2457,28 @@ if ( (~mask&1) && (~columns[i].type & MSITYPE_KEY) && ((1<<i) & ~mask) ) continue; - if( (columns[i].type & MSITYPE_STRING) && - ! MSITYPE_IS_BINARY(tv->columns[i].type) ) + if( MSITYPE_IS_BINARY(tv->columns[i].type) ) + { + LPWSTR encname; + IStream *stm = NULL; + UINT r; + + ofs += bytes_per_column( tv->db, &columns[i] ); + + r = msi_record_encoded_stream_name( tv, rec, &encname ); + if ( r != ERROR_SUCCESS ) + return NULL; + + r = IStorage_OpenStream( stg, encname, NULL, + STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); + msi_free( encname ); + if ( r != ERROR_SUCCESS ) + return NULL; + + MSI_RecordSetStream( rec, i+1, stm ); + TRACE(" field %d [%s]\n", i+1, debugstr_w(encname)); + } + else if( columns[i].type & MSITYPE_STRING ) { LPCWSTR sval; @@ -2550,7 +2739,7 @@ break; } - rec = msi_get_transform_record( tv, st, &rawdata[n], bytes_per_strref ); + rec = msi_get_transform_record( tv, st, stg, &rawdata[n], bytes_per_strref ); if (rec) { if ( mask & 1 ) Modified: trunk/reactos/dll/win32/msi/update.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/update.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/update.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -261,7 +261,10 @@ uv = msi_alloc_zero( sizeof *uv ); if( !uv ) - return ERROR_FUNCTION_FAILED; + { + wv->ops->delete( wv ); + return ERROR_FUNCTION_FAILED; + } /* fill the structure */ uv->view.ops = &update_ops; Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sat Jun 6 19:59:47 2009 @@ -369,8 +369,8 @@ TRACE("%p %p\n", This, type); - assert( NODE_ELEMENT == XML_ELEMENT_NODE ); - assert( NODE_NOTATION == XML_NOTATION_NODE ); + assert( (int)NODE_ELEMENT == (int)XML_ELEMENT_NODE ); + assert( (int)NODE_NOTATION == (int)XML_NOTATION_NODE ); *type = This->node->type;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs