Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[akhaldi] 64570: [RASAPI32] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:40:17 2014 New Revision: 64570 URL: http://svn.reactos.org/svn/reactos?rev=64570&view=rev Log: [RASAPI32] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rasapi32/rasapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi.… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi.c [iso-8859-1] Mon Oct 6 18:40:17 2014 @@ -243,7 +243,7 @@ /************************************************************************** * RasEnumDevicesA [RASAPI32.19] * - * Just return a virtual modem too see what other APIs programs will + * Just return a virtual modem to see what other APIs programs will * call with it. */ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD lpcDevices) 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 Oct 6 18:40:17 2014 @@ -167,7 +167,7 @@ reactos/dll/win32/qmgr # Synced to Wine-1.7.17 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.17 reactos/dll/win32/query # Synced to Wine-1.7.17 -reactos/dll/win32/rasapi32 # Synced to Wine-1.7.17 +reactos/dll/win32/rasapi32 # Synced to Wine-1.7.27 reactos/dll/win32/resutils # Synced to Wine-1.7.17 reactos/dll/win32/riched20 # Synced to Wine-1.7.17 reactos/dll/win32/riched32 # Synced to Wine-1.7.17

1 0

[akhaldi] 64569: [PROPSYS] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:39:23 2014 New Revision: 64569 URL: http://svn.reactos.org/svn/reactos?rev=64569&view=rev Log: [PROPSYS] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/propsys/propsys.spec trunk/reactos/dll/win32/propsys/propsys_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/propsys/propsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys.… ============================================================================== --- trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] Mon Oct 6 18:39:23 2014 @@ -85,7 +85,7 @@ @ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName -@ stub PSGetPropertySystem +@ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) 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] Mon Oct 6 18:39:23 2014 @@ -126,6 +126,109 @@ return S_FALSE; } +static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IPropertySystem) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPropertySystem_AddRef(iface); + return S_OK; + } + + FIXME("%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI propsys_AddRef(IPropertySystem *iface) +{ + return 2; +} + +static ULONG WINAPI propsys_Release(IPropertySystem *iface) +{ + return 1; +} + +static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, + REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + return PSGetPropertyDescription(propkey, riid, ppv); +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, + LPCWSTR canonical_name, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(canonical_name), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, + LPCWSTR proplist, REFIID riid, void **ppv) +{ + return PSGetPropertyDescriptionListFromString(proplist, riid, ppv); +} + +static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, + PROPDESC_ENUMFILTER filter, REFIID riid, void **ppv) +{ + FIXME("%d %s %p: stub\n", filter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR dest, DWORD destlen) +{ + FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR *text) +{ + FIXME("%p %p %x %p: stub\n", key, propvar, flags, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + return PSRegisterPropertySchema(path); +} + +static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + return PSUnregisterPropertySchema(path); +} + +static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) +{ + return PSRefreshPropertySchema(); +} + +static const IPropertySystemVtbl propsysvtbl = { + propsys_QueryInterface, + propsys_AddRef, + propsys_Release, + propsys_GetPropertyDescription, + propsys_GetPropertyDescriptionByName, + propsys_GetPropertyDescriptionListFromString, + propsys_EnumeratePropertyDescriptions, + propsys_FormatForDisplay, + propsys_FormatForDisplayAlloc, + propsys_RegisterPropertySchema, + propsys_UnregisterPropertySchema, + propsys_RefreshPropertySchema +}; + +static IPropertySystem propsys = { &propsysvtbl }; + +HRESULT WINAPI PSGetPropertySystem(REFIID riid, void **obj) +{ + return IPropertySystem_QueryInterface(&propsys, riid, obj); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path)); 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 Oct 6 18:39:23 2014 @@ -162,7 +162,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.7.17 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.17 -reactos/dll/win32/propsys # Synced to Wine-1.7.17 +reactos/dll/win32/propsys # Synced to Wine-1.7.27 reactos/dll/win32/pstorec # Synced to Wine-1.7.17 reactos/dll/win32/qmgr # Synced to Wine-1.7.17 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.17

1 0

[akhaldi] 64568: [PDH] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:37:50 2014 New Revision: 64568 URL: http://svn.reactos.org/svn/reactos?rev=64568&view=rev Log: [PDH] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/pdh/pdh.spec trunk/reactos/dll/win32/pdh/pdh_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pdh/pdh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Mon Oct 6 18:37:50 2014 @@ -36,8 +36,8 @@ @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW @ stub PdhEnumObjectsW -@ stub PdhExpandCounterPathA -@ stub PdhExpandCounterPathW +@ stdcall PdhExpandCounterPathA(str ptr ptr) +@ stdcall PdhExpandCounterPathW(wstr ptr ptr) @ stdcall PdhExpandWildCardPathA(str str ptr ptr long) @ stub PdhExpandWildCardPathHA @ stub PdhExpandWildCardPathHW Modified: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Mon Oct 6 18:37:50 2014 @@ -638,6 +638,24 @@ } /*********************************************************************** + * PdhExpandCounterPathA (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathA( LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathA(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** + * PdhExpandCounterPathW (PDH.@) + */ +PDH_STATUS WINAPI PdhExpandCounterPathW( LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength ) +{ + FIXME("%s, %p, %p: stub\n", debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength); + return PdhExpandWildCardPathW(NULL, szWildCardPath, mszExpandedPathList, pcchPathListLength, 0); +} + +/*********************************************************************** * PdhGetCounterInfoA (PDH.@) */ PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info ) 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 Oct 6 18:37:50 2014 @@ -158,7 +158,7 @@ reactos/dll/win32/olepro32 # Synced to Wine-1.7.17 reactos/dll/win32/olesvr32 # Synced to Wine-1.7.17 reactos/dll/win32/olethk32 # Synced to Wine-1.7.17 -reactos/dll/win32/pdh # Synced to Wine-1.7.17 +reactos/dll/win32/pdh # Synced to Wine-1.7.27 reactos/dll/win32/pidgen # Synced to Wine-1.7.17 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.17

1 0

[akhaldi] 64567: [CMAKE] * Target build_header doesn't exist, don't depend on it.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:36:01 2014 New Revision: 64567 URL: http://svn.reactos.org/svn/reactos?rev=64567&view=rev Log: [CMAKE] * Target build_header doesn't exist, don't depend on it. Modified: trunk/reactos/tools/wpp/CMakeLists.txt Modified: trunk/reactos/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/CMakeLists.txt [iso-8859-1] Mon Oct 6 18:36:01 2014 @@ -34,5 +34,4 @@ add_library(wpp ${SOURCE}) else() add_library(wpphost ${SOURCE}) - add_dependencies(wpphost build_header) endif()

1 0

[ekohl] 64566: [DEVMGR] - Replace the call to DevInstallW by InstallDevInst in the device properties. - Also call InstallDevInst from the device problem wizard. CORE-6350 #resolve
by ekohl＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: ekohl Date: Mon Oct 6 18:35:17 2014 New Revision: 64566 URL: http://svn.reactos.org/svn/reactos?rev=64566&view=rev Log: [DEVMGR] - Replace the call to DevInstallW by InstallDevInst in the device properties. - Also call InstallDevInst from the device problem wizard. CORE-6350 #resolve Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/devprblm.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Mon Oct 6 18:35:17 2014 @@ -399,13 +399,6 @@ return Ret; } -BOOL -WINAPI -DevInstallW( - IN HWND hWndParent, - IN HINSTANCE hInstance, - IN LPCWSTR InstanceId, - IN INT Show); static VOID @@ -415,6 +408,7 @@ { TOKEN_PRIVILEGES Privileges; HANDLE hToken; + DWORD dwReboot; BOOL NeedReboot = FALSE; // Better use InstallDevInst: @@ -426,7 +420,8 @@ // BOOL bUpdate, // DWORD *dwReboot); // See: http://comp.os.ms-windows.programmer.win32.narkive.com/J8FTd4KK/signature-o… - if (!DevInstallW(hwndDlg, NULL, dap->szDeviceID, SW_SHOWNOACTIVATE)) + + if (!InstallDevInst(hwndDlg, dap->szDeviceID, TRUE, &dwReboot)) return; if (NeedReboot == FALSE) @@ -1619,6 +1614,8 @@ DWORD nDriverPages = 0; BOOL RecalcPages = FALSE; + TRACE("UpdateDevInfo()\n"); + hPropSheetDlg = GetParent(hwndDlg); if (dap->PageInitialized) @@ -2014,6 +2011,7 @@ dap->PropertySheetType) && nDriverPages != 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { +TRACE("Count %d additional pages!\n", nDriverPages); dap->nDevPropSheets += nDriverPages; } else @@ -2035,6 +2033,7 @@ /* add the device property sheets */ if (dap->nDevPropSheets != 0) { +TRACE("Show %d pages!\n", dap->nDevPropSheets); dap->DevPropSheets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dap->nDevPropSheets * sizeof(HPROPSHEETPAGE)); @@ -2054,20 +2053,28 @@ { /* add the property sheets */ for (iPage = 0; - iPage != nDriverPages; + iPage < nDriverPages; iPage++) { +TRACE("Add page %d\n", iPage); +TRACE("Sheet %p\n", dap->DevPropSheets[iPage]); + if (PropSheet_AddPage(hPropSheetDlg, dap->DevPropSheets[iPage])) { RecalcPages = TRUE; } + else + { +TRACE("PropSheet_AddPage() failed\n"); + } } dap->FreeDevPropSheets = TRUE; } else { +TRACE("SetupDiGetClassDevPropertySheets() failed\n"); /* cleanup, we were unable to get the device property sheets */ iPage = nDriverPages; dap->nDevPropSheets -= nDriverPages; Modified: trunk/reactos/dll/win32/devmgr/devprblm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devprblm.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devprblm.c [iso-8859-1] Mon Oct 6 18:35:17 2014 @@ -34,9 +34,19 @@ IN PSP_DEVINFO_DATA DevInfoData, IN HMACHINE hMachine OPTIONAL) { + WCHAR szDeviceInstanceId[256]; CONFIGRET cr; ULONG Status, ProblemNumber; + DWORD dwReboot; BOOL Ret = FALSE; + + /* Get the device instance id */ + if (!SetupDiGetDeviceInstanceId(hDevInfo, + DevInfoData, + szDeviceInstanceId, + 256, + NULL)) + return FALSE; cr = CM_Get_DevNode_Status_Ex(&Status, &ProblemNumber, @@ -62,6 +72,7 @@ case CM_PROB_UNKNOWN_RESOURCE: { /* FIXME - display the update driver wizard */ + InstallDevInst(hWndParent, szDeviceInstanceId, TRUE, &dwReboot); break; } @@ -78,6 +89,7 @@ case CM_PROB_FAILED_INSTALL: { /* FIXME - display the driver (re)installation wizard */ + InstallDevInst(hWndParent, szDeviceInstanceId, TRUE, &dwReboot); break; } Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Mon Oct 6 18:35:17 2014 @@ -13,6 +13,7 @@ #include <regstr.h> #include <setupapi.h> #include <cfgmgr32.h> +#include <dll/newdevp.h> #include <dll/devmgr/devmgr.h> #include <wine/debug.h>

1 0

[akhaldi] 64565: [PSAPI_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:32:06 2014 New Revision: 64565 URL: http://svn.reactos.org/svn/reactos?rev=64565&view=rev Log: [PSAPI_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/psapi/psapi_main.c Modified: trunk/rostests/winetests/psapi/psapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/psapi_mai… ============================================================================== --- trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/psapi_main.c [iso-8859-1] Mon Oct 6 18:32:06 2014 @@ -78,7 +78,7 @@ (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); - pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQueryVirtualMemory"); + pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -102,7 +102,7 @@ static void test_EnumProcessModules(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -131,8 +131,8 @@ ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return; - ok(hMod == GetModuleHandle(NULL), - "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); + ok(hMod == GetModuleHandleA(NULL), + "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); /* Windows sometimes has a bunch of extra dlls, presumably brought in by * aclayers.dll. @@ -155,7 +155,7 @@ static void test_GetModuleInformation(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); MODULEINFO info; DWORD ret; @@ -225,7 +225,11 @@ todo_wine ok(!status, "NtQueryVirtualMemory error %x\n", status); /* FIXME: remove once Wine is fixed */ - if (status) return FALSE; + if (status) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } section_name = (MEMORY_SECTION_NAME *)buf; ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n", @@ -244,7 +248,7 @@ static void test_GetMappedFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName; DWORD ret; char *base; @@ -285,26 +289,26 @@ } } - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "map", 0, file_name); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); drive[0] = file_name[0]; drive[1] = ':'; drive[2] = 0; SetLastError(0xdeadbeef); - ret = QueryDosDevice(drive, device_name, sizeof(device_name)); - ok(ret, "QueryDosDevice error %d\n", GetLastError()); + ret = QueryDosDeviceA(drive, device_name, sizeof(device_name)); + ok(ret, "QueryDosDeviceA error %d\n", GetLastError()); trace("%s -> %s\n", drive, device_name); SetLastError(0xdeadbeef); - hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFileA(%s) error %d\n", file_name, GetLastError()); SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN); SetEndOfFile(hfile); SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + hmap = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -379,11 +383,11 @@ UnmapViewOfFile(base); CloseHandle(hmap); CloseHandle(hfile); - DeleteFile(file_name); - - SetLastError(0xdeadbeef); - hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + DeleteFileA(file_name); + + SetLastError(0xdeadbeef); + hmap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -401,7 +405,7 @@ static void test_GetProcessImageFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szImgPath[MAX_PATH], szMapPath[MAX_PATH]; WCHAR szImgPathW[MAX_PATH]; DWORD ret, ret1; @@ -479,7 +483,7 @@ static void test_GetModuleFileNameEx(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1]; WCHAR buffer[MAX_PATH]; DWORD ret; @@ -538,7 +542,7 @@ static void test_GetModuleBaseName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModPath[MAX_PATH], szModBaseName[MAX_PATH]; DWORD ret;

1 0

[akhaldi] 64564: [OLEDLG] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:31:15 2014 New Revision: 64564 URL: http://svn.reactos.org/svn/reactos?rev=64564&view=rev Log: [OLEDLG] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Cs.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc 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/oledlg/lang/oledlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 64563: [CMAKE] * Don't add a dependency on a file.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:29:45 2014 New Revision: 64563 URL: http://svn.reactos.org/svn/reactos?rev=64563&view=rev Log: [CMAKE] * Don't add a dependency on a file. Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Oct 6 18:29:45 2014 @@ -535,7 +535,6 @@ else() # Use a custom linker script add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") - add_dependencies(${MODULE} "${CMAKE_SOURCE_DIR}/kbdlayout.lds") endif() elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))

1 0

[akhaldi] 64562: [CMAKE] * Target oleaut32_typelibs doesn't exist, don't depend on it.
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:24:38 2014 New Revision: 64562 URL: http://svn.reactos.org/svn/reactos?rev=64562&view=rev Log: [CMAKE] * Target oleaut32_typelibs doesn't exist, don't depend on it. Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Mon Oct 6 18:24:38 2014 @@ -35,5 +35,5 @@ if(MSVC) add_importlibs(oleaut32_winetest ntdll) endif() -add_dependencies(oleaut32_winetest stdole2 oleaut32_typelibs oleaut32_idlheaders) +add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders) add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 64561: [PSDK] * Update propsys.idl. CORE-8540
by akhaldi＠svn.reactos.org 06 Oct '14

06 Oct '14

Author: akhaldi Date: Mon Oct 6 18:22:59 2014 New Revision: 64561 URL: http://svn.reactos.org/svn/reactos?rev=64561&view=rev Log: [PSDK] * Update propsys.idl. CORE-8540 Modified: trunk/reactos/include/psdk/propsys.idl Modified: trunk/reactos/include/psdk/propsys.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propsys.idl?r… ============================================================================== --- trunk/reactos/include/psdk/propsys.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/propsys.idl [iso-8859-1] Mon Oct 6 18:22:59 2014 @@ -802,7 +802,10 @@ cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") +cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014