Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60169: [FUSION] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:15:20 2013 New Revision: 60169 URL: http://svn.reactos.org/svn/reactos?rev=60169&view=rev Log: [FUSION] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:15:20 2013 @@ -10,13 +10,12 @@ asmname.c assembly.c fusion.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) -add_library(fusion SHARED ${SOURCE}) +add_library(fusion SHARED ${SOURCE} version.rc) set_module_type(fusion win32dll) -target_link_libraries(fusion wine uuid) +target_link_libraries(fusion wine) add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Mon Sep 16 15:15:20 2013 @@ -599,8 +599,7 @@ else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = assembly_data_offset(assembly, ofs); - ptr += lstrlenA(stream) + 1; - ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ + ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */ } return S_OK; 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] Mon Sep 16 15:15:20 2013 @@ -72,7 +72,7 @@ reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 reactos/dll/win32/faultrep # Synced to Wine-1.7.1 -reactos/dll/win32/fusion # Synced to Wine-1.5.26 +reactos/dll/win32/fusion # Synced to Wine-1.7.1 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26 reactos/dll/win32/hlink # Synced to Wine-1.5.4

1 0

[akhaldi] 60168: [FAULTREP_WINETEST] * Import from Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:08:03 2013 New Revision: 60168 URL: http://svn.reactos.org/svn/reactos?rev=60168&view=rev Log: [FAULTREP_WINETEST] * Import from Wine 1.7.1. Added: trunk/rostests/winetests/faultrep/ trunk/rostests/winetests/faultrep/CMakeLists.txt (with props) trunk/rostests/winetests/faultrep/faultrep.c (with props) trunk/rostests/winetests/faultrep/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -21,6 +21,7 @@ add_subdirectory(dinput) add_subdirectory(dnsapi) add_subdirectory(dsound) +add_subdirectory(faultrep) add_subdirectory(fusion) add_subdirectory(gdi32) add_subdirectory(gdiplus) Added: trunk/rostests/winetests/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/faultrep/CMakeL… ============================================================================== --- trunk/rostests/winetests/faultrep/CMakeLists.txt (added) +++ trunk/rostests/winetests/faultrep/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -0,0 +1,5 @@ + +add_executable(faultrep_winetest faultrep.c testlist.c) +set_module_type(faultrep_winetest win32cui) +add_importlibs(faultrep_winetest faultrep advapi32 msvcrt kernel32) +add_cd_file(TARGET faultrep_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/faultrep/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/faultrep/faultrep.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/faultrep/faultr… ============================================================================== --- trunk/rostests/winetests/faultrep/faultrep.c (added) +++ trunk/rostests/winetests/faultrep/faultrep.c [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -0,0 +1,90 @@ +/* + * Unit test suite for fault reporting in XP and above + * + * Copyright 2010 Detlef Riekenberg + * + * 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 <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" + +#include "errorrep.h" +#include "wine/test.h" + +static char regpath_root[] = "Software\\Microsoft\\PCHealth\\ErrorReporting"; +static char regpath_exclude[] = "ExclusionList"; + +/* ###### */ + +static void test_AddERExcludedApplicationA(void) +{ + BOOL res; + LONG lres; + HKEY hroot; + HKEY hexclude = 0; + + /* clean state */ + lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); + if (lres == ERROR_ACCESS_DENIED) + { + skip("Not enough access rights\n"); + return; + } + + if (!lres) + lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); + + if (!lres) + RegDeleteValueA(hexclude, "winetest_faultrep.exe"); + + + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA(NULL); + ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA(""); + ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + /* existence of the path doesn't matter this function succeeded */ + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + + /* add, when already present */ + SetLastError(0xdeadbeef); + res = AddERExcludedApplicationA("winetest_faultrep.exe"); + ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError()); + + /* cleanup */ + RegDeleteValueA(hexclude, "winetest_faultrep.exe"); + + RegCloseKey(hexclude); + RegCloseKey(hroot); +} + +/* ########################### */ + +START_TEST(faultrep) +{ + test_AddERExcludedApplicationA(); +} Propchange: trunk/rostests/winetests/faultrep/faultrep.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/faultrep/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/faultrep/testli… ============================================================================== --- trunk/rostests/winetests/faultrep/testlist.c (added) +++ trunk/rostests/winetests/faultrep/testlist.c [iso-8859-1] Mon Sep 16 15:08:03 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_faultrep(void); + +const struct test winetest_testlist[] = +{ + { "faultrep", func_faultrep }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/faultrep/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60167: [FAULTREP] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 15:06:48 2013 New Revision: 60167 URL: http://svn.reactos.org/svn/reactos?rev=60167&view=rev Log: [FAULTREP] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt trunk/reactos/dll/win32/faultrep/faultrep.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Mon Sep 16 15:06:48 2013 @@ -1,7 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(faultrep.dll faultrep.spec) +spec2def(faultrep.dll faultrep.spec ADD_IMPORTLIB) list(APPEND SOURCE faultrep.c Modified: trunk/reactos/dll/win32/faultrep/faultrep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/faultre… ============================================================================== --- trunk/reactos/dll/win32/faultrep/faultrep.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/faultrep/faultrep.c [iso-8859-1] Mon Sep 16 15:06:48 2013 @@ -53,14 +53,13 @@ * Wine doesn't use this data but stores it in the registry (in the same place * as Windows would) in case it will be useful in a future version * - * According to MSDN this function should succeed even if the user has no write - * access to HKLM. This probably means that there is no error checking. */ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) { WCHAR *bslash; DWORD value = 1; HKEY hkey; + LONG res; TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); bslash = strrchrW(lpAppFileName, '\\'); @@ -72,13 +71,14 @@ return FALSE; } - if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey)) + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey); + if (!res) { RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value)); RegCloseKey(hkey); } - return TRUE; + return !res; } /************************************************************************* @@ -123,8 +123,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); 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] Mon Sep 16 15:06:48 2013 @@ -71,7 +71,7 @@ reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 -reactos/dll/win32/faultrep # Synced to Wine-1.5.4 +reactos/dll/win32/faultrep # Synced to Wine-1.7.1 reactos/dll/win32/fusion # Synced to Wine-1.5.26 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26

1 0

[akhaldi] 60166: [DWMAPI] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 14:56:39 2013 New Revision: 60166 URL: http://svn.reactos.org/svn/reactos?rev=60166&view=rev Log: [DWMAPI] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/dwmapi/CMakeLists.txt trunk/reactos/dll/win32/dwmapi/dwmapi.spec trunk/reactos/dll/win32/dwmapi/dwmapi_main.c trunk/reactos/include/psdk/dwmapi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -6,11 +6,10 @@ list(APPEND SOURCE dwmapi_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/dwmapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) -add_library(dwmapi SHARED ${SOURCE}) +add_library(dwmapi SHARED ${SOURCE} version.rc) set_module_type(dwmapi win32dll) target_link_libraries(dwmapi wine) add_importlibs(dwmapi msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -28,7 +28,7 @@ @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) -@ stub DwmGetCompositionTimingInfo +@ stdcall DwmGetCompositionTimingInfo(long ptr) @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) Modified: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi_ma… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -212,3 +212,15 @@ return E_NOTIMPL; } + +/********************************************************************** + * DwmGetCompositionTimingInfo (DWMAPI.@) + */ +HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) +{ + static int i; + + if(!i++) FIXME("(%p %p)\n", hwnd, info); + + return E_NOTIMPL; +} Modified: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Mon Sep 16 14:56:39 2013 @@ -32,6 +32,59 @@ DECLARE_HANDLE(HTHUMBNAIL); typedef HTHUMBNAIL *PHTHUMBNAIL; +#include <pshpack1.h> + +typedef ULONGLONG DWM_FRAME_COUNT; +typedef ULONGLONG QPC_TIME; + +typedef struct _UNSIGNED_RATIO { + UINT32 uiNumerator; + UINT32 uiDenominator; +} UNSIGNED_RATIO; + +typedef struct _DWM_TIMING_INFO { + UINT32 cbSize; + UNSIGNED_RATIO rateRefresh; + QPC_TIME qpcRefreshPeriod; + UNSIGNED_RATIO rateCompose; + QPC_TIME qpcVBlank; + DWM_FRAME_COUNT cRefresh; + UINT cDXRefresh; + QPC_TIME qpcCompose; + DWM_FRAME_COUNT cFrame; + UINT cDXPresent; + DWM_FRAME_COUNT cRefreshFrame; + DWM_FRAME_COUNT cFrameSubmitted; + UINT cDXPresentSubmitted; + DWM_FRAME_COUNT cFrameConfirmed; + UINT cDXPresentConfirmed; + DWM_FRAME_COUNT cRefreshConfirmed; + UINT cDXRefreshConfirmed; + DWM_FRAME_COUNT cFramesLate; + UINT cFramesOutstanding; + DWM_FRAME_COUNT cFrameDisplayed; + QPC_TIME qpcFrameDisplayed; + DWM_FRAME_COUNT cRefreshFrameDisplayed; + DWM_FRAME_COUNT cFrameComplete; + QPC_TIME qpcFrameComplete; + DWM_FRAME_COUNT cFramePending; + QPC_TIME qpcFramePending; + DWM_FRAME_COUNT cFramesDisplayed; + DWM_FRAME_COUNT cFramesComplete; + DWM_FRAME_COUNT cFramesPending; + DWM_FRAME_COUNT cFramesAvailable; + DWM_FRAME_COUNT cFramesDropped; + DWM_FRAME_COUNT cFramesMissed; + DWM_FRAME_COUNT cRefreshNextDisplayed; + DWM_FRAME_COUNT cRefreshNextPresented; + DWM_FRAME_COUNT cRefreshesDisplayed; + DWM_FRAME_COUNT cRefreshesPresented; + DWM_FRAME_COUNT cRefreshStarted; + ULONGLONG cPixelsReceived; + ULONGLONG cPixelsDrawn; + DWM_FRAME_COUNT cBuffersEmpty; +} DWM_TIMING_INFO; + typedef struct _MilMatrix3x2D { DOUBLE S_11; @@ -41,6 +94,8 @@ DOUBLE DX; DOUBLE DY; } MilMatrix3x2D; + +#include <poppack.h> #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 @@ -60,6 +115,7 @@ DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); 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] Mon Sep 16 14:56:39 2013 @@ -70,7 +70,7 @@ reactos/dll/win32/cryptui # Synced to Wine-1.7.1 reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 -reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 +reactos/dll/win32/dwmapi # Synced to Wine-1.7.1 reactos/dll/win32/faultrep # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.26 reactos/dll/win32/gdiplus # Synced to Wine-1.5.26

1 0

[akhaldi] 60165: [DNSAPI_WINETEST] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 14:48:02 2013 New Revision: 60165 URL: http://svn.reactos.org/svn/reactos?rev=60165&view=rev Log: [DNSAPI_WINETEST] * Sync with Wine 1.7.1. Modified: trunk/rostests/winetests/dnsapi/CMakeLists.txt trunk/rostests/winetests/dnsapi/name.c trunk/rostests/winetests/dnsapi/record.c trunk/rostests/winetests/dnsapi/testlist.c Modified: trunk/rostests/winetests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] Mon Sep 16 14:48:02 2013 @@ -1,10 +1,6 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(dnsapi_winetest name.c record.c testlist.c) -target_link_libraries(dnsapi_winetest wine) set_module_type(dnsapi_winetest win32cui) -add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32 ntdll) +add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32) add_cd_file(TARGET dnsapi_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/dnsapi/name.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/name.c?r… ============================================================================== --- trunk/rostests/winetests/dnsapi/name.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/name.c [iso-8859-1] Mon Sep 16 14:48:02 2013 @@ -18,20 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "windns.h" - -#include "wine/test.h" +#include <wine/test.h> + +//#include <stdarg.h> + +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +#include <windns.h> static const struct { LPCSTR name; DNS_NAME_FORMAT format; DNS_STATUS status; + DNS_STATUS status_broken; } test_data[] = { @@ -47,8 +48,8 @@ { "a.*", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, { "a ", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, { "a._b", DnsNameDomain, DNS_ERROR_NON_RFC_NAME }, - { "123", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, - { "123.456", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, + { "123", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, + { "123.456", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "a.b", DnsNameDomain, ERROR_SUCCESS }, { "", DnsNameDomainLabel, ERROR_INVALID_NAME }, @@ -79,8 +80,8 @@ { "e.*", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, { "e ", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, { "e._f", DnsNameHostnameFull, DNS_ERROR_NON_RFC_NAME }, - { "789", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, - { "789.456", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, + { "789", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, + { "789.456", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "e.f", DnsNameHostnameFull, ERROR_SUCCESS }, { "", DnsNameHostnameLabel, ERROR_INVALID_NAME }, @@ -93,7 +94,7 @@ { "*", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, { "g ", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, { "_g", DnsNameHostnameLabel, DNS_ERROR_NON_RFC_NAME }, - { "123", DnsNameHostnameLabel, DNS_ERROR_NUMERIC_NAME }, + { "123", DnsNameHostnameLabel, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME }, { "123.456", DnsNameHostnameLabel, ERROR_INVALID_NAME }, { "g.h", DnsNameHostnameLabel, ERROR_INVALID_NAME }, @@ -146,8 +147,8 @@ for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) { status = DnsValidateName_A( test_data[i].name, test_data[i].format ); - ok( status == test_data[i].status, "%d: \'%s\': got %d, expected %d\n", - i, test_data[i].name, status, test_data[i].status ); + ok( status == test_data[i].status || broken(status == test_data[i].status_broken), + "%d: \'%s\': got %d, expected %d\n", i, test_data[i].name, status, test_data[i].status ); } } Modified: trunk/rostests/winetests/dnsapi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/record.c… ============================================================================== --- trunk/rostests/winetests/dnsapi/record.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/record.c [iso-8859-1] Mon Sep 16 14:48:02 2013 @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> +#include <wine/test.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "windns.h" +//#include <stdarg.h> +//#include <stdio.h> -#include "wine/test.h" +//#include "windef.h" +//#include "winbase.h" +//#include "winnls.h" +#include <windns.h> static char name1[] = "localhost"; static char name2[] = "LOCALHOST"; Modified: trunk/rostests/winetests/dnsapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/testlist… ============================================================================== --- trunk/rostests/winetests/dnsapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/testlist.c [iso-8859-1] Mon Sep 16 14:48:02 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_name(void); extern void func_record(void);

1 0

[akhaldi] 60164: [DCIMAN32] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 14:41:13 2013 New Revision: 60164 URL: http://svn.reactos.org/svn/reactos?rev=60164&view=rev Log: [DCIMAN32] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/dciman32/dciman_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/dciman_… ============================================================================== --- trunk/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Mon Sep 16 14:41:13 2013 @@ -23,8 +23,6 @@ #include <stdarg.h> //#include <stdio.h> - -//#include <windows.h> #include <windef.h> #include <winbase.h> 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] Mon Sep 16 14:41:13 2013 @@ -69,7 +69,7 @@ reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 reactos/dll/win32/cryptui # Synced to Wine-1.7.1 reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 -reactos/dll/win32/dciman32 # Synced to Wine-1.5.19 +reactos/dll/win32/dciman32 # Synced to Wine-1.7.1 reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 reactos/dll/win32/faultrep # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.26

1 0

[akhaldi] 60163: * Silence a debug prints.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 14:34:46 2013 New Revision: 60163 URL: http://svn.reactos.org/svn/reactos?rev=60163&view=rev Log: * Silence a debug prints. Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/dh… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] Mon Sep 16 14:34:46 2013 @@ -221,7 +221,7 @@ DH_DbgPrint(MID_TRACE,("Going into dispatch()\n")); - DbgPrint("DHCPCSVC: DHCP service is starting up\n"); + DH_DbgPrint(MID_TRACE, ("DHCPCSVC: DHCP service is starting up\n")); dispatch();

1 0

[akhaldi] 60162: [DBGHELP] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 14:31:09 2013 New Revision: 60162 URL: http://svn.reactos.org/svn/reactos?rev=60162&view=rev Log: [DBGHELP] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/rosstubs.c trunk/reactos/dll/win32/dbghelp/stabs.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] Mon Sep 16 14:31:09 2013 @@ -38,7 +38,6 @@ #define V86_FLAG 0x00020000 #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) - #if defined(__i386__) && !defined(DBGHELP_STATIC_LIB) static ADDRESS_MODE get_selector_type(HANDLE hThread, const CONTEXT* ctx, WORD sel) Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Mon Sep 16 14:31:09 2013 @@ -2528,6 +2528,7 @@ if (pdb_lookup->kind != PDB_JG) { WARN("Found %s, but wrong PDB kind\n", pdb_lookup->filename); + pdb_free(root); return FALSE; } pdb_file->kind = PDB_JG; Modified: trunk/reactos/dll/win32/dbghelp/rosstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/rosstubs… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] Mon Sep 16 14:31:09 2013 @@ -36,7 +36,7 @@ IN PVOID UserContext OPTIONAL) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -47,7 +47,7 @@ IN PVOID UserContext OPTIONAL) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -56,7 +56,7 @@ PVOID pUserData) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -65,7 +65,7 @@ PVOID pUserData) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -83,7 +83,7 @@ IN PVOID context) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -96,7 +96,7 @@ LPSTR pszFilePath) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -107,7 +107,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -118,7 +118,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -130,7 +130,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -138,7 +138,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -148,7 +148,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -158,7 +158,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -168,7 +168,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -178,7 +178,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -188,7 +188,7 @@ PVOID pUserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -197,7 +197,7 @@ PSYMBOL_INFOW Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -207,17 +207,17 @@ PSYMBOL_INFO Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI SymFromTokenW(HANDLE hProcess, DWORD64 ModBase, - DWORD Token, + DWORD Token, PSYMBOL_INFOW Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } ULONG WINAPI @@ -228,7 +228,7 @@ ULONG BufferLines) { UNIMPLEMENTED; - return FALSE; + return FALSE; } PCHAR WINAPI @@ -237,7 +237,7 @@ size_t Size) { UNIMPLEMENTED; - return NULL; + return NULL; } PWCHAR WINAPI @@ -246,7 +246,7 @@ size_t Size) { UNIMPLEMENTED; - return NULL; + return NULL; } BOOL WINAPI @@ -254,7 +254,7 @@ PIMAGEHLP_LINEW64 Line) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -262,7 +262,7 @@ PIMAGEHLP_LINEW64 Line) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -272,7 +272,7 @@ PSYMBOL_INFO Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -282,7 +282,7 @@ PSYMBOL_INFOW Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -294,7 +294,7 @@ DWORD Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -305,7 +305,7 @@ DWORD Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } @@ -317,7 +317,7 @@ DWORD Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -331,7 +331,7 @@ DWORD Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } @@ -346,7 +346,7 @@ DWORD Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -360,7 +360,7 @@ DWORD Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -374,7 +374,7 @@ size_t cDbgFile) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -388,7 +388,7 @@ size_t cDbgFile) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -398,7 +398,7 @@ PSYMBOL_INFOW Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -407,7 +407,7 @@ PIMAGEHLP_GET_TYPE_INFO_PARAMS Params) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -415,7 +415,7 @@ PSYMBOL_INFO Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -423,7 +423,7 @@ PSYMBOL_INFOW Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -431,7 +431,7 @@ PSYMBOL_INFO Symbol) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -439,23 +439,7 @@ PSYMBOL_INFOW Symbol) { UNIMPLEMENTED; - return FALSE; -} - -PCHAR WINAPI -SymSetHomeDirectory(HANDLE hProcess, - PCSTR pszDir) -{ - UNIMPLEMENTED; - return NULL; -} - -PWCHAR WINAPI -SymSetHomeDirectoryW(HANDLE hProcess, - PCWSTR pszDir) -{ - UNIMPLEMENTED; - return NULL; + return FALSE; } BOOL @@ -466,7 +450,7 @@ DWORD Index) { UNIMPLEMENTED; - return FALSE; + return FALSE; } // SymSetSymWithAddr64 @@ -479,7 +463,7 @@ PCSTR pszFile2) { UNIMPLEMENTED; - return NULL; + return NULL; } PCWSTR WINAPI @@ -490,7 +474,7 @@ PCWSTR pszFile2) { UNIMPLEMENTED; - return NULL; + return NULL; } BOOL WINAPI @@ -502,7 +486,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -514,7 +498,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -525,7 +509,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -536,7 +520,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } PCSTR WINAPI @@ -546,7 +530,7 @@ PCSTR pszFile) { UNIMPLEMENTED; - return NULL; + return NULL; } PCWSTR WINAPI @@ -556,7 +540,7 @@ PCWSTR pszFile) { UNIMPLEMENTED; - return NULL; + return NULL; } BOOL WINAPI @@ -564,7 +548,7 @@ PCSTR pszPath) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL WINAPI @@ -572,7 +556,7 @@ PCWSTR pszPath) { UNIMPLEMENTED; - return FALSE; + return FALSE; } PCSTR WINAPI @@ -582,7 +566,7 @@ DWORD pszFlags) { UNIMPLEMENTED; - return NULL; + return NULL; } PCWSTR WINAPI @@ -592,7 +576,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return NULL; + return NULL; } PCSTR WINAPI @@ -603,7 +587,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return NULL; + return NULL; } PCWSTR WINAPI @@ -614,7 +598,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return NULL; + return NULL; } DWORD WINAPI @@ -624,7 +608,7 @@ DWORD dwFlags) { UNIMPLEMENTED; - return 0; + return 0; } HANDLE @@ -637,7 +621,7 @@ PVOID CallerData) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -650,7 +634,7 @@ size_t Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -663,7 +647,7 @@ size_t Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -674,7 +658,7 @@ PENUMSOURCEFILETOKENSCALLBACK Callback) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -687,7 +671,7 @@ size_t Size) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -700,7 +684,7 @@ PVOID UserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -713,7 +697,7 @@ PVOID UserContext) { UNIMPLEMENTED; - return FALSE; + return FALSE; } @@ -727,7 +711,7 @@ PVOID CallerData) { UNIMPLEMENTED; - return 0; + return 0; } @@ -741,7 +725,7 @@ PVOID CallerData) { UNIMPLEMENTED; - return 0; + return 0; } @@ -755,7 +739,7 @@ PVOID CallerData) { UNIMPLEMENTED; - return 0; + return 0; } @@ -769,7 +753,7 @@ PVOID CallerData) { UNIMPLEMENTED; - return 0; + return 0; } @@ -781,7 +765,7 @@ DWORD Flags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -792,7 +776,7 @@ DWORD Flags) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -806,7 +790,7 @@ PDWORD64 cOmapFrom) { UNIMPLEMENTED; - return FALSE; + return FALSE; } BOOL @@ -818,6 +802,5 @@ PULONG Size) { UNIMPLEMENTED; - return FALSE; -} - + return FALSE; +} Modified: trunk/reactos/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/stabs.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/stabs.c [iso-8859-1] Mon Sep 16 14:31:09 2013 @@ -1683,6 +1683,7 @@ stabs_free_includes(); HeapFree(GetProcessHeap(), 0, pending_block.objs); HeapFree(GetProcessHeap(), 0, pending_func.objs); + HeapFree(GetProcessHeap(), 0, srcpath); return ret; } Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Mon Sep 16 14:31:09 2013 @@ -2220,3 +2220,25 @@ return FALSE; } + +/****************************************************************** + * SymSetHomeDirectory (DBGHELP.@) + * + */ +PCHAR WINAPI SymSetHomeDirectory(HANDLE hProcess, PCSTR dir) +{ + FIXME("(%p, %s): stub\n", hProcess, dir); + + return NULL; +} + +/****************************************************************** + * SymSetHomeDirectoryW (DBGHELP.@) + * + */ +PWSTR WINAPI SymSetHomeDirectoryW(HANDLE hProcess, PCWSTR dir) +{ + FIXME("(%p, %s): stub\n", hProcess, debugstr_w(dir)); + + return NULL; +} 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] Mon Sep 16 14:31:09 2013 @@ -68,7 +68,7 @@ reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 reactos/dll/win32/cryptui # Synced to Wine-1.7.1 -reactos/dll/win32/dbghelp # Synced to Wine-1.5.26 +reactos/dll/win32/dbghelp # Synced to Wine-1.7.1 reactos/dll/win32/dciman32 # Synced to Wine-1.5.19 reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 reactos/dll/win32/faultrep # Synced to Wine-1.5.4

1 0

[akhaldi] 60161: [CRYPTUI] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 14:05:55 2013 New Revision: 60161 URL: http://svn.reactos.org/svn/reactos?rev=60161&view=rev Log: [CRYPTUI] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/cryptui/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/CMakeLists.txt [iso-8859-1] Mon Sep 16 14:05:55 2013 @@ -9,25 +9,12 @@ list(APPEND SOURCE main.c - cryptui.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptui_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def) -add_library(cryptui SHARED ${SOURCE}) +add_library(cryptui SHARED ${SOURCE} cryptui.rc) set_module_type(cryptui win32dll) target_link_libraries(cryptui uuid wine) add_delay_importlibs(cryptui urlmon wintrust) - -add_importlibs(cryptui - user32 - ole32 - crypt32 - gdi32 - advapi32 - comctl32 - comdlg32 - msvcrt - kernel32 - ntdll) - +add_importlibs(cryptui user32 ole32 crypt32 gdi32 advapi32 comctl32 comdlg32 msvcrt kernel32 ntdll) add_cd_file(TARGET cryptui DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Mon Sep 16 14:05:55 2013 @@ -61,10 +61,6 @@ case DLL_PROCESS_ATTACH: hInstance = hinstDLL; 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] Mon Sep 16 14:05:55 2013 @@ -67,7 +67,7 @@ reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 -reactos/dll/win32/cryptui # Synced to Wine-1.5.26 +reactos/dll/win32/cryptui # Synced to Wine-1.7.1 reactos/dll/win32/dbghelp # Synced to Wine-1.5.26 reactos/dll/win32/dciman32 # Synced to Wine-1.5.19 reactos/dll/win32/dwmapi # Synced to Wine-1.5.19

1 0

[akhaldi] 60160: [CRYPTUI_WINETEST] * Speedup linking.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 13:48:54 2013 New Revision: 60160 URL: http://svn.reactos.org/svn/reactos?rev=60160&view=rev Log: [CRYPTUI_WINETEST] * Speedup linking. Modified: trunk/rostests/winetests/cryptui/CMakeLists.txt Modified: trunk/rostests/winetests/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptui/CMakeLists.txt [iso-8859-1] Mon Sep 16 13:48:54 2013 @@ -1,10 +1,6 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(cryptui_winetest cryptui.c testlist.c) -target_link_libraries(cryptui_winetest wine) set_module_type(cryptui_winetest win32cui) -add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32 ntdll) +add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32) add_cd_file(TARGET cryptui_winetest DESTINATION reactos/bin FOR all)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs