Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[hbelusca] 60316: [APITEST:WININET] Make it use apitest.h
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 18:19:56 2013 New Revision: 60316 URL: http://svn.reactos.org/svn/reactos?rev=60316&view=rev Log: [APITEST:WININET] Make it use apitest.h Modified: trunk/rostests/apitests/wininet/InternetOpen.c trunk/rostests/apitests/wininet/testlist.c Modified: trunk/rostests/apitests/wininet/InternetOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/Internet… ============================================================================== --- trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] Sun Sep 22 18:19:56 2013 @@ -5,14 +5,13 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE +#include <apitest.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <windef.h> #include <winsock2.h> -#include <wine/test.h> #include <wininet.h> struct hostent *(WINAPI *pgethostbyname)(const char *); @@ -29,7 +28,7 @@ { HMODULE ModuleHandle; - ModuleHandle = GetModuleHandle(L"ws2_32"); + ModuleHandle = GetModuleHandleW(L"ws2_32"); if (!ModuleHandle) return NULL; return GetProcAddress(ModuleHandle, FunctionName); @@ -41,7 +40,7 @@ BOOLEAN IsWinsockLoaded(VOID) { - return GetModuleHandle(L"ws2_32") != NULL; + return GetModuleHandleW(L"ws2_32") != NULL; } static @@ -85,9 +84,9 @@ ok(!IsWinsockLoaded(), "Winsock loaded on startup\n"); ok(!IsWinsockInitialized(), "Winsock initialized on startup\n"); - ModuleHandle = GetModuleHandle(L"wininet"); + ModuleHandle = GetModuleHandleW(L"wininet"); ok_ptr(ModuleHandle, NULL); - ModuleHandle = LoadLibrary(L"wininet"); + ModuleHandle = LoadLibraryW(L"wininet"); ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError()); pInternetOpen = (PVOID)GetProcAddress(ModuleHandle, "InternetOpenW"); Modified: trunk/rostests/apitests/wininet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/testlist… ============================================================================== --- trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] Sun Sep 22 18:19:56 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_InternetOpen(void);

1 0

[hbelusca] 60315: [WINHTTP:USER32] Make it use apitest.h
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 18:19:16 2013 New Revision: 60315 URL: http://svn.reactos.org/svn/reactos?rev=60315&view=rev Log: [WINHTTP:USER32] Make it use apitest.h Modified: trunk/rostests/apitests/winhttp/WinHttpOpen.c trunk/rostests/apitests/winhttp/testlist.c Modified: trunk/rostests/apitests/winhttp/WinHttpOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/WinHttpO… ============================================================================== --- trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] Sun Sep 22 18:19:16 2013 @@ -5,14 +5,13 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE +#include <apitest.h> #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <windef.h> #include <winsock2.h> -#include <wine/test.h> #include <winhttp.h> struct hostent *(WINAPI *pgethostbyname)(const char *); @@ -29,7 +28,7 @@ { HMODULE ModuleHandle; - ModuleHandle = GetModuleHandle(L"ws2_32"); + ModuleHandle = GetModuleHandleW(L"ws2_32"); if (!ModuleHandle) return NULL; return GetProcAddress(ModuleHandle, FunctionName); @@ -41,14 +40,14 @@ BOOLEAN IsWinsockLoaded(VOID) { - return GetModuleHandle(L"ws2_32") != NULL; + return GetModuleHandleW(L"ws2_32") != NULL; } static BOOLEAN IsWininetLoaded(VOID) { - return GetModuleHandle(L"wininet") != NULL; + return GetModuleHandleW(L"wininet") != NULL; } static @@ -93,9 +92,9 @@ ok(!IsWinsockInitialized(), "Winsock initialized on startup\n"); ok(!IsWininetLoaded(), "Wininet loaded on startup\n"); - ModuleHandle = GetModuleHandle(L"winhttp"); + ModuleHandle = GetModuleHandleW(L"winhttp"); ok_ptr(ModuleHandle, NULL); - ModuleHandle = LoadLibrary(L"winhttp"); + ModuleHandle = LoadLibraryW(L"winhttp"); ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError()); pWinHttpOpen = (PVOID)GetProcAddress(ModuleHandle, "WinHttpOpen"); Modified: trunk/rostests/apitests/winhttp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/testlist… ============================================================================== --- trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] Sun Sep 22 18:19:16 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_WinHttpOpen(void);

1 0

[hbelusca] 60314: [APITESTS:USER32] Make it use apitest.h
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 18:17:54 2013 New Revision: 60314 URL: http://svn.reactos.org/svn/reactos?rev=60314&view=rev Log: [APITESTS:USER32] Make it use apitest.h Modified: trunk/rostests/apitests/user32/AttachThreadInput.c trunk/rostests/apitests/user32/CreateIconFromResourceEx.c trunk/rostests/apitests/user32/DeferWindowPos.c trunk/rostests/apitests/user32/DestroyCursorIcon.c trunk/rostests/apitests/user32/DrawIconEx.c trunk/rostests/apitests/user32/GetIconInfo.c trunk/rostests/apitests/user32/GetKeyState.c trunk/rostests/apitests/user32/GetPeekMessage.c trunk/rostests/apitests/user32/GetSystemMetrics.c trunk/rostests/apitests/user32/InitializeLpkHooks.c trunk/rostests/apitests/user32/LoadImage.c trunk/rostests/apitests/user32/RealGetWindowClass.c trunk/rostests/apitests/user32/ScrollDC.c trunk/rostests/apitests/user32/ScrollWindowEx.c trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/SetCursorPos.c trunk/rostests/apitests/user32/SystemParametersInfo.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/WndProc.c trunk/rostests/apitests/user32/desktop.c trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/resource.h trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateIco… ============================================================================== --- trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <winuser.h> START_TEST(CreateIconFromResourceEx) Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> #include "helper.h" #include <undocuser.h> Modified: trunk/rostests/apitests/user32/DestroyCursorIcon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DestroyCu… ============================================================================== --- trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DestroyCursorIcon.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/DrawIconEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DrawIconE… ============================================================================== --- trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DrawIconEx.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/GetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetIconIn… ============================================================================== --- trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,4 +1,6 @@ -#include <wine/test.h> + +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/GetKeyState.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetKeySta… ============================================================================== --- trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetKeyState.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> #include <assert.h> Modified: trunk/rostests/apitests/user32/GetPeekMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetPeekMe… ============================================================================== --- trunk/rostests/apitests/user32/GetPeekMessage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetPeekMessage.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Thomas Faber */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> void Test_GetMessage(HWND hWnd) Modified: trunk/rostests/apitests/user32/GetSystemMetrics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetSystem… ============================================================================== --- trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetSystemMetrics.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/Initializ… ============================================================================== --- trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <winuser.h> typedef struct _LPK_LPEDITCONTROL_LIST Modified: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,5 +1,7 @@ + +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/RealGetWindowClass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RealGetWi… ============================================================================== --- trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Gregor Gullwi */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <winuser.h> #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) Modified: trunk/rostests/apitests/user32/ScrollDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollDC.… ============================================================================== --- trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/ScrollDC.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/ScrollWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/ScrollWin… ============================================================================== --- trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/ScrollWindowEx.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include <assert.h> Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Giannis Adamopoulos */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/WndProc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/WndProc.c… ============================================================================== --- trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/WndProc.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> #include "helper.h" Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Giannis Adamopoulos */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <winuser.h> #include "helper.h" #include <undocuser.h> Modified: trunk/rostests/apitests/user32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/resource.… ============================================================================== --- trunk/rostests/apitests/user32/resource.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/resource.h [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,3 +1,2 @@ - #define IDI_TEST 1000 Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Sun Sep 22 18:17:54 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_AttachThreadInput(void); extern void func_CreateIconFromResourceEx(void);

1 0

[hbelusca] 60313: [ROSTESTS:APITESTS] Introduce a "apitest.h" header gathering special things for apitests (SEH macros, wine/test.h inclusion, and so on...).
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 17:52:42 2013 New Revision: 60313 URL: http://svn.reactos.org/svn/reactos?rev=60313&view=rev Log: [ROSTESTS:APITESTS] Introduce a "apitest.h" header gathering special things for apitests (SEH macros, wine/test.h inclusion, and so on...). Added: trunk/rostests/apitests/include/ trunk/rostests/apitests/include/apitest.h (with props) Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/advapi32/CreateService.c trunk/rostests/apitests/advapi32/LockDatabase.c trunk/rostests/apitests/advapi32/QueryServiceConfig2.c trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c trunk/rostests/apitests/advapi32/testlist.c trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c trunk/rostests/apitests/browseui/testlist.c trunk/rostests/apitests/com/testlist.c trunk/rostests/apitests/crt/_vscprintf.c trunk/rostests/apitests/crt/_vscwprintf.c trunk/rostests/apitests/crt/_vsnprintf.c trunk/rostests/apitests/crt/_vsnwprintf.c trunk/rostests/apitests/crt/mbstowcs_s.c trunk/rostests/apitests/crt/sprintf.c trunk/rostests/apitests/crt/strcpy.c trunk/rostests/apitests/crt/testlist.c trunk/rostests/apitests/crt/wcstombs_s.c trunk/rostests/apitests/dciman32/DCICreatePrimary.c trunk/rostests/apitests/dciman32/testlist.c trunk/rostests/apitests/gdi32/AddFontResource.c trunk/rostests/apitests/gdi32/AddFontResourceEx.c trunk/rostests/apitests/gdi32/BeginPath.c trunk/rostests/apitests/gdi32/CombineRgn.c trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/CreateBitmap.c trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c trunk/rostests/apitests/gdi32/CreateCompatibleDC.c trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/CreateDIBitmap.c trunk/rostests/apitests/gdi32/CreateFont.c trunk/rostests/apitests/gdi32/CreateFontIndirect.c trunk/rostests/apitests/gdi32/CreateIconIndirect.c trunk/rostests/apitests/gdi32/CreatePen.c trunk/rostests/apitests/gdi32/CreateRectRgn.c trunk/rostests/apitests/gdi32/DPtoLP.c trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c trunk/rostests/apitests/gdi32/EngCreateSemaphore.c trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c trunk/rostests/apitests/gdi32/ExtCreatePen.c trunk/rostests/apitests/gdi32/GdiConvertBitmap.c trunk/rostests/apitests/gdi32/GdiConvertBrush.c trunk/rostests/apitests/gdi32/GdiConvertDC.c trunk/rostests/apitests/gdi32/GdiConvertFont.c trunk/rostests/apitests/gdi32/GdiConvertPalette.c trunk/rostests/apitests/gdi32/GdiConvertRegion.c trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c trunk/rostests/apitests/gdi32/GdiGetLocalDC.c trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c trunk/rostests/apitests/gdi32/GdiSetAttrs.c trunk/rostests/apitests/gdi32/GetClipRgn.c trunk/rostests/apitests/gdi32/GetCurrentObject.c trunk/rostests/apitests/gdi32/GetDIBColorTable.c trunk/rostests/apitests/gdi32/GetDIBits.c trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/gdi32/GetPixel.c trunk/rostests/apitests/gdi32/GetRandomRgn.c trunk/rostests/apitests/gdi32/GetStockObject.c trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c trunk/rostests/apitests/gdi32/GetTextFace.c trunk/rostests/apitests/gdi32/MaskBlt.c trunk/rostests/apitests/gdi32/PatBlt.c trunk/rostests/apitests/gdi32/Rectangle.c trunk/rostests/apitests/gdi32/SelectObject.c trunk/rostests/apitests/gdi32/SetBrushOrgEx.c trunk/rostests/apitests/gdi32/SetDCPenColor.c trunk/rostests/apitests/gdi32/SetDIBits.c trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c trunk/rostests/apitests/gdi32/SetMapMode.c trunk/rostests/apitests/gdi32/SetPixel.c trunk/rostests/apitests/gdi32/SetSysColors.c trunk/rostests/apitests/gdi32/SetWindowExtEx.c trunk/rostests/apitests/gdi32/SetWorldTransform.c trunk/rostests/apitests/gdi32/testlist.c trunk/rostests/apitests/kernel32/FindFiles.c trunk/rostests/apitests/kernel32/GetCurrentDirectory.c trunk/rostests/apitests/kernel32/GetDriveType.c trunk/rostests/apitests/kernel32/GetModuleFileName.c trunk/rostests/apitests/kernel32/MultiByteToWideChar.c trunk/rostests/apitests/kernel32/SetCurrentDirectory.c trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c trunk/rostests/apitests/kernel32/lstrcpynW.c trunk/rostests/apitests/kernel32/testlist.c trunk/rostests/apitests/msvcrt/CommandLine.c trunk/rostests/apitests/msvcrt/ieee.c trunk/rostests/apitests/msvcrt/splitpath.c trunk/rostests/apitests/msvcrt/testlist.c Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,3 +1,5 @@ +include_directories( + include) add_library(apitest apitest.c) Modified: trunk/rostests/apitests/advapi32/CreateService.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CreateS… ============================================================================== --- trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: Thomas Faber */ -#include <wine/test.h> +#include <apitest.h> + #include <winreg.h> #include <winsvc.h> #include <strsafe.h> Modified: trunk/rostests/apitests/advapi32/LockDatabase.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/LockDat… ============================================================================== --- trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/LockDatabase.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ -#include <wine/test.h> +#include <apitest.h> + #include <winsvc.h> #include <strsafe.h> Modified: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/QuerySe… ============================================================================== --- trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ -#include <wine/test.h> +#include <apitest.h> + #include <winreg.h> #include <winsvc.h> #include <strsafe.h> Modified: trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/SaferId… ============================================================================== --- trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/SaferIdentifyLevel.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,16 +5,12 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS -#include <wine/test.h> #include <windows.h> #include <ndk/ntndk.h> #include <winsafer.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) - -#define InvalidPointer ((PVOID)0x5555555555555555ULL) #define SaferIdentifyLevel(c, p, h, r) SaferIdentifyLevel(c, (PSAFER_CODE_PROPERTIES)(p), h, r) Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_CreateService(void); extern void func_LockDatabase(void); Modified: trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/SHExplo… ============================================================================== --- trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/SHExplorerParseCmdLine.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMER: Thomas Faber */ -#define UNICODE -#include <wine/test.h> +#include <apitest.h> + +//#define UNICODE #include <strsafe.h> #include <shlobj.h> @@ -128,8 +129,8 @@ WCHAR OriginalCommandLine[1024]; int i; - CommandLine = GetCommandLine(); - (VOID)StringCbCopy(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); + CommandLine = GetCommandLineW(); + StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine); for (i = 0; i < TestCount; i++) { Modified: trunk/rostests/apitests/browseui/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/browseui/testlis… ============================================================================== --- trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/browseui/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include <windows.h> #define STANDALONE -#include "wine/test.h" +#include <apitest.h> extern void func_SHExplorerParseCmdLine(void); Modified: trunk/rostests/apitests/com/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/com/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,9 +1,7 @@ -#define WIN32_LEAN_AND_MEAN #define __ROS_LONG64__ -#include <windows.h> #define STANDALONE -#include "wine/test.h" +#include <apitest.h> extern void func_browseui(void); extern void func_ieframe(void); Modified: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,8 +4,9 @@ * PURPOSE: Test for _vscprintf */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <errno.h> Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,8 +4,9 @@ * PURPOSE: Test for _vscprintf */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <errno.h> Modified: trunk/rostests/apitests/crt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,16 +4,14 @@ * PURPOSE: Test for _vsnprintf */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <pseh/pseh2.h> #include <ndk/mmfuncs.h> #include <ndk/rtlfuncs.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) static void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...) { Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,16 +4,14 @@ * PURPOSE: Test for _vsnprintf */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <pseh/pseh2.h> #include <ndk/mmfuncs.h> #include <ndk/rtlfuncs.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) static void call_varargs(wchar_t* buf, size_t buf_size, int expected_ret, LPCWSTR formatString, ...) { Modified: trunk/rostests/apitests/crt/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/mbstowcs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/mbstowcs_s.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,10 +4,11 @@ * PURPOSE: Test for mbstowcs_s */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> #include <stdlib.h> -#include <wine/test.h> #include <specstrings.h> #define ok_errno(x) ok_hex(errno, (x)) Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <tchar.h> #include <pseh/pseh2.h> #include <ndk/mmfuncs.h> @@ -18,9 +19,6 @@ #pragma GCC diagnostic ignored "-Wformat-zero-length" #pragma GCC diagnostic ignored "-Wnonnull" #endif - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) static PVOID Modified: trunk/rostests/apitests/crt/strcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strcpy.c?rev… ============================================================================== --- trunk/rostests/apitests/crt/strcpy.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/strcpy.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,6 +1,7 @@ + +#include <apitest.h> #include <stdio.h> -#include <wine/test.h> START_TEST(strcpy) { Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> #if defined(TEST_MSVCRT) extern void func_mbstowcs_s(void); Modified: trunk/rostests/apitests/crt/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstombs_s.c… ============================================================================== --- trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/wcstombs_s.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,10 +4,11 @@ * PURPOSE: Test for wcstombs_s */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> #include <stdlib.h> -#include <wine/test.h> #include <specstrings.h> #define ok_errno(x) ok_hex(errno, (x)) Modified: trunk/rostests/apitests/dciman32/DCICreatePrimary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/DCICrea… ============================================================================== --- trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/DCICreatePrimary.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> void Test_DCICreatePrimary() { Modified: trunk/rostests/apitests/dciman32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/testlis… ============================================================================== --- trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_DCICreatePrimary(void); Modified: trunk/rostests/apitests/gdi32/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <stdio.h> +#include <apitest.h> + #include <wine/test.h> #include <wingdi.h> Modified: trunk/rostests/apitests/gdi32/AddFontResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResourceEx.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <libs/pseh/pseh2.h> Modified: trunk/rostests/apitests/gdi32/BeginPath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/BeginPath.… ============================================================================== --- trunk/rostests/apitests/gdi32/BeginPath.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/BeginPath.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_BeginPath() Modified: trunk/rostests/apitests/gdi32/CombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_CombineRgn_Params() Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #define DEFAULT_BITMAP 21 Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_CreateBitmapIndirect() Modified: trunk/rostests/apitests/gdi32/CreateCompatibleDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateComp… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateCompatibleDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateCompatibleDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,11 +5,10 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> - #include "init.h" - void Test_CreateDIBPatternBrush() { Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> #include <pseh/pseh2.h> Modified: trunk/rostests/apitests/gdi32/CreateFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateFont.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateFont.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #define INVALIDFONT "ThisFontDoesNotExist" Modified: trunk/rostests/apitests/gdi32/CreateFontIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateFont… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateFontIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateFontIndirect.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> - void Test_CreateFontIndirectA(void) Modified: trunk/rostests/apitests/gdi32/CreateIconIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateIcon… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateIconIndirect.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,5 +1,6 @@ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreatePen.… ============================================================================== --- trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreatePen.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <include/ntgdityp.h> Modified: trunk/rostests/apitests/gdi32/CreateRectRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateRect… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateRectRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateRectRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,7 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> void Test_CreateRectRgn() { Modified: trunk/rostests/apitests/gdi32/DPtoLP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngAcquire… ============================================================================== --- trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngAcquireSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/EngCreateSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngCreateS… ============================================================================== --- trunk/rostests/apitests/gdi32/EngCreateSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngCreateSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngDeleteS… ============================================================================== --- trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngDeleteSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/EngRelease… ============================================================================== --- trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/EngReleaseSemaphore.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Magnus Olsen */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> Modified: trunk/rostests/apitests/gdi32/ExtCreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExtCreateP… ============================================================================== --- trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/ExtCreatePen.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <include/ntgdityp.h> Modified: trunk/rostests/apitests/gdi32/GdiConvertBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertBitmap.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm); Modified: trunk/rostests/apitests/gdi32/GdiConvertBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertBrush.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr); Modified: trunk/rostests/apitests/gdi32/GdiConvertDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HDC WINAPI GdiConvertDC(HDC hdc); Modified: trunk/rostests/apitests/gdi32/GdiConvertFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertFont.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertFont.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HFONT WINAPI GdiConvertFont(HFONT); Modified: trunk/rostests/apitests/gdi32/GdiConvertPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertPalette.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertPalette.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HPALETTE WINAPI GdiConvertPalette(HPALETTE); Modified: trunk/rostests/apitests/gdi32/GdiConvertRegion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiConvert… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiConvertRegion.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiConvertRegion.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HRGN WINAPI GdiConvertRegion(HRGN); Modified: trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiDeleteL… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiDeleteLocalDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> BOOL WINAPI GdiDeleteLocalDC(HDC); Modified: trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetChar… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiGetCharDimensions.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_GdiGetCharDimensions() Modified: trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiGetLocalBrush.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr); Modified: trunk/rostests/apitests/gdi32/GdiGetLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiGetLoca… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiGetLocalDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiGetLocalDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> HDC WINAPI GdiGetLocalDC(HDC); Modified: trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiRelease… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiReleaseLocalDC.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> BOOL WINAPI GdiReleaseLocalDC(HDC); Modified: trunk/rostests/apitests/gdi32/GdiSetAttrs.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GdiSetAttr… ============================================================================== --- trunk/rostests/apitests/gdi32/GdiSetAttrs.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GdiSetAttrs.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> BOOL WINAPI GdiSetAttrs(HDC); Modified: trunk/rostests/apitests/gdi32/GetClipRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetClipRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetCurrentObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetCurrent… ============================================================================== --- trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetCurrentObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetDIBColorTable.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBColo… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBColorTable.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_GetDIBColorTable() Modified: trunk/rostests/apitests/gdi32/GetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetDIBits.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_GetPixel_1bpp() Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetRandomR… ============================================================================== --- trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetStockOb… ============================================================================== --- trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetStockObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winddi.h> #include <include/ntgdityp.h> Modified: trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextExt… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextExtentExPoint.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetTextFac… ============================================================================== --- trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetTextFace.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #define TEST(x) ok(x, #x"\n") Modified: trunk/rostests/apitests/gdi32/MaskBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?… ============================================================================== --- trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/PatBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/PatBlt.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/PatBlt.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> HBITMAP ghbmpTarget; Modified: trunk/rostests/apitests/gdi32/Rectangle.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/Rectangle.… ============================================================================== --- trunk/rostests/apitests/gdi32/Rectangle.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/Rectangle.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_Rectangle(void) Modified: trunk/rostests/apitests/gdi32/SelectObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SelectObje… ============================================================================== --- trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SelectObject.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,8 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ +#include <apitest.h> + #include <stdio.h> -#include <wine/test.h> #include <wingdi.h> #include <winddi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetBrushOrgEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetBrushOr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetBrushOrgEx.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <pseh/pseh2.h> Modified: trunk/rostests/apitests/gdi32/SetDCPenColor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDCPenCo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDCPenColor.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetDIBits.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBits.… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBits.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDIBits.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Jérôme Gardou */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> void Test_SetDIBits() Modified: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,9 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> - #include "init.h" static void Modified: trunk/rostests/apitests/gdi32/SetMapMode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetMapMode… ============================================================================== --- trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetMapMode.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetPixel.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <mmsystem.h> Modified: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetWindowExtEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWindowE… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWindowExtEx.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/SetWorldTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetWorldTr… ============================================================================== --- trunk/rostests/apitests/gdi32/SetWorldTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetWorldTransform.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMERS: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <wingdi.h> #include <winuser.h> Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_AddFontResource(void); extern void func_AddFontResourceEx(void); Added: trunk/rostests/apitests/include/apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/include/apitest.… ============================================================================== --- trunk/rostests/apitests/include/apitest.h (added) +++ trunk/rostests/apitests/include/apitest.h [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -0,0 +1,28 @@ +#ifndef _APITEST_H +#define _APITEST_H + +// #define __ROS_LONG64__ + +#define WIN32_NO_STATUS + +/* The user must #define STANDALONE if it uses this header in testlist.c */ +#include <wine/test.h> +#include <pseh/pseh2.h> + +/* See kmtests/include/kmt_test.h */ +#define InvalidPointer ((PVOID)0x5555555555555555ULL) + +#define StartSeh() \ + ExceptionStatus = STATUS_SUCCESS; \ + _SEH2_TRY \ + { +#define EndSeh(ExpectedStatus) \ + } \ + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) \ + { \ + ExceptionStatus = _SEH2_GetExceptionCode(); \ + } \ + _SEH2_END; \ + ok(ExceptionStatus == ExpectedStatus, "Exception 0x%08lx, expected 0x%08lx\n", ExceptionStatus, ExpectedStatus) + +#endif /* _APITEST_H */ Propchange: trunk/rostests/apitests/include/apitest.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/FindFiles.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/FindFil… ============================================================================== --- trunk/rostests/apitests/kernel32/FindFiles.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/FindFiles.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO */ -#include <wine/test.h> +#include <apitest.h> + #include <windows.h> /* Modified: trunk/rostests/apitests/kernel32/GetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/GetCurrentDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetCurrentDirectory.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <ndk/rtltypes.h> static Modified: trunk/rostests/apitests/kernel32/GetDriveType.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetDriv… ============================================================================== --- trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetDriveType.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,4 +1,4 @@ -#include <wine/test.h> +#include <apitest.h> #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR) Modified: trunk/rostests/apitests/kernel32/GetModuleFileName.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/GetModu… ============================================================================== --- trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/GetModuleFileName.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,12 +5,12 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#define UNICODE #include <stdio.h> -#include <wine/test.h> #include <winreg.h> #include <winnls.h> #include <shlwapi.h> @@ -24,7 +24,7 @@ PWSTR FileName; PWSTR Slash; WCHAR CommandLine[MAX_PATH]; - STARTUPINFO StartupInfo; + STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInfo; DWORD Ret; int Length; @@ -48,7 +48,7 @@ FileName++; FileName[-1] = L'\0'; - Success = SetCurrentDirectory(Path); + Success = SetCurrentDirectoryW(Path); ok(Success == TRUE, "SetCurrentDirectory failed for path '%ls'\n", Path); trace("Starting '%ls' in path '%ls'\n", FileName, Path); @@ -64,16 +64,16 @@ RtlZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - Success = CreateProcess(FileName, - CommandLine, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInfo); + Success = CreateProcessW(FileName, + CommandLine, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInfo); if (!Success) { skip("CreateProcess failed with %lu\n", GetLastError()); Modified: trunk/rostests/apitests/kernel32/MultiByteToWideChar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/MultiBy… ============================================================================== --- trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/MultiByteToWideChar.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,9 @@ * PROGRAMMER: Mike "tamlin" Nordell */ -#include <wine/test.h> +#include <apitest.h> + #include <winnls.h> - START_TEST(MultiByteToWideChar) { Modified: trunk/rostests/apitests/kernel32/SetCurrentDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetCurr… ============================================================================== --- trunk/rostests/apitests/kernel32/SetCurrentDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetCurrentDirectory.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <ndk/rtltypes.h> static Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,9 +5,10 @@ * PROGRAMMER: Mike "tamlin" Nordell */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> #include <ndk/rtltypes.h> #include <xmmintrin.h> Modified: trunk/rostests/apitests/kernel32/lstrcpynW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/lstrcpy… ============================================================================== --- trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -4,9 +4,10 @@ * PURPOSE: Test for lstrcpynW */ +#include <apitest.h> + #define WIN32_NO_STATUS #include <stdio.h> -#include <wine/test.h> START_TEST(lstrcpynW) { Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_FindFiles(void); extern void func_GetCurrentDirectory(void); Modified: trunk/rostests/apitests/msvcrt/CommandLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CommandLi… ============================================================================== --- trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/CommandLine.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,10 +5,10 @@ * PROGRAMMER: HermÃ¨s BÃLUSCA - MAÃTO <hermes.belusca(a)sfr.fr> */ +#include <apitest.h> + #define WIN32_NO_STATUS -#define UNICODE #include <stdio.h> -#include <wine/test.h> #include <ndk/umtypes.h> #include "./CmdLineUtil/CmdLineUtil.h" Modified: trunk/rostests/apitests/msvcrt/ieee.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/ieee.c?re… ============================================================================== --- trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -6,7 +6,8 @@ * REFERENCES: http://msdn.microsoft.com/en-US/library/h7zkk1bz%28v=VS.80%29.aspx */ -#include <wine/test.h> +#include <apitest.h> + #include <float.h> #include <math.h> Modified: trunk/rostests/apitests/msvcrt/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/splitpath… ============================================================================== --- trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -5,7 +5,8 @@ * PROGRAMMER: Timo Kreuzer */ -#include <wine/test.h> +#include <apitest.h> + #include <stdio.h> #include <stdlib.h> #include <strings.h> Modified: trunk/rostests/apitests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.… ============================================================================== --- trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Sun Sep 22 17:52:42 2013 @@ -1,7 +1,7 @@ #define __ROS_LONG64__ #define STANDALONE -#include <wine/test.h> +#include <apitest.h> extern void func_CommandLine(void); extern void func_ieee(void);

1 0

[akhaldi] 60312: [MSRLE32] * Move resource files to the lang folder. CORE-7470
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:57:15 2013 New Revision: 60312 URL: http://svn.reactos.org/svn/reactos?rev=60312&view=rev Log: [MSRLE32] * Move resource files to the lang folder. CORE-7470 Added: trunk/reactos/dll/win32/msrle32/lang/ (with props) trunk/reactos/dll/win32/msrle32/lang/msrle_Bg.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Bg.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Cs.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Cs.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Cy.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Cy.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Da.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Da.rc trunk/reactos/dll/win32/msrle32/lang/msrle_De.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_De.rc trunk/reactos/dll/win32/msrle32/lang/msrle_En.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_En.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Es.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Es.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Fr.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Fr.rc trunk/reactos/dll/win32/msrle32/lang/msrle_He.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_He.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Hu.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Hu.rc trunk/reactos/dll/win32/msrle32/lang/msrle_It.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_It.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ja.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ja.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ko.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ko.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Lt.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Lt.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Nl.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Nl.rc trunk/reactos/dll/win32/msrle32/lang/msrle_No.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_No.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Pl.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Pl.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Pt.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Pt.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ro.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ro.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Ru.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Ru.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Si.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Si.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Sv.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Sv.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Tr.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Tr.rc trunk/reactos/dll/win32/msrle32/lang/msrle_Uk.rc - copied unchanged from r60296, trunk/reactos/dll/win32/msrle32/msrle_Uk.rc Removed: trunk/reactos/dll/win32/msrle32/msrle_Bg.rc trunk/reactos/dll/win32/msrle32/msrle_Cs.rc trunk/reactos/dll/win32/msrle32/msrle_Cy.rc trunk/reactos/dll/win32/msrle32/msrle_Da.rc trunk/reactos/dll/win32/msrle32/msrle_De.rc trunk/reactos/dll/win32/msrle32/msrle_En.rc trunk/reactos/dll/win32/msrle32/msrle_Es.rc trunk/reactos/dll/win32/msrle32/msrle_Fr.rc trunk/reactos/dll/win32/msrle32/msrle_He.rc trunk/reactos/dll/win32/msrle32/msrle_Hu.rc trunk/reactos/dll/win32/msrle32/msrle_It.rc trunk/reactos/dll/win32/msrle32/msrle_Ja.rc trunk/reactos/dll/win32/msrle32/msrle_Ko.rc trunk/reactos/dll/win32/msrle32/msrle_Lt.rc trunk/reactos/dll/win32/msrle32/msrle_Nl.rc trunk/reactos/dll/win32/msrle32/msrle_No.rc trunk/reactos/dll/win32/msrle32/msrle_Pl.rc trunk/reactos/dll/win32/msrle32/msrle_Pt.rc trunk/reactos/dll/win32/msrle32/msrle_Ro.rc trunk/reactos/dll/win32/msrle32/msrle_Ru.rc trunk/reactos/dll/win32/msrle32/msrle_Si.rc trunk/reactos/dll/win32/msrle32/msrle_Sv.rc trunk/reactos/dll/win32/msrle32/msrle_Tr.rc trunk/reactos/dll/win32/msrle32/msrle_Uk.rc Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 22 16:57:15 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/msrle32/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/dll/win32/msrle32/msrle_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Bg… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Bg.rc (removed) @@ -1,30 +0,0 @@ -/* - * Bulgarian resource file for MS-RLE - * - * Copyright 2005 Milko Krachounov - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE âèäåî êîäåê" - IDS_ABOUT "Wine MS-RLE âèäåî êîäåê\nCopyright 2002 by Michael Gunnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Cs… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Cs.rc (removed) @@ -1,34 +0,0 @@ -/* Hey, Emacs, open this file with -*- coding: cp1250 -*- - * - * Czech resource file for MS-RLE - * - * Copyright 2002 Michael Günnewig - * Copyright 2004 David Kredba - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -/* Czech strings in CP1250 */ - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Cy… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Cy.rc (removed) @@ -1,33 +0,0 @@ -/* - * Cefnogaeth iaith Cymraeg - * Welsh language support - * - * Copyright 2010 Ken Sharp - * - * 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 - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_WELSH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE 'n fideo codec" - IDS_ABOUT "Wine MS-RLE 'n fideo codec\nHawlfraint 2002 Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Da… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Da.rc (removed) @@ -1,30 +0,0 @@ -/* - * Danish language support - * - * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE videokodeks" - IDS_ABOUT "Wine MS-RLE videokodeks\nOphavsret 2002 tilhører Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_De… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_De.rc (removed) @@ -1,32 +0,0 @@ -/* - * German resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE Videodekoder" - IDS_ABOUT "Wine MS-RLE Videodekoder\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_En… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_En.rc (removed) @@ -1,32 +0,0 @@ -/* - * English resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video codec" - IDS_ABOUT "Wine MS-RLE video codec\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Es… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Es.rc (removed) @@ -1,30 +0,0 @@ -/* - * Spanish resource file for MS-RLE - * - * Copyright 2003 José Manuel Ferrer Ortiz - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codec de vídeo MS-RLE de Wine" - IDS_ABOUT "Codec de vídeo MS-RLE de Wine\nCopyright 2002 por Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Fr… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Fr.rc (removed) @@ -1,33 +0,0 @@ -/* - * French resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * 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 - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine : codec vidÃ©o MS-RLE" - IDS_ABOUT "Wine : codec vidÃ©o MS-RLE\nCopyright 2002 par Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_He… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_He.rc (removed) @@ -1,34 +0,0 @@ -/* - * Hebrew resource file for MS-RLE - * - * Copyright 2002 Michael GÃ¼nnewig - * - * Translated by Baruch Rutman - * - * 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 - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE ××§××× ×××××" - IDS_ABOUT "Wine MS-RLE ××§××× ×××××\n××××××ª ×××¦×¨×× 2002 ×¢""× Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Hu… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Hu.rc (removed) @@ -1,30 +0,0 @@ -/* - * Hungarian resource file for MS-RLE - * - * Copyright 2006 Andras Kovacs - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT L"Wine MS-RLE video kodek\nCopyright 2002, Michael G\x00fcnnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_It… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_It.rc (removed) @@ -1,31 +0,0 @@ -/* - * Italian resource file for MS-RLE - * - * Copyright 2002 Michael Günnewig - * Copyright 2003 Ivan Leo Puoti - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codec video MS-RLE di Wine" - IDS_ABOUT "Codec video MS-RLE di Wine\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ja… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ja.rc (removed) @@ -1,33 +0,0 @@ -/* - * Japanese resource file for MS-RLE - * - * Copyright 2004 Hajime Segawa - * - * 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 - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE ãããªã³ã¼ããã¯" - IDS_ABOUT "Wine MS-RLE ãããªã³ã¼ããã¯\nCopyright 2002 by Michael GÃ¼newig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ko… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ko.rc (removed) @@ -1,30 +0,0 @@ -/* - * Korean resource file for MS-RLE - * - * Copyright 2005 YunSong Hwang - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE ºñµð¿À ÄÚµ¦" - IDS_ABOUT "Wine MS-RLE ºñµð¿À ÄÚµ¦\nCopyright 2002 by Michael Gunnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Lt… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Lt.rc (removed) @@ -1,33 +0,0 @@ -/* - * Lithuanian resource file for MS-RLE - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> - * - * 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 - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE vaizdo kodekas" - IDS_ABOUT "Wine MS-RLE vaizdo kodekas\nAutoriaus teisÄs Michael GÃ¼nnewig, 2002" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Nl… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Nl.rc (removed) @@ -1,30 +0,0 @@ -/* - * MS-RLE (Dutch resources) - * - * Copyright 2003 Hans Leidekker - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE videodecoder" - IDS_ABOUT "Wine MS-RLE videodecoder\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_No… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_No.rc (removed) @@ -1,30 +0,0 @@ -/* - * Norwegian Bokmål resource file for MS-RLE - * - * Copyright 2005 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE-videokodek" - IDS_ABOUT "Wine MS-RLE-videokodek\nKopirett 2002 tilhører Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pl… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Pl.rc (removed) @@ -1,31 +0,0 @@ -/* - * Polish resource file for MS-RLE - * - * Copyright 2002 Michael Gnnewig - * Copyright 2006 Mikolaj Zalewski - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Kodek Wine MS-RLE" - IDS_ABOUT L"Koder-dekoder Wine MS-RLE\nCopyright 2002 - Michael G\x00fcnnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pt… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Pt.rc (removed) @@ -1,40 +0,0 @@ -/* - * Portuguese resource file for MS-RLE - * - * Copyright 2003 Marcelo Duarte - * Copyright 2006 Américo José Melo - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE codificador/decodificador de vídeo" - IDS_ABOUT "Wine MS-RLE codificador/decodificador de vídeo\nCopyright 2002 por Michael Günnewig" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE codificador/decodificador de vídeo" - IDS_ABOUT "Wine MS-RLE codificador/decodificador de vídeo\nDireitos de autor 2002 por Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ro… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ro.rc (removed) @@ -1,31 +0,0 @@ -/* - * Copyright 2002 Michael GÃ¼nnewig - * Copyright 2008 Michael Stefaniuc - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Codecul video Wine MS-RLE" - IDS_ABOUT "Codecul video Wine MS-RLE\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ru… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Ru.rc (removed) @@ -1,33 +0,0 @@ -/* - * Russian resource file for MS-RLE - * - * Copyright 2003 Igor Stepin - * - * 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 - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "ÐÐ¸Ð´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE" - IDS_ABOUT "ÐÐ¸Ð´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE\nCopyright 2002 by Michael GÑnnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Si… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Si.rc (removed) @@ -1,32 +0,0 @@ -/* - * Slovenian resource file for MS-RLE - * - * Copyright 2003, 2008 Rok Mandeljc - * - * 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 - */ - -#include "msrle_private.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT "Wine MS-RLE video kodek\nCopyright 2002 by Michael GÃ¼nnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Sv… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Sv.rc (removed) @@ -1,30 +0,0 @@ -/* - * Swedish resource file for MS-RLE - * - * Copyright 2007 Daniel Nylander - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE videokodek" - IDS_ABOUT "Wine MS-RLE videokodek\nCopyright 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Tr… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Tr.rc (removed) @@ -1,30 +0,0 @@ -/* - * Turkish resource file for MS-RLE - * - * Copyright 2006 Fatih Aþýcý - * - * 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 - */ - -#include "msrle_private.h" - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine MS-RLE vidyo çözücü" - IDS_ABOUT "Wine MS-RLE vidyo çözücü\nTelif Hakký 2002 Michael Günnewig" -} Removed: trunk/reactos/dll/win32/msrle32/msrle_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Uk… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle_Uk.rc (removed) @@ -1,34 +0,0 @@ -/* - * Ukrainian resource file for MS-RLE - * - * Copyright 2002 Michael GÐÑnnewig - * Copyright 2010 Igor Paliychuk - * - * 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 - */ - -#include "msrle_private.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "ÐÑÐ´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE" - IDS_ABOUT "ÐÑÐ´ÐµÐ¾ ÐºÐ¾Ð´ÐµÐº Wine MS-RLE\nCopyright 2002 by Michael GÐÑnnewig" -} Modified: trunk/reactos/dll/win32/msrle32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/msrle32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/rsrc.rc [iso-8859-1] Sun Sep 22 16:57:15 2013 @@ -32,73 +32,73 @@ */ #ifdef LANGUAGE_BG_BG - #include "msrle_Bg.rc" + #include "lang/msrle_Bg.rc" #endif #ifdef LANGUAGE_CS_CZ - #include "msrle_Cs.rc" + #include "lang/msrle_Cs.rc" #endif #ifdef LANGUAGE_DA_DK - #include "msrle_Da.rc" + #include "lang/msrle_Da.rc" #endif #ifdef LANGUAGE_ES_ES - #include "msrle_Es.rc" + #include "lang/msrle_Es.rc" #endif #ifdef LANGUAGE_HU_HU - #include "msrle_Hu.rc" + #include "lang/msrle_Hu.rc" #endif #ifdef LANGUAGE_IT_IT - #include "msrle_It.rc" + #include "lang/msrle_It.rc" #endif #ifdef LANGUAGE_KO_KR - #include "msrle_Ko.rc" + #include "lang/msrle_Ko.rc" #endif #ifdef LANGUAGE_NL_NL - #include "msrle_Nl.rc" + #include "lang/msrle_Nl.rc" #endif #ifdef LANGUAGE_NO_NO - #include "msrle_No.rc" + #include "lang/msrle_No.rc" #endif #ifdef LANGUAGE_PL_PL - #include "msrle_Pl.rc" + #include "lang/msrle_Pl.rc" #endif #ifdef LANGUAGE_PT_PT - #include "msrle_Pt.rc" + #include "lang/msrle_Pt.rc" #endif #ifdef LANGUAGE_SV_SE - #include "msrle_Sv.rc" + #include "lang/msrle_Sv.rc" #endif #ifdef LANGUAGE_TR_TR - #include "msrle_Tr.rc" + #include "lang/msrle_Tr.rc" #endif /* UTF-8 */ #ifdef LANGUAGE_DE_DE - #include "msrle_De.rc" + #include "lang/msrle_De.rc" #endif #ifdef LANGUAGE_EN_US - #include "msrle_En.rc" + #include "lang/msrle_En.rc" #endif #ifdef LANGUAGE_FR_FR - #include "msrle_Fr.rc" + #include "lang/msrle_Fr.rc" #endif #ifdef LANGUAGE_HE_IL - #include "msrle_He.rc" + #include "lang/msrle_He.rc" #endif #ifdef LANGUAGE_JA_JP - #include "msrle_Ja.rc" + #include "lang/msrle_Ja.rc" #endif #ifdef LANGUAGE_LT_LT - #include "msrle_Lt.rc" + #include "lang/msrle_Lt.rc" #endif #ifdef LANGUAGE_RO_RO - #include "msrle_Ro.rc" + #include "lang/msrle_Ro.rc" #endif #ifdef LANGUAGE_RU_RU - #include "msrle_Ru.rc" + #include "lang/msrle_Ru.rc" #endif #ifdef LANGUAGE_SL_SI - #include "msrle_Si.rc" + #include "lang/msrle_Si.rc" #endif #ifdef LANGUAGE_UK_UA - #include "msrle_Uk.rc" + #include "lang/msrle_Uk.rc" #endif

1 0

[akhaldi] 60311: [MSISYS.OCX] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:53:31 2013 New Revision: 60311 URL: http://svn.reactos.org/svn/reactos?rev=60311&view=rev Log: [MSISYS.OCX] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt trunk/reactos/dll/win32/msisys.ocx/msisys.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/CMake… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msisys.ocx msisys.ocx.spec) list(APPEND SOURCE @@ -9,8 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) add_library(msisys SHARED ${SOURCE}) - set_module_type(msisys win32ocx) -target_link_libraries(msisys uuid wine) +target_link_libraries(msisys wine) add_importlibs(msisys msvcrt kernel32 ntdll) add_cd_file(TARGET msisys DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msisys.ocx/msisys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisys.ocx/msisy… ============================================================================== --- trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisys.ocx/msisys.c [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -37,50 +37,6 @@ /*********************************************************************** - * MSISYS_InitProcess (internal) - */ -static BOOL MSISYS_InitProcess( void ) -{ - TRACE("()\n"); - - return TRUE; -} - -/*********************************************************************** - * MSISYS_UninitProcess (internal) - */ -static void MSISYS_UninitProcess( void ) -{ - TRACE("()\n"); -} - -/*********************************************************************** - * DllMain for MSISYS - */ -BOOL WINAPI DllMain( - HINSTANCE hInstDLL, - DWORD fdwReason, - LPVOID lpvReserved ) -{ - TRACE("(%p,%d,%p)\n",hInstDLL,fdwReason,lpvReserved); - - switch ( fdwReason ) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - if ( !MSISYS_InitProcess() ) - return FALSE; - break; - case DLL_PROCESS_DETACH: - MSISYS_UninitProcess(); - break; - } - - return TRUE; -} - - -/*********************************************************************** * DllCanUnloadNow (MSISYS.@) * * RETURNS @@ -89,7 +45,7 @@ */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /*********************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 22 16:53:31 2013 @@ -120,7 +120,7 @@ reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 reactos/dll/win32/msimtf # Synced to Wine-1.7.1 reactos/dll/win32/msisip # Synced to Wine-1.7.1 -reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 +reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Autosync reactos/dll/win32/mssign32 # Synced to Wine-1.5.19

1 0

[akhaldi] 60310: [MSISIP] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:47:51 2013 New Revision: 60310 URL: http://svn.reactos.org/svn/reactos?rev=60310&view=rev Log: [MSISIP] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msisip/CMakeLists.txt trunk/reactos/dll/win32/msisip/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msisip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:47:51 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msisip.dll msisip.spec) list(APPEND SOURCE @@ -10,9 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/msisip.def) add_library(msisip SHARED ${SOURCE}) - set_module_type(msisip win32dll) - target_link_libraries(msisip wine) add_importlibs(msisip crypt32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET msisip DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msisip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/main.c [iso-8859-1] Sun Sep 22 16:47:51 2013 @@ -44,10 +44,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 22 16:47:51 2013 @@ -119,7 +119,7 @@ reactos/dll/win32/msi # Synced to Wine-1.7.1 reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 reactos/dll/win32/msimtf # Synced to Wine-1.7.1 -reactos/dll/win32/msisip # Synced to Wine-1.5.19 +reactos/dll/win32/msisip # Synced to Wine-1.7.1 reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Autosync

1 0

[akhaldi] 60309: [MSIMTF] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:32:59 2013 New Revision: 60309 URL: http://svn.reactos.org/svn/reactos?rev=60309&view=rev Log: [MSIMTF] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msimtf/CMakeLists.txt trunk/reactos/dll/win32/msimtf/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:32:59 2013 @@ -6,12 +6,11 @@ list(APPEND SOURCE activeimmapp.c main.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def) -add_library(msimtf SHARED ${SOURCE}) +add_library(msimtf SHARED ${SOURCE} rsrc.rc) set_module_type(msimtf win32dll) target_link_libraries(msimtf uuid wine) -add_importlibs(msimtf msvcrt imm32 kernel32 ntdll) +add_importlibs(msimtf imm32 msvcrt kernel32 ntdll) add_cd_file(TARGET msimtf DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] Sun Sep 22 16:32:59 2013 @@ -55,8 +55,6 @@ case DLL_PROCESS_ATTACH: msimtf_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 22 16:32:59 2013 @@ -118,7 +118,7 @@ reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26 reactos/dll/win32/msi # Synced to Wine-1.7.1 reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 -reactos/dll/win32/msimtf # Synced to Wine-1.5.19 +reactos/dll/win32/msimtf # Synced to Wine-1.7.1 reactos/dll/win32/msisip # Synced to Wine-1.5.19 reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19

1 0

[akhaldi] 60308: [MSI_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:30:59 2013 New Revision: 60308 URL: http://svn.reactos.org/svn/reactos?rev=60308&view=rev Log: [MSI_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/msi/CMakeLists.txt trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/testlist.c Modified: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:30:59 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE action.c @@ -16,7 +14,7 @@ testlist.c) add_executable(msi_winetest ${SOURCE}) -target_link_libraries(msi_winetest wine uuid) +target_link_libraries(msi_winetest uuid) set_module_type(msi_winetest win32cui) -add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32 ntdll) +add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32) add_cd_file(TARGET msi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Sun Sep 22 16:30:59 2013 @@ -38,8 +38,6 @@ (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); static UINT (WINAPI *pMsiSourceListEnumSourcesA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); -static UINT (WINAPI *pMsiSourceListGetInfoA) - (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); @@ -158,6 +156,7 @@ "InstallMode\tTypical\n" "Manufacturer\tWine\n" "PIDTemplate\t12345<###-%%%%%%%>@@@@@\n" + "PRIMARYFOLDER\tTARGETDIR\n" "ProductCode\t{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}\n" "ProductID\tnone\n" "ProductLanguage\t1033\n" @@ -392,6 +391,13 @@ "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; +static const CHAR cc3_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t10\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2_.cab\tDISK2\t\n" + "3\t12\t\ttest3.cab\tDISK3\t\n"; + static const CHAR co_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" @@ -487,11 +493,6 @@ "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" "1\t1\t\ttest1.cab\tDISK1\t\n"; - -static const CHAR lus2_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" - "i2\ti4\tL64\tS255\tS32\tS72\n" - "Media\tDiskId\n" - "1\t1\t\t#test1.cab\tDISK1\t\n"; static const CHAR sdp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -593,33 +594,6 @@ "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" "augustus\taugustus\taugustus\t500\t\t\t8192\t1"; - -static const CHAR spf_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "SetFolderProp\t51\tMSITESTDIR\t[ProgramFilesFolder]\\msitest\\added\t\n"; - -static const CHAR spf_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "SetFolderProp\t\t950\n" - "InstallFiles\t\t4000\n" - "InstallServices\t\t5000\n" - "InstallFinalize\t\t6600\n" - "InstallInitialize\t\t1500\n" - "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100"; - -static const CHAR spf_install_ui_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallUISequence\tAction\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "CostFinalize\t\t1000\n" - "ExecuteAction\t\t1100\n"; static const CHAR pp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -1034,159 +1008,6 @@ "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; -static const CHAR sd_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" - "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" - "File\tFile\n" - "sourcedir.txt\tsourcedir\tsourcedir.txt\t1000\t\t\t8192\t1\n"; - -static const CHAR sd_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" - "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" - "Feature\tFeature\n" - "sourcedir\t\t\tsourcedir feature\t1\t2\tMSITESTDIR\t0\n"; - -static const CHAR sd_feature_comp_dat[] = "Feature_\tComponent_\n" - "s38\ts72\n" - "FeatureComponents\tFeature_\tComponent_\n" - "sourcedir\tsourcedir\n"; - -static const CHAR sd_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" - "s72\tS38\ts72\ti2\tS255\tS72\n" - "Component\tComponent\n" - "sourcedir\t{DD422F92-3ED8-49B5-A0B7-F266F98357DF}\tMSITESTDIR\t0\t\tsourcedir.txt\n"; - -static const CHAR sd_install_ui_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallUISequence\tAction\n" - "TestSourceDirProp1\tnot SourceDir and not SOURCEDIR and not Installed\t99\n" - "AppSearch\t\t100\n" - "TestSourceDirProp2\tnot SourceDir and not SOURCEDIR and not Installed\t101\n" - "LaunchConditions\tnot Installed \t110\n" - "TestSourceDirProp3\tnot SourceDir and not SOURCEDIR and not Installed\t111\n" - "FindRelatedProducts\t\t120\n" - "TestSourceDirProp4\tnot SourceDir and not SOURCEDIR and not Installed\t121\n" - "CCPSearch\t\t130\n" - "TestSourceDirProp5\tnot SourceDir and not SOURCEDIR and not Installed\t131\n" - "RMCCPSearch\t\t140\n" - "TestSourceDirProp6\tnot SourceDir and not SOURCEDIR and not Installed\t141\n" - "ValidateProductID\t\t150\n" - "TestSourceDirProp7\tnot SourceDir and not SOURCEDIR and not Installed\t151\n" - "CostInitialize\t\t800\n" - "TestSourceDirProp8\tnot SourceDir and not SOURCEDIR and not Installed\t801\n" - "FileCost\t\t900\n" - "TestSourceDirProp9\tnot SourceDir and not SOURCEDIR and not Installed\t901\n" - "IsolateComponents\t\t1000\n" - "TestSourceDirProp10\tnot SourceDir and not SOURCEDIR and not Installed\t1001\n" - "CostFinalize\t\t1100\n" - "TestSourceDirProp11\tnot SourceDir and not SOURCEDIR and not Installed\t1101\n" - "MigrateFeatureStates\t\t1200\n" - "TestSourceDirProp12\tnot SourceDir and not SOURCEDIR and not Installed\t1201\n" - "ExecuteAction\t\t1300\n" - "TestSourceDirProp13\tnot SourceDir and not SOURCEDIR and not Installed\t1301\n"; - -static const CHAR sd_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "TestSourceDirProp14\tSourceDir and SOURCEDIR and not Installed\t99\n" - "LaunchConditions\t\t100\n" - "TestSourceDirProp15\tSourceDir and SOURCEDIR and not Installed\t101\n" - "ValidateProductID\t\t700\n" - "TestSourceDirProp16\tSourceDir and SOURCEDIR and not Installed\t701\n" - "CostInitialize\t\t800\n" - "TestSourceDirProp17\tSourceDir and SOURCEDIR and not Installed\t801\n" - "ResolveSource\tResolveSource and not Installed\t850\n" - "TestSourceDirProp18\tResolveSource and not SourceDir and not SOURCEDIR and not Installed\t851\n" - "TestSourceDirProp19\tnot ResolveSource and SourceDir and SOURCEDIR and not Installed\t852\n" - "FileCost\t\t900\n" - "TestSourceDirProp20\tSourceDir and SOURCEDIR and not Installed\t901\n" - "IsolateComponents\t\t1000\n" - "TestSourceDirProp21\tSourceDir and SOURCEDIR and not Installed\t1001\n" - "CostFinalize\t\t1100\n" - "TestSourceDirProp22\tSourceDir and SOURCEDIR and not Installed\t1101\n" - "MigrateFeatureStates\t\t1200\n" - "TestSourceDirProp23\tSourceDir and SOURCEDIR and not Installed\t1201\n" - "InstallValidate\t\t1400\n" - "TestSourceDirProp24\tSourceDir and SOURCEDIR and not Installed\t1401\n" - "InstallInitialize\t\t1500\n" - "TestSourceDirProp25\tSourceDir and SOURCEDIR and not Installed\t1501\n" - "ProcessComponents\t\t1600\n" - "TestSourceDirProp26\tnot SourceDir and not SOURCEDIR and not Installed\t1601\n" - "UnpublishFeatures\t\t1800\n" - "TestSourceDirProp27\tnot SourceDir and not SOURCEDIR and not Installed\t1801\n" - "RemoveFiles\t\t3500\n" - "TestSourceDirProp28\tnot SourceDir and not SOURCEDIR and not Installed\t3501\n" - "InstallFiles\t\t4000\n" - "TestSourceDirProp29\tnot SourceDir and not SOURCEDIR and not Installed\t4001\n" - "RegisterUser\t\t6000\n" - "TestSourceDirProp30\tnot SourceDir and not SOURCEDIR and not Installed\t6001\n" - "RegisterProduct\t\t6100\n" - "TestSourceDirProp31\tnot SourceDir and not SOURCEDIR and not Installed\t6101\n" - "PublishFeatures\t\t6300\n" - "TestSourceDirProp32\tnot SourceDir and not SOURCEDIR and not Installed\t6301\n" - "PublishProduct\t\t6400\n" - "TestSourceDirProp33\tnot SourceDir and not SOURCEDIR and not Installed\t6401\n" - "InstallExecute\t\t6500\n" - "TestSourceDirProp34\tnot SourceDir and not SOURCEDIR and not Installed\t6501\n" - "InstallFinalize\t\t6600\n" - "TestSourceDirProp35\tnot SourceDir and not SOURCEDIR and not Installed\t6601\n"; - -static const CHAR sd_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "TestSourceDirProp1\t19\t\tTest 1 failed\t\n" - "TestSourceDirProp2\t19\t\tTest 2 failed\t\n" - "TestSourceDirProp3\t19\t\tTest 3 failed\t\n" - "TestSourceDirProp4\t19\t\tTest 4 failed\t\n" - "TestSourceDirProp5\t19\t\tTest 5 failed\t\n" - "TestSourceDirProp6\t19\t\tTest 6 failed\t\n" - "TestSourceDirProp7\t19\t\tTest 7 failed\t\n" - "TestSourceDirProp8\t19\t\tTest 8 failed\t\n" - "TestSourceDirProp9\t19\t\tTest 9 failed\t\n" - "TestSourceDirProp10\t19\t\tTest 10 failed\t\n" - "TestSourceDirProp11\t19\t\tTest 11 failed\t\n" - "TestSourceDirProp12\t19\t\tTest 12 failed\t\n" - "TestSourceDirProp13\t19\t\tTest 13 failed\t\n" - "TestSourceDirProp14\t19\t\tTest 14 failed\t\n" - "TestSourceDirProp15\t19\t\tTest 15 failed\t\n" - "TestSourceDirProp16\t19\t\tTest 16 failed\t\n" - "TestSourceDirProp17\t19\t\tTest 17 failed\t\n" - "TestSourceDirProp18\t19\t\tTest 18 failed\t\n" - "TestSourceDirProp19\t19\t\tTest 19 failed\t\n" - "TestSourceDirProp20\t19\t\tTest 20 failed\t\n" - "TestSourceDirProp21\t19\t\tTest 21 failed\t\n" - "TestSourceDirProp22\t19\t\tTest 22 failed\t\n" - "TestSourceDirProp23\t19\t\tTest 23 failed\t\n" - "TestSourceDirProp24\t19\t\tTest 24 failed\t\n" - "TestSourceDirProp25\t19\t\tTest 25 failed\t\n" - "TestSourceDirProp26\t19\t\tTest 26 failed\t\n" - "TestSourceDirProp27\t19\t\tTest 27 failed\t\n" - "TestSourceDirProp28\t19\t\tTest 28 failed\t\n" - "TestSourceDirProp29\t19\t\tTest 29 failed\t\n" - "TestSourceDirProp30\t19\t\tTest 30 failed\t\n" - "TestSourceDirProp31\t19\t\tTest 31 failed\t\n" - "TestSourceDirProp32\t19\t\tTest 32 failed\t\n" - "TestSourceDirProp33\t19\t\tTest 33 failed\t\n" - "TestSourceDirProp34\t19\t\tTest 34 failed\t\n" - "TestSourceDirProp35\t19\t\tTest 35 failed\t\n"; - -static const CHAR cl_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" - "CustomAction\tAction\n" - "TestCommandlineProp\t19\t\tTest1\t\n"; - -static const CHAR cl_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "s72\tS255\tI2\n" - "InstallExecuteSequence\tAction\n" - "LaunchConditions\t\t100\n" - "ValidateProductID\t\t700\n" - "CostInitialize\t\t800\n" - "FileCost\t\t900\n" - "CostFinalize\t\t1000\n" - "TestCommandlineProp\tP=\"one\"\t1100\n" - "InstallInitialize\t\t1500\n" - "ProcessComponents\t\t1600\n" - "InstallValidate\t\t1400\n" - "InstallFinalize\t\t5000\n"; - static const CHAR uc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" @@ -1281,6 +1102,65 @@ "PublishProduct\t\t1300\n" "InstallFinalize\t\t1400\n"; +static const char vp_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "volumeprop\tcomp\tvolumeprop.txt\t1000\t\t\t8192\t1\n"; + +static const char vp_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t1\t2\tMSITESTDIR\t0\n"; + +static const char vp_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tcomp\n"; + +static const char vp_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "comp\t{24364AE7-5B7F-496C-AF5A-54893639C567}\tMSITESTDIR\t0\t\tvolumeprop\n"; + +static const char vp_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestPrimaryVolumePath0\t19\t\tPrimaryVolumePath set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceAvailable0\t19\t\tPrimaryVolumeSpaceAvailable set before CostFinalize\t\n" + "TestPrimaryVolumePath1\t19\t\tPrimaryVolumePath set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceAvailable1\t19\t\tPrimaryVolumeSpaceAvailable not set before InstallValidate\t\n" + "TestPrimaryVolumePath2\t19\t\tPrimaryVolumePath not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n"; + +static const char vp_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "TestPrimaryVolumePath0\tPrimaryVolumePath AND NOT REMOVE\t400\n" + "TestPrimaryVolumeSpaceAvailable0\tPrimaryVolumeSpaceAvailable AND NOT REMOVE\t500\n" + "CostFinalize\t\t600\n" + "TestPrimaryVolumePath1\tPrimaryVolumePath AND NOT REMOVE\t600\n" + "TestPrimaryVolumeSpaceAvailable1\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t800\n" + "InstallValidate\t\t900\n" + "TestPrimaryVolumePath2\tNOT PrimaryVolumePath AND NOT REMOVE\t1000\n" + "TestPrimaryVolumeSpaceAvailable2\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t1100\n" + "InstallInitialize\t\t1200\n" + "ProcessComponents\t\t1300\n" + "RemoveFiles\t\t1400\n" + "InstallFiles\t\t1500\n" + "RegisterProduct\t\t1600\n" + "PublishFeatures\t\t1700\n" + "PublishProduct\t\t1800\n" + "InstallFinalize\t\t1900\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1460,6 +1340,18 @@ ADD_TABLE(property), }; +static const msi_table cc3_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cc3_media), + ADD_TABLE(property), +}; + static const msi_table co_tables[] = { ADD_TABLE(cc_component), @@ -1596,56 +1488,6 @@ ADD_TABLE(property), }; -static const msi_table spf_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(spf_install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), - ADD_TABLE(spf_custom_action), - ADD_TABLE(spf_install_ui_seq), -}; - -static const msi_table lus0_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(pp_install_exec_seq), - ADD_TABLE(rof_media), - ADD_TABLE(property), -}; - -static const msi_table lus1_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(pp_install_exec_seq), - ADD_TABLE(rofc_media), - ADD_TABLE(property), -}; - -static const msi_table lus2_tables[] = -{ - ADD_TABLE(ci_component), - ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(rof_feature_comp), - ADD_TABLE(rof_file), - ADD_TABLE(pp_install_exec_seq), - ADD_TABLE(lus2_media), - ADD_TABLE(property), -}; - static const msi_table tp_tables[] = { ADD_TABLE(tp_component), @@ -1883,20 +1725,6 @@ ADD_TABLE(property), }; -static const msi_table sd_tables[] = -{ - ADD_TABLE(directory), - ADD_TABLE(sd_component), - ADD_TABLE(sd_feature), - ADD_TABLE(sd_feature_comp), - ADD_TABLE(sd_file), - ADD_TABLE(sd_install_exec_seq), - ADD_TABLE(sd_install_ui_seq), - ADD_TABLE(sd_custom_action), - ADD_TABLE(media), - ADD_TABLE(property) -}; - static const msi_table fo_tables[] = { ADD_TABLE(directory), @@ -1935,19 +1763,6 @@ ADD_TABLE(property) }; -static const msi_table cl_tables[] = -{ - ADD_TABLE(component), - ADD_TABLE(directory), - ADD_TABLE(feature), - ADD_TABLE(feature_comp), - ADD_TABLE(file), - ADD_TABLE(cl_custom_action), - ADD_TABLE(cl_install_exec_seq), - ADD_TABLE(media), - ADD_TABLE(property) -}; - static const msi_table uc_tables[] = { ADD_TABLE(directory), @@ -1972,6 +1787,19 @@ ADD_TABLE(property) }; +static const msi_table vp_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(vp_file), + ADD_TABLE(vp_component), + ADD_TABLE(vp_feature), + ADD_TABLE(vp_feature_comp), + ADD_TABLE(vp_custom_action), + ADD_TABLE(vp_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2013,7 +1841,7 @@ DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; - + dwAccess = GENERIC_READ | GENERIC_WRITE; /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; @@ -2036,7 +1864,7 @@ HANDLE handle = (HANDLE)hf; DWORD dwRead; BOOL res; - + res = ReadFile(handle, memory, cb, &dwRead, NULL); ok(res, "Failed to ReadFile\n"); @@ -2095,7 +1923,6 @@ GET_PROC(hmsi, MsiQueryComponentStateA); GET_PROC(hmsi, MsiSourceListEnumSourcesA); - GET_PROC(hmsi, MsiSourceListGetInfoA); GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hadvapi32, ConvertSidToStringSidA); @@ -2175,7 +2002,7 @@ res = GetFileInformationByHandle(handle, &finfo); ok(res, "Expected GetFileInformationByHandle to succeed\n"); - + FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); @@ -3025,11 +2852,18 @@ MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } delete_cab_files(); DeleteFile(msifile); @@ -3043,16 +2877,66 @@ if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); - ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - -error: + } + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } + + delete_cab_files(); + DeleteFile(msifile); + + /* Tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab */ + + /* Filename from cab is right and the one from msi is wrong */ + create_cc_test_files(); + create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r); + todo_wine ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File installed\n"); + todo_wine ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "Directory created\n"); + } + + delete_cab_files(); + DeleteFile(msifile); + + /* Filename from msi is right and the one from cab is wrong */ + create_cc_test_files(); + ok(MoveFile("test2.cab", "test2_.cab"), "Cannot rename test2.cab to test2_.cab\n"); + create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } + delete_cab_files(); DeleteFile(msifile); } @@ -3355,167 +3239,6 @@ DeleteFile(msifile); } -static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) -{ - WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; - IStorage *stg; - IStream *stm; - HRESULT hr; - HANDLE handle; - - MultiByteToWideChar(CP_ACP, 0, db, -1, dbW, MAX_PATH); - hr = StgOpenStorage(dbW, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); - if (FAILED(hr)) - return FALSE; - - MultiByteToWideChar(CP_ACP, 0, cabinet, -1, cabinetW, MAX_PATH); - hr = IStorage_CreateStream(stg, cabinetW, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm); - if (FAILED(hr)) - { - IStorage_Release(stg); - return FALSE; - } - - handle = CreateFileW(cabinetW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); - if (handle != INVALID_HANDLE_VALUE) - { - DWORD count; - char buffer[1024]; - if (ReadFile(handle, buffer, sizeof(buffer), &count, NULL)) - IStream_Write(stm, buffer, count, &count); - CloseHandle(handle); - } - - IStream_Release(stm); - IStorage_Release(stg); - - return TRUE; -} - -static void test_lastusedsource(void) -{ - static char prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; - - UINT r; - char value[MAX_PATH], path[MAX_PATH]; - DWORD size; - - if (!pMsiSourceListGetInfoA) - { - win_skip("MsiSourceListGetInfoA is not available\n"); - return; - } - - CreateDirectoryA("msitest", NULL); - create_file("maximus", 500); - create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); - DeleteFile("maximus"); - - create_database("msifile0.msi", lus0_tables, sizeof(lus0_tables) / sizeof(msi_table)); - create_database("msifile1.msi", lus1_tables, sizeof(lus1_tables) / sizeof(msi_table)); - create_database("msifile2.msi", lus2_tables, sizeof(lus2_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - - /* no cabinet file */ - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); - ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); - - r = MsiInstallProductA("msifile0.msi", "PUBLISH_PRODUCT=1"); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); - ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - - r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* separate cabinet file */ - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); - ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); - - r = MsiInstallProductA("msifile1.msi", "PUBLISH_PRODUCT=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); - ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - - r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); - ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); - - /* embedded cabinet stream */ - - add_cabinet_storage("msifile2.msi", "test1.cab"); - - r = MsiInstallProductA("msifile2.msi", "PUBLISH_PRODUCT=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); - ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - - r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - size = MAX_PATH; - lstrcpyA(value, "aaa"); - r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); - ok(!lstrcmpA(value, "aaa"), "Expected \"aaa\", got \"%s\"\n", value); - -error: - /* Delete the files in the temp (current) folder */ - delete_cab_files(); - DeleteFile("msitest\\maximus"); - RemoveDirectory("msitest"); - DeleteFile("msifile0.msi"); - DeleteFile("msifile1.msi"); - DeleteFile("msifile2.msi"); -} - static void test_setdirproperty(void) { UINT r; @@ -3594,109 +3317,6 @@ DeleteFile("augustus"); DeleteFile("caesar"); DeleteFile("msitest\\gaius"); - RemoveDirectory("msitest"); -} - -static void test_concurrentinstall(void) -{ - UINT r; - CHAR path[MAX_PATH]; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - CreateDirectoryA("msitest", NULL); - CreateDirectoryA("msitest\\msitest", NULL); - create_file("msitest\\maximus", 500); - create_file("msitest\\msitest\\augustus", 500); - - create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\msitest\\concurrent.msi"); - create_database(path, ci2_tables, sizeof(ci2_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - - r = MsiInstallProductA(msifile, NULL); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - DeleteFile(path); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - if (!delete_pf("msitest\\augustus", TRUE)) - trace("concurrent installs not supported\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - - DeleteFile(path); - - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - -error: - DeleteFile(msifile); - DeleteFile("msitest\\msitest\\augustus"); - DeleteFile("msitest\\maximus"); - RemoveDirectory("msitest\\msitest"); - RemoveDirectory("msitest"); -} - -static void test_setpropertyfolder(void) -{ - UINT r; - CHAR path[MAX_PATH]; - DWORD attr; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\msitest\\added"); - - CreateDirectoryA("msitest", NULL); - create_file("msitest\\maximus", 500); - - create_database(msifile, spf_tables, sizeof(spf_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - - r = MsiInstallProductA(msifile, NULL); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - attr = GetFileAttributesA(path); - if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY)) - { - ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\added", FALSE), "Directory not created\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - } - else - { - trace("changing folder property not supported\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); - } - -error: - /* Delete the files in the temp (current) folder */ - DeleteFile(msifile); - DeleteFile("msitest\\maximus"); RemoveDirectory("msitest"); } @@ -5695,68 +5315,6 @@ DeleteFile(msifile); } -static void test_sourcedir_props(void) -{ - UINT r; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - create_test_files(); - create_file("msitest\\sourcedir.txt", 1000); - create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - - /* full UI, no ResolveSource action */ - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - - /* full UI, ResolveSource action */ - r = MsiInstallProductA(msifile, "ResolveSource=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - - /* no UI, no ResolveSource action */ - r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - - /* no UI, ResolveSource action */ - r = MsiInstallProductA(msifile, "ResolveSource=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); - ok(!delete_pf("msitest", FALSE), "directory not removed\n"); - - DeleteFileA("msitest\\sourcedir.txt"); - DeleteFile(msifile); -} - static void test_package_validation(void) { UINT r; @@ -5948,166 +5506,6 @@ RemoveDirectory("msitest"); } -static void test_command_line_parsing(void) -{ - UINT r; - const char *cmd; - - if (is_process_limited()) - { - skip("process is limited\n"); - return; - } - - create_test_files(); - create_database(msifile, cl_tables, sizeof(cl_tables)/sizeof(msi_table)); - - MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - - cmd = " "; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "="; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "=="; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "one"; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "=one"; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P="; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = " P="; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P= "; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P=\"\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"\"\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P=\"\"\"\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\" "; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P= \""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P= \"\" "; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\" \""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=one"; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - - cmd = "P= one"; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - - cmd = "P=\"one"; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P=one\""; - r = MsiInstallProductA(msifile, cmd); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"one\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - - cmd = "P= \"one\" "; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - - cmd = "P=\"one\"\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P=\"\"one\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P=\"\"one\"\""; - r = MsiInstallProductA(msifile, cmd); - todo_wine ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); - - cmd = "P=\"one two\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"\"\"one\"\" two\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"\"\"one\"\" two\" Q=three"; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"\" Q=\"two\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"one\" Q=\"two\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - - cmd = "P=\"one=two\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "Q=\"\" P=\"one\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - - cmd = "P=\"\"\"one\"\"\" Q=\"two\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"one \"\"two\"\"\" Q=\"three\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - cmd = "P=\"\"\"one\"\" two\" Q=\"three\""; - r = MsiInstallProductA(msifile, cmd); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFile(msifile); - RemoveDirectory("msitest"); -} - static void test_upgrade_code(void) { UINT r; @@ -6217,7 +5615,32 @@ error: DeleteFileA( msifile ); - return; +} + +static void test_volume_props(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + CreateDirectoryA("msitest", NULL); + create_file("msitest\\volumeprop.txt", 1000); + create_database(msifile, vp_tables, sizeof(vp_tables)/sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + DeleteFileA("msitest\\volumeprop.txt"); + RemoveDirectoryA("msitest"); + DeleteFile(msifile); } START_TEST(install) @@ -6278,8 +5701,6 @@ test_readonlyfile_cab(); test_setdirproperty(); test_cabisextracted(); - test_concurrentinstall(); - test_setpropertyfolder(); test_transformprop(); test_currentworkingdir(); test_admin(); @@ -6295,7 +5716,6 @@ test_propcase(); test_int_widths(); test_shortcut(); - test_lastusedsource(); test_preselected(); test_installed_prop(); test_file_in_use(); @@ -6303,11 +5723,10 @@ test_allusers_prop(); test_feature_override(); test_icon_table(); - test_sourcedir_props(); test_package_validation(); - test_command_line_parsing(); test_upgrade_code(); test_mixed_package(); + test_volume_props(); DeleteFileA(log_file); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Sun Sep 22 16:30:59 2013 @@ -19,6 +19,7 @@ */ #define _WIN32_MSI 300 +#define COBJMACROS #include <stdio.h> #include <windows.h> @@ -26,6 +27,7 @@ #include <msiquery.h> #include <msidefs.h> #include <sddl.h> +#include <fci.h> #include "wine/test.h" @@ -67,6 +69,8 @@ (LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT *, LPSTR, LPDWORD); static UINT (WINAPI *pMsiSetExternalUIRecord) (INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); +static UINT (WINAPI *pMsiSourceListGetInfoA) + (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); static void init_functionpointers(void) { @@ -91,6 +95,7 @@ GET_PROC(hmsi, MsiGetPatchInfoExA) GET_PROC(hmsi, MsiEnumProductsExA) GET_PROC(hmsi, MsiEnumComponentsExA) + GET_PROC(hmsi, MsiSourceListGetInfoA) GET_PROC(hadvapi32, ConvertSidToStringSidA) GET_PROC(hadvapi32, OpenProcessToken); @@ -174,6 +179,275 @@ ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); CloseHandle(token); return (ret && type == TokenElevationTypeLimited); +} + +/* cabinet definitions */ + +/* make the max size large so there is only one cab file */ +#define MEDIA_SIZE 0x7FFFFFFF +#define FOLDER_THRESHOLD 900000 + +/* the FCI callbacks */ + +static void * CDECL mem_alloc(ULONG cb) +{ + return HeapAlloc(GetProcessHeap(), 0, cb); +} + +static void CDECL mem_free(void *memory) +{ + HeapFree(GetProcessHeap(), 0, memory); +} + +static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +{ + sprintf(pccab->szCab, pv, pccab->iCab); + return TRUE; +} + +static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +{ + return 0; +} + +static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, + BOOL fContinuation, void *pv) +{ + return 0; +} + +static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +{ + HANDLE handle; + DWORD dwAccess = 0; + DWORD dwShareMode = 0; + DWORD dwCreateDisposition = OPEN_EXISTING; + + dwAccess = GENERIC_READ | GENERIC_WRITE; + /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + + if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) + dwCreateDisposition = OPEN_EXISTING; + else + dwCreateDisposition = CREATE_NEW; + + handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, + dwCreateDisposition, 0, NULL); + + ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); + + return (INT_PTR)handle; +} + +static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + DWORD dwRead; + BOOL res; + + res = ReadFile(handle, memory, cb, &dwRead, NULL); + ok(res, "Failed to ReadFile\n"); + + return dwRead; +} + +static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + DWORD dwWritten; + BOOL res; + + res = WriteFile(handle, memory, cb, &dwWritten, NULL); + ok(res, "Failed to WriteFile\n"); + + return dwWritten; +} + +static int CDECL fci_close(INT_PTR hf, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + ok(CloseHandle(handle), "Failed to CloseHandle\n"); + + return 0; +} + +static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) +{ + HANDLE handle = (HANDLE)hf; + DWORD ret; + + ret = SetFilePointer(handle, dist, NULL, seektype); + ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); + + return ret; +} + +static int CDECL fci_delete(char *pszFile, int *err, void *pv) +{ + BOOL ret = DeleteFileA(pszFile); + ok(ret, "Failed to DeleteFile %s\n", pszFile); + + return 0; +} + +static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) +{ + LPSTR tempname; + + tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + GetTempFileNameA(".", "xx", 0, tempname); + + if (tempname && (strlen(tempname) < (unsigned)cbTempName)) + { + lstrcpyA(pszTempName, tempname); + HeapFree(GetProcessHeap(), 0, tempname); + return TRUE; + } + + HeapFree(GetProcessHeap(), 0, tempname); + + return FALSE; +} + +static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) +{ + BY_HANDLE_FILE_INFORMATION finfo; + FILETIME filetime; + HANDLE handle; + DWORD attrs; + BOOL res; + + handle = CreateFile(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); + + res = GetFileInformationByHandle(handle, &finfo); + ok(res, "Expected GetFileInformationByHandle to succeed\n"); + + FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); + FileTimeToDosDateTime(&filetime, pdate, ptime); + + attrs = GetFileAttributes(pszName); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); + + return (INT_PTR)handle; +} + +static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) +{ + char path[MAX_PATH]; + char filename[MAX_PATH]; + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, file); + + lstrcpyA(filename, file); + + return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, + progress, get_open_info, compress); +} + +static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) +{ + ZeroMemory(pCabParams, sizeof(CCAB)); + + pCabParams->cb = max_size; + pCabParams->cbFolderThresh = FOLDER_THRESHOLD; + pCabParams->setID = 0xbeef; + pCabParams->iCab = 1; + lstrcpyA(pCabParams->szCabPath, CURR_DIR); + lstrcatA(pCabParams->szCabPath, "\\"); + lstrcpyA(pCabParams->szCab, name); +} + +static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) +{ + CCAB cabParams; + LPCSTR ptr; + HFCI hfci; + ERF erf; + BOOL res; + + set_cab_parameters(&cabParams, name, max_size); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, fci_delete, + get_temp_file, &cabParams, NULL); + + ok(hfci != NULL, "Failed to create an FCI context\n"); + + ptr = files; + while (*ptr) + { + res = add_file(hfci, ptr, tcompTYPE_MSZIP); + ok(res, "Failed to add file: %s\n", ptr); + ptr += lstrlen(ptr) + 1; + } + + res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(res, "Failed to flush the cabinet\n"); + + res = FCIDestroy(hfci); + ok(res, "Failed to destroy the cabinet\n"); +} + +static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) +{ + WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; + IStorage *stg; + IStream *stm; + HRESULT hr; + HANDLE handle; + + MultiByteToWideChar(CP_ACP, 0, db, -1, dbW, MAX_PATH); + hr = StgOpenStorage(dbW, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + if (FAILED(hr)) + return FALSE; + + MultiByteToWideChar(CP_ACP, 0, cabinet, -1, cabinetW, MAX_PATH); + hr = IStorage_CreateStream(stg, cabinetW, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + if (FAILED(hr)) + { + IStorage_Release(stg); + return FALSE; + } + + handle = CreateFileW(cabinetW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (handle != INVALID_HANDLE_VALUE) + { + DWORD count; + char buffer[1024]; + if (ReadFile(handle, buffer, sizeof(buffer), &count, NULL)) + IStream_Write(stm, buffer, count, &count); + CloseHandle(handle); + } + + IStream_Release(stm); + IStorage_Release(stg); + + return TRUE; +} + +static void delete_cab_files(void) +{ + SHFILEOPSTRUCT shfl; + CHAR path[MAX_PATH+10]; + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\*.cab"); + path[strlen(path) + 1] = '\0'; + + shfl.hwnd = NULL; + shfl.wFunc = FO_DELETE; + shfl.pFrom = path; + shfl.pTo = NULL; + shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT; + + SHFileOperation(&shfl); } /* msi database data */ @@ -272,13 +546,314 @@ "heliox\thelium\n" "lithia\tlithium"; -static const CHAR mcp_file_dat[] = +static const char mcp_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" "hydrogen\thydrogen\thydrogen\t0\t\t\t8192\t1\n" "helium\thelium\thelium\t0\t\t\t8192\t1\n" "lithium\tlithium\tlithium\t0\t\t\t8192\t1"; + +static const char lus_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; + +static const char lus_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\tFeature\tFeature\t2\t1\tTARGETDIR\t0\n" + "montecristo\t\tFeature\tFeature\t2\t1\tTARGETDIR\t0"; + +static const char lus_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t8192\t1"; + +static const char lus_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tmaximus\n" + "montecristo\tmaximus"; + +static const char lus_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\tPROCESS_COMPONENTS=1 Or FULL=1\t1600\n" + "UnpublishFeatures\tUNPUBLISH_FEATURES=1 Or FULL=1\t1800\n" + "RemoveFiles\t\t3500\n" + "InstallFiles\t\t4000\n" + "RegisterUser\tREGISTER_USER=1 Or FULL=1\t6000\n" + "RegisterProduct\tREGISTER_PRODUCT=1 Or FULL=1\t6100\n" + "PublishFeatures\tPUBLISH_FEATURES=1 Or FULL=1\t6300\n" + "PublishProduct\tPUBLISH_PRODUCT=1 Or FULL=1\t6400\n" + "InstallFinalize\t\t6600"; + +static const char lus0_media_dat[] = + "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t\tDISK1\t\n"; + +static const char lus1_media_dat[] = + "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\ttest1.cab\tDISK1\t\n"; + +static const char lus2_media_dat[] = + "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t#test1.cab\tDISK1\t\n"; + +static const char spf_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "SetFolderProp\t51\tMSITESTDIR\t[ProgramFilesFolder]\\msitest\\added\t\n"; + +static const char spf_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "SetFolderProp\t\t950\n" + "InstallFiles\t\t4000\n" + "InstallServices\t\t5000\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100"; + +static const char spf_install_ui_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallUISequence\tAction\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "ExecuteAction\t\t1100\n"; + +static const char sd_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "sourcedir.txt\tsourcedir\tsourcedir.txt\t1000\t\t\t8192\t1\n"; + +static const char sd_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "sourcedir\t\t\tsourcedir feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char sd_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "sourcedir\tsourcedir\n"; + +static const char sd_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "sourcedir\t{DD422F92-3ED8-49B5-A0B7-F266F98357DF}\tMSITESTDIR\t0\t\tsourcedir.txt\n"; + +static const char sd_install_ui_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallUISequence\tAction\n" + "TestSourceDirProp1\tnot SourceDir and not SOURCEDIR and not Installed\t99\n" + "AppSearch\t\t100\n" + "TestSourceDirProp2\tnot SourceDir and not SOURCEDIR and not Installed\t101\n" + "LaunchConditions\tnot Installed \t110\n" + "TestSourceDirProp3\tnot SourceDir and not SOURCEDIR and not Installed\t111\n" + "FindRelatedProducts\t\t120\n" + "TestSourceDirProp4\tnot SourceDir and not SOURCEDIR and not Installed\t121\n" + "CCPSearch\t\t130\n" + "TestSourceDirProp5\tnot SourceDir and not SOURCEDIR and not Installed\t131\n" + "RMCCPSearch\t\t140\n" + "TestSourceDirProp6\tnot SourceDir and not SOURCEDIR and not Installed\t141\n" + "ValidateProductID\t\t150\n" + "TestSourceDirProp7\tnot SourceDir and not SOURCEDIR and not Installed\t151\n" + "CostInitialize\t\t800\n" + "TestSourceDirProp8\tnot SourceDir and not SOURCEDIR and not Installed\t801\n" + "FileCost\t\t900\n" + "TestSourceDirProp9\tnot SourceDir and not SOURCEDIR and not Installed\t901\n" + "IsolateComponents\t\t1000\n" + "TestSourceDirProp10\tnot SourceDir and not SOURCEDIR and not Installed\t1001\n" + "CostFinalize\t\t1100\n" + "TestSourceDirProp11\tnot SourceDir and not SOURCEDIR and not Installed\t1101\n" + "MigrateFeatureStates\t\t1200\n" + "TestSourceDirProp12\tnot SourceDir and not SOURCEDIR and not Installed\t1201\n" + "ExecuteAction\t\t1300\n" + "TestSourceDirProp13\tnot SourceDir and not SOURCEDIR and not Installed\t1301\n"; + +static const char sd_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "TestSourceDirProp14\tSourceDir and SOURCEDIR and not Installed\t99\n" + "LaunchConditions\t\t100\n" + "TestSourceDirProp15\tSourceDir and SOURCEDIR and not Installed\t101\n" + "ValidateProductID\t\t700\n" + "TestSourceDirProp16\tSourceDir and SOURCEDIR and not Installed\t701\n" + "CostInitialize\t\t800\n" + "TestSourceDirProp17\tSourceDir and SOURCEDIR and not Installed\t801\n" + "ResolveSource\tResolveSource and not Installed\t850\n" + "TestSourceDirProp18\tResolveSource and not SourceDir and not SOURCEDIR and not Installed\t851\n" + "TestSourceDirProp19\tnot ResolveSource and SourceDir and SOURCEDIR and not Installed\t852\n" + "FileCost\t\t900\n" + "TestSourceDirProp20\tSourceDir and SOURCEDIR and not Installed\t901\n" + "IsolateComponents\t\t1000\n" + "TestSourceDirProp21\tSourceDir and SOURCEDIR and not Installed\t1001\n" + "CostFinalize\t\t1100\n" + "TestSourceDirProp22\tSourceDir and SOURCEDIR and not Installed\t1101\n" + "MigrateFeatureStates\t\t1200\n" + "TestSourceDirProp23\tSourceDir and SOURCEDIR and not Installed\t1201\n" + "InstallValidate\t\t1400\n" + "TestSourceDirProp24\tSourceDir and SOURCEDIR and not Installed\t1401\n" + "InstallInitialize\t\t1500\n" + "TestSourceDirProp25\tSourceDir and SOURCEDIR and not Installed\t1501\n" + "ProcessComponents\t\t1600\n" + "TestSourceDirProp26\tnot SourceDir and not SOURCEDIR and not Installed\t1601\n" + "UnpublishFeatures\t\t1800\n" + "TestSourceDirProp27\tnot SourceDir and not SOURCEDIR and not Installed\t1801\n" + "RemoveFiles\t\t3500\n" + "TestSourceDirProp28\tnot SourceDir and not SOURCEDIR and not Installed\t3501\n" + "InstallFiles\t\t4000\n" + "TestSourceDirProp29\tnot SourceDir and not SOURCEDIR and not Installed\t4001\n" + "RegisterUser\t\t6000\n" + "TestSourceDirProp30\tnot SourceDir and not SOURCEDIR and not Installed\t6001\n" + "RegisterProduct\t\t6100\n" + "TestSourceDirProp31\tnot SourceDir and not SOURCEDIR and not Installed\t6101\n" + "PublishFeatures\t\t6300\n" + "TestSourceDirProp32\tnot SourceDir and not SOURCEDIR and not Installed\t6301\n" + "PublishProduct\t\t6400\n" + "TestSourceDirProp33\tnot SourceDir and not SOURCEDIR and not Installed\t6401\n" + "InstallExecute\t\t6500\n" + "TestSourceDirProp34\tnot SourceDir and not SOURCEDIR and not Installed\t6501\n" + "InstallFinalize\t\t6600\n" + "TestSourceDirProp35\tnot SourceDir and not SOURCEDIR and not Installed\t6601\n"; + +static const char sd_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestSourceDirProp1\t19\t\tTest 1 failed\t\n" + "TestSourceDirProp2\t19\t\tTest 2 failed\t\n" + "TestSourceDirProp3\t19\t\tTest 3 failed\t\n" + "TestSourceDirProp4\t19\t\tTest 4 failed\t\n" + "TestSourceDirProp5\t19\t\tTest 5 failed\t\n" + "TestSourceDirProp6\t19\t\tTest 6 failed\t\n" + "TestSourceDirProp7\t19\t\tTest 7 failed\t\n" + "TestSourceDirProp8\t19\t\tTest 8 failed\t\n" + "TestSourceDirProp9\t19\t\tTest 9 failed\t\n" + "TestSourceDirProp10\t19\t\tTest 10 failed\t\n" + "TestSourceDirProp11\t19\t\tTest 11 failed\t\n" + "TestSourceDirProp12\t19\t\tTest 12 failed\t\n" + "TestSourceDirProp13\t19\t\tTest 13 failed\t\n" + "TestSourceDirProp14\t19\t\tTest 14 failed\t\n" + "TestSourceDirProp15\t19\t\tTest 15 failed\t\n" + "TestSourceDirProp16\t19\t\tTest 16 failed\t\n" + "TestSourceDirProp17\t19\t\tTest 17 failed\t\n" + "TestSourceDirProp18\t19\t\tTest 18 failed\t\n" + "TestSourceDirProp19\t19\t\tTest 19 failed\t\n" + "TestSourceDirProp20\t19\t\tTest 20 failed\t\n" + "TestSourceDirProp21\t19\t\tTest 21 failed\t\n" + "TestSourceDirProp22\t19\t\tTest 22 failed\t\n" + "TestSourceDirProp23\t19\t\tTest 23 failed\t\n" + "TestSourceDirProp24\t19\t\tTest 24 failed\t\n" + "TestSourceDirProp25\t19\t\tTest 25 failed\t\n" + "TestSourceDirProp26\t19\t\tTest 26 failed\t\n" + "TestSourceDirProp27\t19\t\tTest 27 failed\t\n" + "TestSourceDirProp28\t19\t\tTest 28 failed\t\n" + "TestSourceDirProp29\t19\t\tTest 29 failed\t\n" + "TestSourceDirProp30\t19\t\tTest 30 failed\t\n" + "TestSourceDirProp31\t19\t\tTest 31 failed\t\n" + "TestSourceDirProp32\t19\t\tTest 32 failed\t\n" + "TestSourceDirProp33\t19\t\tTest 33 failed\t\n" + "TestSourceDirProp34\t19\t\tTest 34 failed\t\n" + "TestSourceDirProp35\t19\t\tTest 35 failed\t\n"; + +static const char ci_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "InstallFiles\t\t4000\n" + "InstallServices\t\t5000\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "RunInstall\t\t1600\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100"; + +static const char ci_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; + +static const char ci_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}\tMSITESTDIR\t0\tUILevel=5\tmaximus\n"; + +static const char ci2_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "augustus\t\tMSITESTDIR\t0\tUILevel=3 AND MYPROP=5\taugustus\n"; + +static const char ci2_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\taugustus"; + +static const char ci2_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "augustus\taugustus\taugustus\t500\t\t\t8192\t1"; + +static const char cl_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestCommandlineProp\t19\t\tTest1\t\n"; + +static const char cl_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "ValidateProductID\t\t700\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "TestCommandlineProp\tP=\"one\"\t1100\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "InstallValidate\t\t1400\n" + "InstallFinalize\t\t5000\n"; typedef struct _msi_table { @@ -309,6 +884,108 @@ ADD_TABLE(mcp_feature_comp), ADD_TABLE(mcp_file), ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + +static const msi_table lus0_tables[] = +{ + ADD_TABLE(lus_component), + ADD_TABLE(directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(lus_install_exec_seq), + ADD_TABLE(lus0_media), + ADD_TABLE(property) +}; + +static const msi_table lus1_tables[] = +{ + ADD_TABLE(lus_component), + ADD_TABLE(directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(lus_install_exec_seq), + ADD_TABLE(lus1_media), + ADD_TABLE(property) +}; + +static const msi_table lus2_tables[] = +{ + ADD_TABLE(lus_component), + ADD_TABLE(directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(lus_install_exec_seq), + ADD_TABLE(lus2_media), + ADD_TABLE(property) +}; + +static const msi_table spf_tables[] = +{ + ADD_TABLE(lus_component), + ADD_TABLE(directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(lus0_media), + ADD_TABLE(property), + ADD_TABLE(spf_custom_action), + ADD_TABLE(spf_install_exec_seq), + ADD_TABLE(spf_install_ui_seq) +}; + +static const msi_table sd_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(sd_component), + ADD_TABLE(sd_feature), + ADD_TABLE(sd_feature_comp), + ADD_TABLE(sd_file), + ADD_TABLE(sd_install_exec_seq), + ADD_TABLE(sd_install_ui_seq), + ADD_TABLE(sd_custom_action), + ADD_TABLE(media), + ADD_TABLE(property) +}; + +static const msi_table ci_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(lus_feature), + ADD_TABLE(lus_feature_comp), + ADD_TABLE(lus_file), + ADD_TABLE(ci_install_exec_seq), + ADD_TABLE(lus0_media), + ADD_TABLE(property), + ADD_TABLE(ci_custom_action), +}; + +static const msi_table ci2_tables[] = +{ + ADD_TABLE(ci2_component), + ADD_TABLE(directory), + ADD_TABLE(lus_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(lus0_media), + ADD_TABLE(property), +}; + +static const msi_table cl_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(cl_custom_action), + ADD_TABLE(cl_install_exec_seq), ADD_TABLE(media), ADD_TABLE(property) }; @@ -709,6 +1386,40 @@ } CloseHandle(file); +} + +static void create_test_files(void) +{ + CreateDirectoryA("msitest", NULL); + create_file("msitest\\one.txt", "msitest\\one.txt", 100); + CreateDirectoryA("msitest\\first", NULL); + create_file("msitest\\first\\two.txt", "msitest\\first\\two.txt", 100); + CreateDirectoryA("msitest\\second", NULL); + create_file("msitest\\second\\three.txt", "msitest\\second\\three.txt", 100); + + create_file("four.txt", "four.txt", 100); + create_file("five.txt", "five.txt", 100); + create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); + + create_file("msitest\\filename", "msitest\\filename", 100); + create_file("msitest\\service.exe", "msitest\\service.exe", 100); + + DeleteFileA("four.txt"); + DeleteFileA("five.txt"); +} + +static void delete_test_files(void) +{ + DeleteFileA("msitest.msi"); + DeleteFileA("msitest.cab"); + DeleteFileA("msitest\\second\\three.txt"); + DeleteFileA("msitest\\first\\two.txt"); + DeleteFileA("msitest\\one.txt"); + DeleteFileA("msitest\\service.exe"); + DeleteFileA("msitest\\filename"); + RemoveDirectoryA("msitest\\second"); + RemoveDirectoryA("msitest\\first"); + RemoveDirectoryA("msitest"); } #define HASHSIZE sizeof(MSIFILEHASHINFO) @@ -3299,8 +4010,15 @@ lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, version, &versz, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (langchecksz && !langsz) + { + win_skip("broken MsiGetFileVersionA detected\n"); + HeapFree(GetProcessHeap(), 0, vercheck); + HeapFree(GetProcessHeap(), 0, langcheck); + return; + } ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); + ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang); ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); @@ -3318,7 +4036,7 @@ lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); + ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang); /* check neither version nor language */ r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); @@ -3342,7 +4060,7 @@ r = MsiGetFileVersionA(path, version, &versz, NULL, NULL); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(version, vercheck, 4), - "Expected first 4 characters of %s, got %s\n", vercheck, version); + "Expected first 4 characters of \"%s\", got \"%s\"\n", vercheck, version); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); /* pcchLangBuf not big enough */ @@ -3351,7 +4069,7 @@ r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(lang, langcheck, 2), - "Expected first character of %s, got %s\n", langcheck, lang); + "Expected first character of \"%s\", got \"%s\"\n", langcheck, lang); ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf big enough, pcchLangBuf not big enough */ @@ -3361,7 +4079,7 @@ r = MsiGetFileVersionA(path, version, &versz, NULL, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); + ok(!lstrcmpA(version, vercheck), "Expected \"%s\", got \"%s\"\n", vercheck, version); ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf not big enough, pcchLangBuf big enough */ @@ -8044,6 +8762,8 @@ UINT r; REGSAM access = KEY_ALL_ACCESS; + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + GetCurrentDirectoryA(MAX_PATH, path); lstrcatA(path, "\\"); @@ -8321,21 +9041,6 @@ (const BYTE *)"winetest.msi", 13); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - /* LocalPackage has just the package name */ - hprod = 0xdeadbeef; - r = MsiOpenProductA(prodcode, &hprod); - if (r == ERROR_INSTALL_PACKAGE_REJECTED) - { - skip("Not enough rights to perform tests\n"); - goto error; - } - ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS, - "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r); - if (r == ERROR_SUCCESS) - MsiCloseHandle(hprod); - else - ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n"); - lstrcpyA(val, path); lstrcatA(val, "\\winetest.msi"); res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, @@ -8351,7 +9056,6 @@ "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n"); -error: RegDeleteValueA(props, "LocalPackage"); delete_key(props, "", access & KEY_WOW64_64KEY); RegCloseKey(props); @@ -13039,6 +13743,451 @@ ok(!error, "MsiSetExternalUIRecord failed %u\n", error); } +static void test_lastusedsource(void) +{ + static char prodcode[] = "{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}"; + char value[MAX_PATH], path[MAX_PATH]; + DWORD size; + UINT r; + + if (!pMsiSourceListGetInfoA) + { + win_skip("MsiSourceListGetInfoA is not available\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("maximus", "maximus", 500); + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + DeleteFile("maximus"); + + create_database("msifile0.msi", lus0_tables, sizeof(lus0_tables) / sizeof(msi_table)); + create_database("msifile1.msi", lus1_tables, sizeof(lus1_tables) / sizeof(msi_table)); + create_database("msifile2.msi", lus2_tables, sizeof(lus2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + /* no cabinet file */ + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value); + + r = MsiInstallProductA("msifile0.msi", "PUBLISH_PRODUCT=1"); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size); + + r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + /* separate cabinet file */ + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value); + + r = MsiInstallProductA("msifile1.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\"); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size); + + r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value); + + /* embedded cabinet stream */ + + add_cabinet_storage("msifile2.msi", "test1.cab"); + + r = MsiInstallProductA("msifile2.msi", "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + ok(!lstrcmpA(value, path), "expected \"%s\", got \"%s\"\n", path, value); + ok(size == lstrlenA(path), "expected %d, got %d\n", lstrlenA(path), size); + + r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + + size = MAX_PATH; + lstrcpyA(value, "aaa"); + r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); + ok(r == ERROR_UNKNOWN_PRODUCT, "expected ERROR_UNKNOWN_PRODUCT, got %u\n", r); + ok(!lstrcmpA(value, "aaa"), "expected \"aaa\", got \"%s\"\n", value); + +error: + delete_cab_files(); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); + DeleteFile("msifile0.msi"); + DeleteFile("msifile1.msi"); + DeleteFile("msifile2.msi"); +} + +static void test_setpropertyfolder(void) +{ + UINT r; + CHAR path[MAX_PATH]; + DWORD attr; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\msitest\\added"); + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", "msitest\\maximus", 500); + + create_database(msifile, spf_tables, sizeof(spf_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + attr = GetFileAttributesA(path); + if (attr != INVALID_FILE_ATTRIBUTES && (attr & FILE_ATTRIBUTE_DIRECTORY)) + { + ok(delete_pf("msitest\\added\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\added", FALSE), "Directory not created\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } + else + { + trace("changing folder property not supported\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } + +error: + DeleteFile(msifile); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); +} + +static void test_sourcedir_props(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + /* full UI, no ResolveSource action */ + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + /* full UI, ResolveSource action */ + r = MsiInstallProductA(msifile, "ResolveSource=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + /* no UI, no ResolveSource action */ + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + /* no UI, ResolveSource action */ + r = MsiInstallProductA(msifile, "ResolveSource=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\sourcedir.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + + DeleteFileA("msitest\\sourcedir.txt"); + delete_test_files(); + DeleteFile(msifile); +} + +static void test_concurrentinstall(void) +{ + UINT r; + CHAR path[MAX_PATH]; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + CreateDirectoryA("msitest\\msitest", NULL); + create_file("msitest\\maximus", "msitest\\maximus", 500); + create_file("msitest\\msitest\\augustus", "msitest\\msitest\\augustus", 500); + + create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); + + lstrcpyA(path, CURR_DIR); + lstrcatA(path, "\\msitest\\concurrent.msi"); + create_database(path, ci2_tables, sizeof(ci2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFile(path); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + if (!delete_pf("msitest\\augustus", TRUE)) + trace("concurrent installs not supported\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + + r = MsiConfigureProductA("{38847338-1BBC-4104-81AC-2FAAC7ECDDCD}", INSTALLLEVEL_DEFAULT, + INSTALLSTATE_ABSENT); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + DeleteFile(path); + +error: + DeleteFile(msifile); + DeleteFile("msitest\\msitest\\augustus"); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest\\msitest"); + RemoveDirectory("msitest"); +} + +static void test_command_line_parsing(void) +{ + UINT r; + const char *cmd; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database(msifile, cl_tables, sizeof(cl_tables)/sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + cmd = " "; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "="; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "=="; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "one"; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "=one"; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P="; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = " P="; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P= "; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P=\"\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"\"\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P=\"\"\"\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\" "; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P= \""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P= \"\" "; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\" \""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=one"; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + cmd = "P= one"; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + cmd = "P=\"one"; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P=one\""; + r = MsiInstallProductA(msifile, cmd); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"one\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + cmd = "P= \"one\" "; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + cmd = "P=\"one\"\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P=\"\"one\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P=\"\"one\"\""; + r = MsiInstallProductA(msifile, cmd); + todo_wine ok(r == ERROR_INVALID_COMMAND_LINE, "Expected ERROR_INVALID_COMMAND_LINE, got %u\n", r); + + cmd = "P=\"one two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"\"\"one\"\" two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"\"\"one\"\" two\" Q=three"; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"\" Q=\"two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"one\" Q=\"two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + cmd = "P=\"one=two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "Q=\"\" P=\"one\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + + cmd = "P=\"\"\"one\"\"\" Q=\"two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"one \"\"two\"\"\" Q=\"three\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"\"\"one\"\" two\" Q=\"three\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + DeleteFile(msifile); + delete_test_files(); +} + START_TEST(msi) { DWORD len; @@ -13096,6 +14245,11 @@ test_MsiSetFeatureAttributes(); test_MsiGetFeatureInfo(); test_MsiSetExternalUI(); + test_lastusedsource(); + test_setpropertyfolder(); + test_sourcedir_props(); + test_concurrentinstall(); + test_command_line_parsing(); SetCurrentDirectoryA(prev_path); } Modified: trunk/rostests/winetests/msi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/testlist.c?… ============================================================================== --- trunk/rostests/winetests/msi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/testlist.c [iso-8859-1] Sun Sep 22 16:30:59 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_action(void); extern void func_automation(void);

1 0

[akhaldi] 60307: [MSI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:30:18 2013 New Revision: 60307 URL: http://svn.reactos.org/svn/reactos?rev=60307&view=rev Log: [MSI] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/win32/msi/events.c Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/cond.y trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi_main.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/patch.c trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/script.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/table.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r… Modified: trunk/reactos/dll/win32/msi/cond.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.y?rev=6… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Removed: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… Modified: trunk/reactos/dll/win32/msi/query.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=… Modified: trunk/reactos/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev… 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… 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… Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=60… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
56
Older →

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 September 2013