Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[rnaumann] 69964: [SETUPAPI] Improve the icons. Patch by Jared Smudde. CORE-10372
by rnaumann＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: rnaumann Date: Fri Nov 20 17:52:49 2015 New Revision: 69964 URL: http://svn.reactos.org/svn/reactos?rev=69964&view=rev Log: [SETUPAPI] Improve the icons. Patch by Jared Smudde. CORE-10372 Modified: trunk/reactos/dll/win32/setupapi/res/1.ico trunk/reactos/dll/win32/setupapi/res/10.ico trunk/reactos/dll/win32/setupapi/res/105.ico trunk/reactos/dll/win32/setupapi/res/11.ico trunk/reactos/dll/win32/setupapi/res/159.ico trunk/reactos/dll/win32/setupapi/res/161.ico trunk/reactos/dll/win32/setupapi/res/18.ico trunk/reactos/dll/win32/setupapi/res/19.ico trunk/reactos/dll/win32/setupapi/res/2.ico trunk/reactos/dll/win32/setupapi/res/20.ico trunk/reactos/dll/win32/setupapi/res/23.ico trunk/reactos/dll/win32/setupapi/res/24.ico trunk/reactos/dll/win32/setupapi/res/26.ico trunk/reactos/dll/win32/setupapi/res/27.ico trunk/reactos/dll/win32/setupapi/res/28.ico trunk/reactos/dll/win32/setupapi/res/3.ico trunk/reactos/dll/win32/setupapi/res/4.ico trunk/reactos/dll/win32/setupapi/res/40.ico trunk/reactos/dll/win32/setupapi/res/42.ico trunk/reactos/dll/win32/setupapi/res/43.ico trunk/reactos/dll/win32/setupapi/res/5.ico trunk/reactos/dll/win32/setupapi/res/50.ico trunk/reactos/dll/win32/setupapi/res/500.ico trunk/reactos/dll/win32/setupapi/res/501.ico trunk/reactos/dll/win32/setupapi/res/502.ico trunk/reactos/dll/win32/setupapi/res/51.ico trunk/reactos/dll/win32/setupapi/res/52.ico trunk/reactos/dll/win32/setupapi/res/53.ico trunk/reactos/dll/win32/setupapi/res/54.ico trunk/reactos/dll/win32/setupapi/res/6.ico trunk/reactos/dll/win32/setupapi/res/7.ico trunk/reactos/dll/win32/setupapi/res/8.ico trunk/reactos/dll/win32/setupapi/res/9.ico Modified: trunk/reactos/dll/win32/setupapi/res/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/1.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/10.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/10.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/105.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/105… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/11.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/159.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/159… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/161.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/161… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/18.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/18.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/19.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/19.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/2.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/20.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/23.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/23.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/24.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/24.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/26.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/26.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/27.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/27.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/28.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/28.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/3.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/3.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/4.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/40.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/40.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/42.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/42.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/43.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/43.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/5.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/50.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/50.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/500.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/500… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/501.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/501… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/502.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/502… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/51.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/51.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/52.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/52.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/53.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/53.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/54.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/54.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/6.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/6.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/7.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/7.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/8.i… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/9.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/9.i… ============================================================================== Binary files - no diff available.

1 0

[rnaumann] 69963: [HIVESYS] Add missing services description. Patch by Jared Smudde. CORE-10519
by rnaumann＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: rnaumann Date: Fri Nov 20 17:44:28 2015 New Revision: 69963 URL: http://svn.reactos.org/svn/reactos?rev=69963&view=rev Log: [HIVESYS] Add missing services description. Patch by Jared Smudde. CORE-10519 Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri Nov 20 17:44:28 2015 @@ -1443,6 +1443,7 @@ ; Server service HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","DisplayName",0x00000000,"Server service" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","Description",0x00000000,"Supports sharing for file, printers and resources on the network" HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","ObjectName",0x00000000,"LocalSystem" @@ -1452,6 +1453,7 @@ ; Workstation service HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,"Workstation service" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Description",0x00000000,"Responsible for creating and maintaning network connections to servers" HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Group",0x00000000,"Network Provider" HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" @@ -1817,6 +1819,7 @@ ; Scheduler service HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","DependOnService",0x00010000,"RPCSS" HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","DisplayName",0x00000000,"Scheduler service" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Description",0x00000000,"Allows starting of programs at specific times" HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Group",0x00000000,"SchedulerGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs"

1 0

[tfaber] 69962: [USER32_DYNAMIC] - Show that user32 keeps an extra reference to itself CORE-10540
by tfaber＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: tfaber Date: Fri Nov 20 17:27:27 2015 New Revision: 69962 URL: http://svn.reactos.org/svn/reactos?rev=69962&view=rev Log: [USER32_DYNAMIC] - Show that user32 keeps an extra reference to itself CORE-10540 Modified: trunk/rostests/apitests/user32_dynamic/load.c Modified: trunk/rostests/apitests/user32_dynamic/load.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32_dynamic/l… ============================================================================== --- trunk/rostests/apitests/user32_dynamic/load.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32_dynamic/load.c [iso-8859-1] Fri Nov 20 17:27:27 2015 @@ -6,6 +6,8 @@ */ #include <apitest.h> +#include <ndk/pstypes.h> +#include <ndk/rtlfuncs.h> START_TEST(load) { @@ -13,6 +15,15 @@ HMODULE hUser32_2; BOOL Ret; DWORD Error; + PPEB Peb = NtCurrentPeb(); + PTEB Teb = NtCurrentTeb(); + + /* Before init */ + hUser32 = GetModuleHandleW(L"user32"); + ok(hUser32 == NULL, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable == NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); SetLastError(12345); hUser32 = LoadLibraryW(L"user32"); @@ -20,30 +31,101 @@ ok(hUser32 != NULL, "LoadLibrary failed\n"); ok(Error != 12345, "Error = %lu\n", Error); + /* Initialized */ + hUser32_2 = GetModuleHandleW(L"user32"); + ok(hUser32_2 == hUser32, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + SetLastError(12345); hUser32_2 = LoadLibraryW(L"user32"); Error = GetLastError(); ok(hUser32_2 == hUser32, "LoadLibrary failed\n"); ok(Error == 12345, "Error = %lu\n", Error); + /* Still initialized */ + hUser32_2 = GetModuleHandleW(L"user32"); + ok(hUser32_2 == hUser32, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + + SetLastError(12345); Ret = FreeLibrary(hUser32); Error = GetLastError(); ok(Ret == TRUE, "FreeLibrary returned %d\n", Ret); ok(Error == 12345, "Error = %lu\n", Error); + /* Still initialized */ + hUser32_2 = GetModuleHandleW(L"user32"); + ok(hUser32_2 == hUser32, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + + SetLastError(12345); Ret = FreeLibrary(hUser32); Error = GetLastError(); ok(Ret == TRUE, "FreeLibrary returned %d\n", Ret); ok(Error == 12345, "Error = %lu\n", Error); + /* Somebody kept an extra reference! */ + hUser32_2 = GetModuleHandleW(L"user32"); + ok(hUser32_2 == hUser32, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + + SetLastError(12345); + Ret = FreeLibrary(hUser32); + Error = GetLastError(); + ok(Ret == TRUE, "FreeLibrary returned %d\n", Ret); + ok(Error == 12345, "Error = %lu\n", Error); + + /* Uninitialized */ + hUser32 = GetModuleHandleW(L"user32"); + ok(hUser32 == NULL, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + SetLastError(12345); hUser32 = LoadLibraryW(L"user32"); Error = GetLastError(); ok(hUser32 != NULL, "LoadLibrary failed\n"); - ok(Error == 12345, "Error = %lu\n", Error); + ok(Error != 12345, "Error = %lu\n", Error); + /* Initialized again */ + hUser32_2 = GetModuleHandleW(L"user32"); + ok(hUser32_2 == hUser32, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + + SetLastError(12345); Ret = FreeLibrary(hUser32); Error = GetLastError(); ok(Ret == TRUE, "FreeLibrary returned %d\n", Ret); ok(Error == 12345, "Error = %lu\n", Error); + + /* Extra reference again */ + hUser32_2 = GetModuleHandleW(L"user32"); + ok(hUser32_2 == hUser32, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); + + SetLastError(12345); + Ret = FreeLibrary(hUser32); + Error = GetLastError(); + ok(Ret == TRUE, "FreeLibrary returned %d\n", Ret); + ok(Error == 12345, "Error = %lu\n", Error); + + /* Uninitialized again */ + hUser32 = GetModuleHandleW(L"user32"); + ok(hUser32 == NULL, "hUser32 = %p\n", hUser32); + ok(Peb->KernelCallbackTable != NULL, "KernelCallbackTable = %p\n", Peb->KernelCallbackTable); + ok(Peb->PostProcessInitRoutine == NULL, "PostProcessInitRoutine = %p\n", Peb->PostProcessInitRoutine); + ok(Teb->Win32ClientInfo != NULL, "Win32ClientInfo = %p\n", Teb->Win32ClientInfo); }

1 0

[akhaldi] 69961: [PSDK] Update ntdsapi.h. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 11:17:45 2015 New Revision: 69961 URL: http://svn.reactos.org/svn/reactos?rev=69961&view=rev Log: [PSDK] Update ntdsapi.h. CORE-10536 Modified: trunk/reactos/include/psdk/ntdsapi.h Modified: trunk/reactos/include/psdk/ntdsapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdsapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntdsapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdsapi.h [iso-8859-1] Fri Nov 20 11:17:45 2015 @@ -24,6 +24,10 @@ #ifdef __cplusplus extern "C" { #endif + +DWORD WINAPI DsClientMakeSpnForTargetServerA(LPCSTR, LPCSTR, DWORD*, LPSTR); +DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR, LPCWSTR, DWORD*, LPWSTR); +#define DsClientMakeSpnForTargetServer WINELIB_NAME_AW(DsClientMakeSpnForTargetServer) DWORD WINAPI DsMakeSpnA(LPCSTR, LPCSTR, LPCSTR, USHORT, LPCSTR, DWORD*, LPSTR); DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWSTR);

1 0

[akhaldi] 69960: [LOCALSPL] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 11:06:46 2015 New Revision: 69960 URL: http://svn.reactos.org/svn/reactos?rev=69960&view=rev Log: [LOCALSPL] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt trunk/reactos/dll/win32/localspl/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Fri Nov 20 11:06:46 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -17,6 +20,6 @@ set_module_type(localspl win32dll) target_link_libraries(localspl wine) -add_importlibs(localspl spoolss user32 advapi32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(localspl spoolss user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) add_pch(localspl localspl_private.h SOURCE) add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provide… ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Fri Nov 20 11:06:46 2015 @@ -1838,7 +1838,7 @@ return FALSE; } - if(SHDeleteKeyW(hroot, pMonitorName) == ERROR_SUCCESS) { + if(RegDeleteTreeW(hroot, pMonitorName) == ERROR_SUCCESS) { TRACE("%s deleted\n", debugstr_w(pMonitorName)); RegCloseKey(hroot); 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] Fri Nov 20 11:06:46 2015 @@ -90,7 +90,7 @@ reactos/dll/win32/jscript # Synced to WineStaging-1.7.55 reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47 reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47 -reactos/dll/win32/localspl # Synced to WineStaging-1.7.47 +reactos/dll/win32/localspl # Synced to WineStaging-1.7.55 reactos/dll/win32/localui # Synced to WineStaging-1.7.47 reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47

1 0

[jimtabor] 69959: [Win32SS] - Patch by Alexandre Julliard : Add workaround for removed SC_TASKLIST system menu item. Word 95 assumes that the item exists. - Wine sync port.
by jimtabor＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: jimtabor Date: Fri Nov 20 10:49:12 2015 New Revision: 69959 URL: http://svn.reactos.org/svn/reactos?rev=69959&view=rev Log: [Win32SS] - Patch by Alexandre Julliard : Add workaround for removed SC_TASKLIST system menu item. Word 95 assumes that the item exists. - Wine sync port. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Fri Nov 20 10:49:12 2015 @@ -4882,6 +4882,10 @@ if (!(MenuItem = MENU_FindItem( &Menu, &Item, (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND) ))) { + /* workaround for Word 95: pretend that SC_TASKLIST item exists. */ + if ( SetOrGet && Item == SC_TASKLIST && !ByPosition ) + return TRUE; + EngSetLastError(ERROR_MENU_ITEM_NOT_FOUND); return( FALSE); }

1 0

[akhaldi] 69958: [MPR_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:46:02 2015 New Revision: 69958 URL: http://svn.reactos.org/svn/reactos?rev=69958&view=rev Log: [MPR_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/mpr/mpr.c Modified: trunk/rostests/winetests/mpr/mpr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mpr/mpr.c?rev=6… ============================================================================== --- trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mpr/mpr.c [iso-8859-1] Fri Nov 20 10:46:02 2015 @@ -149,13 +149,13 @@ info_size = sizeof(buffer); ret = WNetGetUniversalNameW(driveW, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ - if(drive_type == DRIVE_REMOTE) - ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); + + if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - } + ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); } } @@ -199,10 +199,10 @@ ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type); buf = (char*)pce->abResource; - ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); + ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated resource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); buf += pce->cbResource; - ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); + ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated resource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); m_callback_reached = 1; return TRUE;

1 0

[akhaldi] 69957: [MPR] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:45:42 2015 New Revision: 69957 URL: http://svn.reactos.org/svn/reactos?rev=69957&view=rev Log: [MPR] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Nov 20 10:45:42 2015 @@ -1948,7 +1948,7 @@ break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default: 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] Fri Nov 20 10:45:42 2015 @@ -102,7 +102,7 @@ reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.47 reactos/dll/win32/mlang # Synced to WineStaging-1.7.47 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/mpr # Synced to WineStaging-1.7.47 +reactos/dll/win32/mpr # Synced to WineStaging-1.7.55 reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69956: [ICCVID] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:39:43 2015 New Revision: 69956 URL: http://svn.reactos.org/svn/reactos?rev=69956&view=rev Log: [ICCVID] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/iccvid/iccvid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/iccvid/iccvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] Fri Nov 20 10:39:43 2015 @@ -145,6 +145,15 @@ } } +static inline long get_addr(BOOL inverted, unsigned long x, unsigned long y, + int frm_stride, int bpp, unsigned int out_height) +{ + /* Returns the starting position of a line from top-down or bottom-up */ + if (inverted) + return y * frm_stride + x * bpp; + else + return (out_height - 1 - y) * frm_stride + x * bpp; +} #define MAKECOLOUR32(r,g,b) (((r) << 16) | ((g) << 8) | (b)) /*#define MAKECOLOUR24(r,g,b) (((r) << 16) | ((g) << 8) | (b))*/ @@ -152,15 +161,17 @@ #define MAKECOLOUR15(r,g,b) (((r) >> 3) << 10)| (((g) >> 3) << 5)| (((b) >> 3) << 0) /* ------------------------------------------------------------------------ */ -static void cvid_v1_32(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb) +static void cvid_v1_32(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb) { unsigned long *vptr = (unsigned long *)frm; -#ifndef ORIGINAL -int row_inc = -stride/4; -#else -int row_inc = stride/4; -#endif +int row_inc; int x, y; + + if (!inverted) + row_inc = -stride/4; + else + row_inc = stride/4; /* fill 4x4 block of pixels with colour values from codebook */ for (y = 0; y < 4; y++) @@ -173,17 +184,18 @@ /* ------------------------------------------------------------------------ */ -static void cvid_v4_32(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0, - cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) +static void cvid_v4_32(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb0, cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) { unsigned long *vptr = (unsigned long *)frm; -#ifndef ORIGINAL -int row_inc = -stride/4; -#else -int row_inc = stride/4; -#endif +int row_inc; int x, y; cvid_codebook * cb[] = {cb0,cb1,cb2,cb3}; + + if (!inverted) + row_inc = -stride/4; + else + row_inc = stride/4; /* fill 4x4 block of pixels with colour values from codebooks */ for (y = 0; y < 4; y++) @@ -196,14 +208,16 @@ /* ------------------------------------------------------------------------ */ -static void cvid_v1_24(unsigned char *vptr, unsigned char *limit, int stride, cvid_codebook *cb) -{ -#ifndef ORIGINAL -int row_inc = -stride; -#else -int row_inc = stride; -#endif +static void cvid_v1_24(unsigned char *vptr, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb) +{ +int row_inc; int x, y; + + if (!inverted) + row_inc = -stride; + else + row_inc = stride; /* fill 4x4 block of pixels with colour values from codebook */ for (y = 0; y < 4; y++) @@ -220,16 +234,17 @@ /* ------------------------------------------------------------------------ */ -static void cvid_v4_24(unsigned char *vptr, unsigned char *limit, int stride, cvid_codebook *cb0, - cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) -{ -#ifndef ORIGINAL -int row_inc = -stride; -#else -int row_inc = stride; -#endif +static void cvid_v4_24(unsigned char *vptr, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb0, cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) +{ +int row_inc; cvid_codebook * cb[] = {cb0,cb1,cb2,cb3}; int x, y; + + if (!inverted) + row_inc = -stride; + else + row_inc = stride; /* fill 4x4 block of pixels with colour values from codebooks */ for (y = 0; y < 4; y++) @@ -246,15 +261,17 @@ /* ------------------------------------------------------------------------ */ -static void cvid_v1_16(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb) +static void cvid_v1_16(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb) { unsigned short *vptr = (unsigned short *)frm; -#ifndef ORIGINAL -int row_inc = -stride/2; -#else -int row_inc = stride/2; -#endif +int row_inc; int x, y; + + if (!inverted) + row_inc = -stride/2; + else + row_inc = stride/2; /* fill 4x4 block of pixels with colour values from codebook */ for (y = 0; y < 4; y++) @@ -267,17 +284,18 @@ /* ------------------------------------------------------------------------ */ -static void cvid_v4_16(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0, - cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) +static void cvid_v4_16(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb0, cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) { unsigned short *vptr = (unsigned short *)frm; -#ifndef ORIGINAL -int row_inc = -stride/2; -#else -int row_inc = stride/2; -#endif +int row_inc; cvid_codebook * cb[] = {cb0,cb1,cb2,cb3}; int x, y; + + if (!inverted) + row_inc = -stride/2; + else + row_inc = stride/2; /* fill 4x4 block of pixels with colour values from codebooks */ for (y = 0; y < 4; y++) @@ -289,15 +307,17 @@ } /* ------------------------------------------------------------------------ */ -static void cvid_v1_15(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb) +static void cvid_v1_15(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb) { unsigned short *vptr = (unsigned short *)frm; -#ifndef ORIGINAL -int row_inc = -stride/2; -#else -int row_inc = stride/2; -#endif +int row_inc; int x, y; + + if (!inverted) + row_inc = -stride/2; + else + row_inc = stride/2; /* fill 4x4 block of pixels with colour values from codebook */ for (y = 0; y < 4; y++) @@ -310,17 +330,18 @@ /* ------------------------------------------------------------------------ */ -static void cvid_v4_15(unsigned char *frm, unsigned char *limit, int stride, cvid_codebook *cb0, - cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) +static void cvid_v4_15(unsigned char *frm, unsigned char *limit, int stride, BOOL inverted, + cvid_codebook *cb0, cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3) { unsigned short *vptr = (unsigned short *)frm; -#ifndef ORIGINAL -int row_inc = -stride/2; -#else -int row_inc = stride/2; -#endif +int row_inc; cvid_codebook * cb[] = {cb0,cb1,cb2,cb3}; int x, y; + + if (!inverted) + row_inc = -stride/2; + else + row_inc = stride/2; /* fill 4x4 block of pixels with colour values from codebooks */ for (y = 0; y < 4; y++) @@ -369,8 +390,9 @@ } typedef void (*fn_cvid_v1)(unsigned char *frm, unsigned char *limit, - int stride, cvid_codebook *cb); -typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, int stride, + int stride, BOOL inverted, cvid_codebook *cb); +typedef void (*fn_cvid_v4)(unsigned char *frm, unsigned char *limit, + int stride, BOOL inverted, cvid_codebook *cb0, cvid_codebook *cb1, cvid_codebook *cb2, cvid_codebook *cb3); @@ -380,33 +402,42 @@ * context - the context created by decode_cinepak_init(). * buf - the input buffer to be decoded * size - the size of the input buffer - * frame - the output frame buffer (24 or 32 bit per pixel) - * width - the width of the output frame - * height - the height of the output frame + * output - the output frame buffer (24 or 32 bit per pixel) + * out_width - the width of the output frame + * out_height - the height of the output frame * bit_per_pixel - the number of bits per pixel allocated to the output * frame (only 24 or 32 bpp are supported) + * inverted - if true the output frame is written top-down */ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, - unsigned char *frame, unsigned int width, unsigned int height, int bit_per_pixel) + unsigned char *output, unsigned int out_width, unsigned int out_height, int bit_per_pixel, BOOL inverted) { cvid_codebook *v4_codebook, *v1_codebook, *codebook = NULL; - unsigned long x, y, y_bottom, frame_flags, strips, cv_width, cv_height, - cnum, strip_id, chunk_id, x0, y0, x1, y1, ci, flag, mask; - long len, top_size, chunk_size; + unsigned long x, y, y_bottom, cnum, strip_id, chunk_id, + x0, y0, x1, y1, ci, flag, mask; + long top_size, chunk_size; unsigned char *frm_ptr; - unsigned int i, cur_strip; + unsigned int i, cur_strip, addr; int d0, d1, d2, d3, frm_stride, bpp = 3; fn_cvid_v1 cvid_v1 = cvid_v1_24; fn_cvid_v4 cvid_v4 = cvid_v4_24; + struct frame_header + { + unsigned char flags; + unsigned long length; + unsigned short width; + unsigned short height; + unsigned short strips; + } frame; y = 0; y_bottom = 0; in_buffer = buf; - frame_flags = get_byte(); - len = get_byte() << 16; - len |= get_byte() << 8; - len |= get_byte(); + frame.flags = get_byte(); + frame.length = get_byte() << 16; + frame.length |= get_byte() << 8; + frame.length |= get_byte(); switch(bit_per_pixel) { @@ -432,32 +463,32 @@ break; } - frm_stride = width * bpp; - frm_ptr = frame; - - if(len != size) - { - if(len & 0x01) len++; /* AVIs tend to have a size mismatch */ - if(len != size) + frm_stride = out_width * bpp; + frm_ptr = output; + + if(frame.length != size) + { + if(frame.length & 0x01) frame.length++; /* AVIs tend to have a size mismatch */ + if(frame.length != size) { - ERR("CVID: corruption %d (QT/AVI) != %ld (CV)\n", size, len); + ERR("CVID: corruption %d (QT/AVI) != %ld (CV)\n", size, frame.length); /* return; */ } } - cv_width = get_word(); - cv_height = get_word(); - strips = get_word(); - - if(strips > cvinfo->strip_num) - { - if(strips >= MAX_STRIPS) + frame.width = get_word(); + frame.height = get_word(); + frame.strips = get_word(); + + if(frame.strips > cvinfo->strip_num) + { + if(frame.strips >= MAX_STRIPS) { ERR("CVID: strip overflow (more than %d)\n", MAX_STRIPS); return; } - for(i = cvinfo->strip_num; i < strips; i++) + for(i = cvinfo->strip_num; i < frame.strips; i++) { if((cvinfo->v4_codebook[i] = heap_alloc(sizeof(cvid_codebook) * 260)) == NULL) { @@ -472,16 +503,17 @@ } } } - cvinfo->strip_num = strips; - - TRACE("CVID: <%ld,%ld> strips %ld\n", cv_width, cv_height, strips); - - for(cur_strip = 0; cur_strip < strips; cur_strip++) + cvinfo->strip_num = frame.strips; + + TRACE("CVID: %ux%u, strips %u, length %lu\n", + frame.width, frame.height, frame.strips, frame.length); + + for(cur_strip = 0; cur_strip < frame.strips; cur_strip++) { v4_codebook = cvinfo->v4_codebook[cur_strip]; v1_codebook = cvinfo->v1_codebook[cur_strip]; - if((cur_strip > 0) && (!(frame_flags & 0x01))) + if((cur_strip > 0) && (!(frame.flags & 0x01))) { memcpy(cvinfo->v4_codebook[cur_strip], cvinfo->v4_codebook[cur_strip-1], 260 * sizeof(cvid_codebook)); memcpy(cvinfo->v1_codebook[cur_strip], cvinfo->v1_codebook[cur_strip-1], 260 * sizeof(cvid_codebook)); @@ -497,8 +529,8 @@ y_bottom += y1; top_size -= 12; x = 0; - if(x1 != width) - WARN("CVID: Warning x1 (%ld) != width (%d)\n", x1, width); + if(x1 != out_width) + WARN("CVID: Warning x1 (%ld) != width (%d)\n", x1, out_width); TRACE(" %d) %04lx %04ld <%ld,%ld> <%ld,%ld> yt %ld\n", cur_strip, strip_id, top_size, x0, y0, x1, y1, y_bottom); @@ -596,24 +628,20 @@ d2 = get_byte(); d3 = get_byte(); chunk_size -= 4; -#ifdef ORIGINAL - cvid_v4(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3); -#else - cvid_v4(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3); -#endif + + addr = get_addr(inverted, x, y, frm_stride, bpp, out_height); + cvid_v4(frm_ptr + addr, output, frm_stride, inverted, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3); } else /* 1 byte per block */ { -#ifdef ORIGINAL - cvid_v1(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v1_codebook + get_byte()); -#else - cvid_v1(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v1_codebook + get_byte()); -#endif + addr = get_addr(inverted, x, y, frm_stride, bpp, out_height); + cvid_v1(frm_ptr + addr, output, frm_stride, inverted, v1_codebook + get_byte()); + chunk_size--; } x += 4; - if(x >= width) + if(x >= out_width) { x = 0; y += 4; @@ -652,26 +680,22 @@ d2 = get_byte(); d3 = get_byte(); chunk_size -= 4; -#ifdef ORIGINAL - cvid_v4(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3); -#else - cvid_v4(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3); -#endif + + addr = get_addr(inverted, x, y, frm_stride, bpp, out_height); + cvid_v4(frm_ptr + addr, output, frm_stride, inverted, v4_codebook+d0, v4_codebook+d1, v4_codebook+d2, v4_codebook+d3); } else /* V1 */ { chunk_size--; -#ifdef ORIGINAL - cvid_v1(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v1_codebook + get_byte()); -#else - cvid_v1(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v1_codebook + get_byte()); -#endif + + addr = get_addr(inverted, x, y, frm_stride, bpp, out_height); + cvid_v1(frm_ptr + addr, output, frm_stride, inverted, v1_codebook + get_byte()); } } /* else SKIP */ mask >>= 1; x += 4; - if(x >= width) + if(x >= out_width) { x = 0; y += 4; @@ -685,14 +709,12 @@ case 0x3200: /* each byte is a V1 codebook */ while((chunk_size > 0) && (y < y_bottom)) { -#ifdef ORIGINAL - cvid_v1(frm_ptr + (y * frm_stride + x * bpp), frm_end, frm_stride, v1_codebook + get_byte()); -#else - cvid_v1(frm_ptr + ((height - 1 - y) * frm_stride + x * bpp), frame, frm_stride, v1_codebook + get_byte()); -#endif + addr = get_addr(inverted, x, y, frm_stride, bpp, out_height); + cvid_v1(frm_ptr + addr, output, frm_stride, inverted, v1_codebook + get_byte()); + chunk_size--; x += 4; - if(x >= width) + if(x >= out_width) { x = 0; y += 4; @@ -709,10 +731,10 @@ } } - if(len != size) - { - if(len & 0x01) len++; /* AVIs tend to have a size mismatch */ - if(len != size) + if(frame.length != size) + { + if(frame.length & 0x01) frame.length++; /* AVIs tend to have a size mismatch */ + if(frame.length != size) { long xlen; skip_byte(); @@ -720,7 +742,7 @@ xlen |= get_byte() << 8; xlen |= get_byte(); /* Read Len */ WARN("CVID: END INFO chunk size %d cvid size1 %ld cvid size2 %ld\n", - size, len, xlen); + size, frame.length, xlen); } } } @@ -777,7 +799,11 @@ if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) return ICERR_BADFORMAT; if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_BADFORMAT; + { + if( in->bmiHeader.biHeight != -out->bmiHeader.biHeight ) + return ICERR_BADFORMAT; + TRACE("Detected inverted height for video output\n"); + } if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) return ICERR_BADFORMAT; @@ -869,6 +895,7 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD size ) { LONG width, height; + BOOL inverted; TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); @@ -882,9 +909,10 @@ width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; + inverted = -icd->lpbiOutput->biHeight == height; decode_cinepak(info->cvinfo, icd->lpInput, icd->lpbiInput->biSizeImage, - icd->lpOutput, width, height, info->bits_per_pixel); + icd->lpOutput, width, height, info->bits_per_pixel, inverted); return ICERR_OK; } @@ -892,6 +920,7 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWORD size ) { LONG width, height; + BOOL inverted; TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); @@ -907,9 +936,10 @@ width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; + inverted = -icd->lpbiDst->biHeight == height; decode_cinepak(info->cvinfo, icd->lpSrc, icd->lpbiSrc->biSizeImage, - icd->lpDst, width, height, info->bits_per_pixel); + icd->lpDst, width, height, info->bits_per_pixel, inverted); return ICERR_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] Fri Nov 20 10:39:43 2015 @@ -74,7 +74,7 @@ reactos/dll/win32/hlink # Synced to WineStaging-1.7.47 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55 reactos/dll/win32/httpapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/iccvid # Synced to WineStaging-1.7.47 +reactos/dll/win32/iccvid # Synced to WineStaging-1.7.55 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.55 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69955: [DWMAPI] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 10:37:54 2015 New Revision: 69955 URL: http://svn.reactos.org/svn/reactos?rev=69955&view=rev Log: [DWMAPI] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec trunk/reactos/dll/win32/dwmapi/dwmapi_main.c trunk/reactos/media/doc/README.WINE 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] Fri Nov 20 10:37:54 2015 @@ -42,4 +42,4 @@ @ stub DwmSetPresentParameters @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) -@ stub DwmUpdateThumbnailProperties +@ stdcall DwmUpdateThumbnailProperties(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] Fri Nov 20 10:37:54 2015 @@ -256,3 +256,12 @@ FIXME("(%p) stub\n", hwnd); return E_NOTIMPL; } + +/********************************************************************** + * DwmUpdateThumbnailProperties (DWMAPI.@) + */ +HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUMBNAIL_PROPERTIES *props) +{ + FIXME("(%p, %p) stub\n", thumbnail, props); + return E_NOTIMPL; +} 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] Fri Nov 20 10:37:54 2015 @@ -65,7 +65,7 @@ reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.47 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
46
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 November 2015