Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[akhaldi] 67214: [WER] Zap this module. I don't see it in my XP and 2K3 systems. It wasn't even part of the build process. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 16 15:05:34 2015 New Revision: 67214 URL: http://svn.reactos.org/svn/reactos?rev=67214&view=rev Log: [WER] Zap this module. I don't see it in my XP and 2K3 systems. It wasn't even part of the build process. CORE-9246 Removed: trunk/reactos/dll/win32/wer/

9 years, 5 months

[tfaber] 67213: [USER32_APITEST] - Add a test for CreateDialog. Patch by Andreas Maier. ROSTESTS-163 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Apr 16 11:35:23 2015 New Revision: 67213 URL: http://svn.reactos.org/svn/reactos?rev=67213&view=rev Log: [USER32_APITEST] - Add a test for CreateDialog. Patch by Andreas Maier. ROSTESTS-163 #resolve Added: trunk/rostests/apitests/user32/CreateDialog.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c trunk/rostests/apitests/user32/user32_apitest.rc Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Thu Apr 16 11:35:23 2015 @@ -2,6 +2,7 @@ list(APPEND SOURCE AttachThreadInput.c helper.c + CreateDialog.c CreateIconFromResourceEx.c DeferWindowPos.c DestroyCursorIcon.c Added: trunk/rostests/apitests/user32/CreateDialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateDia… ============================================================================== --- trunk/rostests/apitests/user32/CreateDialog.c (added) +++ trunk/rostests/apitests/user32/CreateDialog.c [iso-8859-1] Thu Apr 16 11:35:23 2015 @@ -0,0 +1,205 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for CreateDialog + * PROGRAMMERS: Andreas Maier + */ + +#include <stdarg.h> +#include <stdio.h> +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#define TEST_MAX_MSG 50 + +// cmpflag +#define MSGLST_CMP_WP 0x1 +#define MSGLST_CMP_LP 0x2 +#define MSGLST_CMP_RES 0x4 +#define MSGLST_CMP_ALL (MSGLST_CMP_WP | MSGLST_CMP_LP | MSGLST_CMP_RES) + +typedef struct +{ + BOOL DlgProc; // true = DlgProg, false WndProc + UINT msg; + WPARAM wParam; + LPARAM lParam; + int result; + int cmpflag; +} tagMsgInfo; + +typedef struct +{ + int msgCount; + tagMsgInfo msgList[TEST_MAX_MSG]; +} tagMsgList; + +tagMsgList msglist; + +/* the expected message-list */ +const tagMsgList t1msgList = +{ + 9, + { + // DlgProc, msg, wParam, lParam, result, cmpflag + { FALSE, WM_NCCREATE, 0, 0, 1, MSGLST_CMP_WP | MSGLST_CMP_RES }, + { FALSE, WM_NCCALCSIZE, 0, 0, 0, MSGLST_CMP_WP | MSGLST_CMP_RES }, + { FALSE, WM_CREATE, 0, 0, 0, MSGLST_CMP_WP | MSGLST_CMP_RES }, + { FALSE, WM_SIZE, 0, 0x145012c, 0, MSGLST_CMP_ALL }, // FIXME: size is 400x400 on Win7? + { FALSE, WM_MOVE, 0, 0x0160003, 0, MSGLST_CMP_ALL }, + { TRUE, WM_SETFONT, 0, 0, 0, MSGLST_CMP_LP | MSGLST_CMP_RES }, + { FALSE, WM_SETFONT, 0, 0, 0, MSGLST_CMP_LP | MSGLST_CMP_RES }, + { TRUE, WM_INITDIALOG, 0, 0, 0, MSGLST_CMP_LP | MSGLST_CMP_RES }, + { FALSE, WM_INITDIALOG, 0, 0, 0, MSGLST_CMP_LP | MSGLST_CMP_RES }, + } +}; + +void DumpMsgList(const char* lstName, const tagMsgList *ml) +{ + const char *dlgProcName; + int i1; + + printf("%s\n", lstName); + for (i1 = 0; i1 < ml->msgCount; i1++) + { + dlgProcName = (ml->msgList[i1].DlgProc) ? "DlgProc" : "WndProc"; + printf("#%.3d %s, msg 0x%x, wParam 0x%x, lParam 0x%Ix, result %d\n", + i1, + dlgProcName, + ml->msgList[i1].msg, + ml->msgList[i1].wParam, + ml->msgList[i1].lParam, + ml->msgList[i1].result); + } +} + +BOOL CmpMsgList(const tagMsgList *recvd, + const tagMsgList *expect) +{ + int i1; + BOOL isOk; + + isOk = TRUE; + if (recvd->msgCount != expect->msgCount) + { + ok(FALSE, "%d messages expected, %d messages received!\n", + expect->msgCount, recvd->msgCount); + isOk = FALSE; + } + else + { + for (i1 = 0; i1 < recvd->msgCount; i1++) + { + if (expect->msgList[i1].DlgProc != recvd->msgList[i1].DlgProc) + isOk = FALSE; + if (expect->msgList[i1].msg != recvd->msgList[i1].msg) + isOk = FALSE; + if ((expect->msgList[i1].cmpflag & MSGLST_CMP_WP) && + (expect->msgList[i1].wParam != recvd->msgList[i1].wParam)) + isOk = FALSE; + if ((expect->msgList[i1].cmpflag & MSGLST_CMP_LP) && + (expect->msgList[i1].lParam != recvd->msgList[i1].lParam)) + isOk = FALSE; + if ((expect->msgList[i1].cmpflag & MSGLST_CMP_RES) && + (expect->msgList[i1].result != recvd->msgList[i1].result)) + isOk = FALSE; + if (!isOk) + { + ok(FALSE, "Message #%.3d not equal\n", i1); + break; + } + } + } + + if (!isOk) + { + DumpMsgList("RECEIVED", recvd); + DumpMsgList("EXPECTED", expect); + return FALSE; + } + + ok(TRUE, "\n"); + return TRUE; +} + +INT_PTR CALLBACK Test_CreateDialogW_DLGPROC(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msglist.msgCount < TEST_MAX_MSG) + { + msglist.msgList[msglist.msgCount].DlgProc = TRUE; + msglist.msgList[msglist.msgCount].msg = msg; + msglist.msgList[msglist.msgCount].wParam = wParam; + msglist.msgList[msglist.msgCount].lParam = lParam; + msglist.msgList[msglist.msgCount].result = 0; + msglist.msgCount++; + } + trace("DlgProc: msg 0x%x, wParam 0x%x, lParam 0x%Ix\n", + msg, wParam, lParam); + return FALSE; +} + +LRESULT CALLBACK Test_CreateDialogW_WNDPROC(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + LRESULT res; + res = DefDlgProcW(hWnd, msg, wParam, lParam); + + if (msglist.msgCount < TEST_MAX_MSG) + { + msglist.msgList[msglist.msgCount].DlgProc = FALSE; + msglist.msgList[msglist.msgCount].msg = msg; + msglist.msgList[msglist.msgCount].wParam = wParam; + msglist.msgList[msglist.msgCount].lParam = lParam; + msglist.msgList[msglist.msgCount].result = res; + msglist.msgCount++; + } + trace("WndProc: msg 0x%x, wParam 0x%x, lParam 0x%Ix, result %Id\n", + msg, wParam, lParam, res); + return res; +} + +void Test_CreateDialogW() +{ + HWND hWnd; + HMODULE hMod; + DWORD exstyle; + WNDCLASSW wc; + + hMod = GetModuleHandle(NULL); + ok(hMod != NULL, "\n"); + + msglist.msgCount = 0; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = Test_CreateDialogW_WNDPROC; + wc.cbClsExtra = 0; + wc.cbWndExtra = DLGWINDOWEXTRA; + wc.hInstance = hMod; + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = L"TestDialogClass"; + + if (!RegisterClassW(&wc)) + { + ok(FALSE, "Error registering Window-Class\n"); + return; + } + hWnd = CreateDialogW(hMod, L"TESTDIALOG", 0, Test_CreateDialogW_DLGPROC); + ok(hWnd != NULL, "Error: %lu\n", GetLastError()); + if (hWnd != NULL) + { + /* Check the exstyle */ + exstyle = GetWindowLongW(hWnd, GWL_EXSTYLE); + ok(exstyle != 0x50010, "ExStyle wrong, got %#08lX, expected 0x50010.\n", exstyle); + /* Check the messages we received during creation */ + CmpMsgList(&msglist, &t1msgList); + } +} + +START_TEST(CreateDialog) +{ + //Test_CreateDialogA();//TODO + Test_CreateDialogW(); +} Propchange: trunk/rostests/apitests/user32/CreateDialog.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Thu Apr 16 11:35:23 2015 @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_AttachThreadInput(void); +extern void func_CreateDialog(void); extern void func_CreateIconFromResourceEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); @@ -34,6 +35,7 @@ const struct test winetest_testlist[] = { { "AttachThreadInput", func_AttachThreadInput }, + { "CreateDialog", func_CreateDialog }, { "CreateIconFromResourceEx", func_CreateIconFromResourceEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, Modified: trunk/rostests/apitests/user32/user32_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] Thu Apr 16 11:35:23 2015 @@ -5,3 +5,11 @@ IDI_TEST ICON "test.ico" TESTCURSOR CURSOR "test.cur" + +TESTDIALOG DIALOG 0,0, 200,200 +CLASS "TestDialogClass" +CAPTION "Testdialog" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "a button", 1, 5,5, 100,20 +}

9 years, 5 months

[akhaldi] 67212: [GDIPLUS_WINETEST] Addendum to r58377. gdiplus:image doesn't crash anymore. CORE-6969

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 16 10:53:37 2015 New Revision: 67212 URL: http://svn.reactos.org/svn/reactos?rev=67212&view=rev Log: [GDIPLUS_WINETEST] Addendum to r58377. gdiplus:image doesn't crash anymore. CORE-6969 Modified: trunk/rostests/winetests/gdiplus/image.c Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Thu Apr 16 10:53:37 2015 @@ -1504,7 +1504,6 @@ stat = GdipCreateMetafileFromWmf(hwmf, TRUE, (WmfPlaceableFileHeader*)wmfimage, (GpMetafile**)&img); expect(Ok, stat); - if (stat != Ok) return; // ReactOS stat = GdipGetImageBounds(img, &bounds, &unit); expect(Ok, stat);

9 years, 5 months

[hbelusca] 67211: [CD_EXTRAS]: Add the possibility to have different "extras" files for the different CD targets (in addition to the hybridcd) we have (useful for testers, for ReactOS shows, etc......

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Apr 15 21:29:53 2015 New Revision: 67211 URL: http://svn.reactos.org/svn/reactos?rev=67211&view=rev Log: [CD_EXTRAS]: Add the possibility to have different "extras" files for the different CD targets (in addition to the hybridcd) we have (useful for testers, for ReactOS shows, etc...). By Mark Jansen. CORE-9527 #resolve #comment Added, thanks! Modified: trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Wed Apr 15 21:29:53 2015 @@ -11,8 +11,20 @@ add_subdirectory(wallpapers) endif() -## Extra files for Hybrid CD. You need to put them under hybridcd_extras +## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras ## in the same layout as you want them to be in the CD. +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/) + file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/*) + foreach(item ${EXTRA_FILES}) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/${item} DESTINATION extras NAME_ON_CD ${item} FOR bootcd regtest) + endforeach(item) +endif() +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/) + file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/*) + foreach(item ${EXTRA_FILES}) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd_extras/${item} DESTINATION extras NAME_ON_CD ${item} FOR livecd) + endforeach(item) +endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/*) foreach(item ${EXTRA_FILES})

9 years, 5 months

[ekohl] 67210: [SRVSVC] Implement NetrRemoteTOD. CORE-5423 #resolve #comment Committed in r67210.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Apr 15 21:04:43 2015 New Revision: 67210 URL: http://svn.reactos.org/svn/reactos?rev=67210&view=rev Log: [SRVSVC] Implement NetrRemoteTOD. CORE-5423 #resolve #comment Committed in r67210. Modified: trunk/reactos/base/services/srvsvc/rpcserver.c Modified: trunk/reactos/base/services/srvsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/rpcse… ============================================================================== --- trunk/reactos/base/services/srvsvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/srvsvc/rpcserver.c [iso-8859-1] Wed Apr 15 21:04:43 2015 @@ -28,6 +28,8 @@ #include "precomp.h" +#include "ndk/kefuncs.h" +#include "ndk/rtlfuncs.h" #include "winerror.h" #include "lmerr.h" @@ -446,8 +448,64 @@ SRVSVC_HANDLE ServerName, LPTIME_OF_DAY_INFO *BufferPtr) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + SYSTEMTIME SystemTime; + LARGE_INTEGER Time; + TIME_ZONE_INFORMATION TimeZoneInfo; + DWORD TimeZoneId; + LPTIME_OF_DAY_INFO lpTod; + + TRACE("NetrRemoteTOD(%p %p)\n", ServerName, BufferPtr); + + *BufferPtr = midl_user_allocate(sizeof(TIME_OF_DAY_INFO)); + if (*BufferPtr == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + lpTod = *BufferPtr; + + /* Set the seconds since 1970 */ + NtQuerySystemTime(&Time); + RtlTimeToSecondsSince1970(&Time, + &lpTod->tod_elapsedt); + + /* Set the tick count */ + lpTod->tod_msecs = GetTickCount(); + + /* Set the timezone */ + TimeZoneId = GetTimeZoneInformation(&TimeZoneInfo); + + switch (TimeZoneId) + { + case TIME_ZONE_ID_UNKNOWN: + lpTod->tod_timezone = TimeZoneInfo.Bias; + break; + + case TIME_ZONE_ID_STANDARD: + lpTod->tod_timezone = TimeZoneInfo.Bias + TimeZoneInfo.StandardBias; + break; + + case TIME_ZONE_ID_DAYLIGHT: + lpTod->tod_timezone = TimeZoneInfo.Bias + TimeZoneInfo.DaylightBias; + break; + + default: + lpTod->tod_timezone = 0; + } + + /* Set the ??? */ + lpTod->tod_tinterval = 310; + + /* Set the date and time */ + GetSystemTime(&SystemTime); + lpTod->tod_hours = SystemTime.wHour; + lpTod->tod_mins = SystemTime.wMinute; + lpTod->tod_secs = SystemTime.wSecond; + lpTod->tod_hunds = SystemTime.wMilliseconds / 10; + lpTod->tod_day = SystemTime.wDay; + lpTod->tod_month = SystemTime.wMonth; + lpTod->tod_year = SystemTime.wYear; + lpTod->tod_weekday = SystemTime.wDayOfWeek; + + return NERR_Success; }

9 years, 5 months

[akhaldi] 67209: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:12:48 2015 New Revision: 67209 URL: http://svn.reactos.org/svn/reactos?rev=67209&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Wed Apr 15 18:12:48 2015 @@ -763,7 +763,7 @@ ok(!lstrcmpW(name_val[i].val, val), "expected %s, got %s\n", wine_dbgstr_w(name_val[i].val), wine_dbgstr_w(val)); hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == (i < count - 1) ? S_OK : S_FALSE, "got %08x\n", hr); + ok(hr == ((i < count - 1) ? S_OK : S_FALSE), "got %08x\n", hr); } hr = IXmlReader_GetDepth(reader, &count);

9 years, 5 months

[akhaldi] 67208: [QMGR_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:12:24 2015 New Revision: 67208 URL: http://svn.reactos.org/svn/reactos?rev=67208&view=rev Log: [QMGR_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/qmgr/file.c Modified: trunk/rostests/winetests/qmgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/file.c?rev… ============================================================================== --- trunk/rostests/winetests/qmgr/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/file.c [iso-8859-1] Wed Apr 15 18:12:24 2015 @@ -38,12 +38,10 @@ #include <bits.h> /* Globals used by many tests */ -#define NUM_FILES 1 static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH]; static WCHAR test_remoteUrl[MAX_PATH]; -static const ULONG test_fileCount = NUM_FILES; static const WCHAR test_displayName[] = {'T','e','s','t', 0}; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager;

9 years, 5 months

[akhaldi] 67207: [PROPSYS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:10:59 2015 New Revision: 67207 URL: http://svn.reactos.org/svn/reactos?rev=67207&view=rev Log: [PROPSYS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/propsys/propsys.c Modified: trunk/rostests/winetests/propsys/propsys.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/propsys… ============================================================================== --- trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] Wed Apr 15 18:10:59 2015 @@ -117,19 +117,19 @@ {NULL, NULL, 0, E_POINTER}, {&prop, NULL, 0, E_POINTER}, {&prop, NULL, PKEYSTR_MAX, E_POINTER}, - {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW}, - {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, - {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, - {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, + {NULL, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {NULL, out, PKEYSTR_MAX, E_NOT_SUFFICIENT_BUFFER, zero_fillerW, FALSE, 0, TRUE, fillerW}, + {&prop, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, + {&prop, out, PKEYSTR_MAX - 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, + {&prop, out, PKEYSTR_MAX - 1, E_NOT_SUFFICIENT_BUFFER, zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, {&prop, out, PKEYSTR_MAX, S_OK, expectedW}, - {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, + {&prop2, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W}, {&prop2, out, PKEYSTR_MAX, S_OK, expected2W}, - {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, + {&prop3, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW}, {&prop3, out, GUIDSTRING_MAX + 2, S_OK, expected3W}, {&prop3, out, PKEYSTR_MAX, S_OK, expected3W}, };

9 years, 5 months

[akhaldi] 67206: [PROPSYS] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:10:40 2015 New Revision: 67206 URL: http://svn.reactos.org/svn/reactos?rev=67206&view=rev Log: [PROPSYS] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/propsys/propsys_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/propsys/propsys_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] Wed Apr 15 18:10:40 2015 @@ -280,12 +280,12 @@ /* GUIDSTRING_MAX accounts for null terminator, +1 for space character. */ if (cch <= GUIDSTRING_MAX + 1) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (!pkey) { psz[0] = '\0'; - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, @@ -323,7 +323,7 @@ *p++ = *ptr--; } - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } } 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] Wed Apr 15 18:10:40 2015 @@ -157,7 +157,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.7.27 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.27 -reactos/dll/win32/propsys # Synced to Wine-1.7.27 +reactos/dll/win32/propsys # Synced to WineStaging-1.7.37 reactos/dll/win32/pstorec # Synced to Wine-1.7.27 reactos/dll/win32/qmgr # Synced to Wine-1.7.27 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 67205: [OLEAUT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:10:02 2015 New Revision: 67205 URL: http://svn.reactos.org/svn/reactos?rev=67205&view=rev Log: [OLEAUT32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Wed Apr 15 18:10:02 2015 @@ -5600,7 +5600,7 @@ ok(hr == S_OK, "got: %x\n", hr); hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); - todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); + ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); ITypeInfo_Release(ptInfo); if(ptInfoExt) Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Wed Apr 15 18:10:02 2015 @@ -299,16 +299,14 @@ HRESULT res; res = VarBstrFromBool(VARIANT_TRUE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); - ok(res == S_OK && (lstrlenW(bstr) > 0), - "Expected localized string for 'True'\n"); + ok(res == S_OK && bstr[0], "Expected localized string for 'True'\n"); /* lstrcpyW / lstrcatW do not work on win95 */ memcpy(sz12_true, sz12, sizeof(sz12)); if (bstr) memcpy(&sz12_true[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); res = VarBstrFromBool(VARIANT_FALSE, LANG_USER_DEFAULT, VAR_LOCALBOOL, &bstr); - ok(res == S_OK && (lstrlenW(bstr) > 0), - "Expected localized string for 'False'\n"); + ok(res == S_OK && bstr[0], "Expected localized string for 'False'\n"); memcpy(sz12_false, sz12, sizeof(sz12)); if (bstr) memcpy(&sz12_false[2], bstr, SysStringByteLen(bstr) + sizeof(WCHAR)); SysFreeString(bstr); @@ -335,12 +333,6 @@ dec->Hi32 = hi32; S1(U1(*dec)).Mid32 = mid32; S1(U1(*dec)).Lo32 = lo32; -} - -static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; } /* return the string text of a given variant type */ @@ -1395,11 +1387,11 @@ /* VB oct char bigger than 7 */ CONVERT("&o128", NUMPRS_HEX_OCT); -/* - Native versions 2.x of oleaut32 allow this to succeed: later versions and Wine don't - EXPECTFAIL; - EXPECTRGB(0,FAILDIG); -*/ + EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); + EXPECTRGB(0,1); + EXPECTRGB(1,2); + EXPECTRGB(3,FAILDIG); + /** NUMPRS_PARENS **/ /* Empty parens = error */ @@ -6063,7 +6055,6 @@ else if (leftvt == VT_I4 || rightvt == VT_I4 || leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_INT || rightvt == VT_INT || - leftvt == VT_UINT || rightvt == VT_UINT || leftvt == VT_R4 || rightvt == VT_R4 || leftvt == VT_R8 || rightvt == VT_R8 || leftvt == VT_CY || rightvt == VT_CY || @@ -7407,10 +7398,10 @@ hres = pVarPow(&cy, &right, &result); if (hres == S_OK) { - ok(hres == S_OK && V_VT(&result) == VT_R8, + ok(V_VT(&result) == VT_R8, "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + ok(EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); } else @@ -7444,10 +7435,10 @@ hres = pVarPow(&dec, &right, &result); if (hres == S_OK) { - ok(hres == S_OK && V_VT(&result) == VT_R8, + ok(V_VT(&result) == VT_R8, "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + ok(EQ_DOUBLE(V_R8(&result), 4.0), "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); } else Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Wed Apr 15 18:10:02 2015 @@ -6463,7 +6463,7 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(testcopy.bstr == NULL, "got %p\n", testcopy.bstr); - /* now destination contains inteface pointer */ + /* now the destination contains the interface pointer */ memset(&testcopy, 0, sizeof(testcopy)); testcopy.disp = &dispatch.IDispatch_iface; dispatch.ref = 10;

9 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015