Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[dreimer] 61188: Update for 3rd Party Files.txt and syssetup.rc accordingly. CORE-7638 #resolve #comment Committed in r61188. Thanks

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Dec 1 19:11:56 2013 New Revision: 61188 URL: http://svn.reactos.org/svn/reactos?rev=61188&view=rev Log: Update for 3rd Party Files.txt and syssetup.rc accordingly. CORE-7638 #resolve #comment Committed in r61188. Thanks Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sun Dec 1 19:11:56 2013 @@ -24,7 +24,7 @@ STRINGTABLE BEGIN - IDS_ACKPROJECTS "Wine - http://www.winehq.org\nFreeType - http://www.freetype.org\nExpat - http://expat.sourceforge.net\nDJGPP - http://www.delorie.com/djgpp\nSYSLINUX - http://syslinux.zytor.com\nXbox Linux - http://www.xbox-linux.org\nMinGW - http://www.mingw.org\nBochs - http://bochs.sourceforge.net\nQEMU - http://fabrice.bellard.free.fr/qemu\nMesa3D - http://www.mesa3d.org\nFreeBSD - http://www.freebsd.org\nadns - http://adns.jgaa.com\nICU - http://www.icu-project.org/\nGraphApp - http://enchantia.com/software/graphapp/\nExt2 - http://winext2fsd.sourceforge.net/\nX - http://www.x.org/\n" + IDS_ACKPROJECTS "Wine - http://www.winehq.org\nFreeType - http://www.freetype.org\nSYSLINUX - http://syslinux.zytor.com\nMinGW - http://www.mingw.org\nBochs - http://bochs.sourceforge.net\nQEMU - http://fabrice.bellard.free.fr/qemu\nMesa3D - http://www.mesa3d.org\nadns - http://www.gnu.org/software/adns\nICU - http://www.icu-project.org/\nGraphApp - http://enchantia.com/software/graphapp/\nExt2 - http://winext2fsd.sourceforge.net/\nGNU FreeFont - http://savannah.gnu.org/projects/freefont/\nDejaVu Fonts - http://dejavu.sourceforge.net\nLiberation(tm) Fonts - https://fedorahosted.org/liberation-fonts/" END IDR_GPL RT_TEXT "COPYING" Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Sun Dec 1 19:11:56 2013 @@ -2,9 +2,9 @@ Other Things synched with other projects: -Title: RedHat Liberation Fonts -Used Version: 2.00 -Website: https://www.redhat.com/promo/fonts/ +Title: Liberation Fonts +Used Version: 2.00.1 +Website: https://fedorahosted.org/liberation-fonts/ Title: DejaVu Fonts Used Version: 2.34 @@ -19,24 +19,24 @@ Website: http://www.freetype.org Title: Mesa3D -Used Version: 7.4 +Used Version: 8.0.4 Website: http://www.mesa3d.org + +Title: Mesa3D glu libary +Used Version: 9.0 +Website: ftp://ftp.freedesktop.org/pub/mesa/glu/ Title: GNU adns Used Version: 1.0 REV 5 -Website: http://www.chiark.greenend.org.uk/~ian/adns | http://adns.jgaa.com +Website: http://www.gnu.org/software/adns/ | http://adns.jgaa.com Title: BZip2 -Used Version: 2.0.6 +Used Version: 1.0.6 Website: http://www.bzip.org - -Title: Expat -Used Version: 2.0 -Website: http://expat.sourceforge.net Title: LibXML Used Version: 2.9.0 -Website: http://xmlsoft.org +Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Title: ZLib Used Version: 1.2.8 @@ -45,3 +45,19 @@ Title: GNU FreeFont Used Version: 2012-05-03 Website: http://savannah.gnu.org/projects/freefont/ + +Title: CardLib +Used Version: 2005-07-14 +Website: http://www.catch22.net/tuts/cardlib + +Title: libsamplerate +Used Version: 0.1.8 +Website: http://www.mega-nerd.com/SRC/download.html + +Title: libmpg123 (used by winemp3.acm) +Used Version: 1.12.3 +Website: http://www.mpg123.de/ + +Title: STLport +Used Version: 5.2.1 +Website: http://stlport.sourceforge.net/

10 years, 9 months

[akhaldi] 61187: [README.WINE] * Update the status of schannel. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 16:24:04 2013 New Revision: 61187 URL: http://svn.reactos.org/svn/reactos?rev=61187&view=rev Log: [README.WINE] * Update the status of schannel. CORE-7469 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Dec 1 16:24:04 2013 @@ -169,7 +169,7 @@ reactos/dll/win32/rsabase # Synced to Wine-1.7.1 reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 reactos/dll/win32/sccbase # Synced to Wine-1.7.1 -reactos/dll/win32/schannel # Synced to Wine-1.5.19 +reactos/dll/win32/schannel # Synced to Wine-1.7.1 reactos/dll/win32/scrrun # Synced to Wine-1.7.1 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec)

10 years, 9 months

[akhaldi] 61186: [SCHANNEL_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 16:23:36 2013 New Revision: 61186 URL: http://svn.reactos.org/svn/reactos?rev=61186&view=rev Log: [SCHANNEL_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/schannel/CMakeLists.txt trunk/rostests/winetests/schannel/main.c trunk/rostests/winetests/schannel/testlist.c Modified: trunk/rostests/winetests/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/CMakeL… ============================================================================== --- trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] Sun Dec 1 16:23:36 2013 @@ -1,7 +1,5 @@ -add_definitions(-D__ROS_LONG64__) add_executable(schannel_winetest main.c testlist.c) -target_link_libraries(schannel_winetest wine) set_module_type(schannel_winetest win32cui) -add_importlibs(schannel_winetest msvcrt kernel32 ntdll) +add_importlibs(schannel_winetest msvcrt kernel32) add_cd_file(TARGET schannel_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/schannel/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/main.c… ============================================================================== --- trunk/rostests/winetests/schannel/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/main.c [iso-8859-1] Sun Dec 1 16:23:36 2013 @@ -216,8 +216,9 @@ if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || Modified: trunk/rostests/winetests/schannel/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/testli… ============================================================================== --- trunk/rostests/winetests/schannel/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/testlist.c [iso-8859-1] Sun Dec 1 16:23:36 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_main(void);

10 years, 9 months

[akhaldi] 61185: [PROPSYS_WINETEST] * Improve build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 16:17:22 2013 New Revision: 61185 URL: http://svn.reactos.org/svn/reactos?rev=61185&view=rev Log: [PROPSYS_WINETEST] * Improve build. Modified: trunk/rostests/winetests/propsys/CMakeLists.txt Modified: trunk/rostests/winetests/propsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/CMakeLi… ============================================================================== --- trunk/rostests/winetests/propsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/propsys/CMakeLists.txt [iso-8859-1] Sun Dec 1 16:17:22 2013 @@ -1,7 +1,5 @@ -add_definitions(-D__ROS_LONG64__) add_executable(propsys_winetest propstore.c propsys.c testlist.c) -target_link_libraries(propsys_winetest wine) set_module_type(propsys_winetest win32cui) add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32 ntdll) add_cd_file(TARGET propsys_winetest DESTINATION reactos/bin FOR all)

10 years, 9 months

[akhaldi] 61184: [PROPSYS] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 16:16:11 2013 New Revision: 61184 URL: http://svn.reactos.org/svn/reactos?rev=61184&view=rev Log: [PROPSYS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/propsys/CMakeLists.txt trunk/reactos/dll/win32/propsys/propsys_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/propsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/propsys/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/propsys/CMakeLists.txt [iso-8859-1] Sun Dec 1 16:16:11 2013 @@ -1,20 +1,17 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(propsys.dll propsys.spec ADD_IMPORTLIB) list(APPEND SOURCE propstore.c propsys_main.c propvar.c - propsys.rc ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/propsys.def) -add_library(propsys SHARED ${SOURCE}) +add_library(propsys SHARED ${SOURCE} propsys.rc) set_module_type(propsys win32dll) target_link_libraries(propsys uuid wine) add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll) -add_dependencies(propsys psdk) add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all) 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] Sun Dec 1 16:16:11 2013 @@ -54,10 +54,6 @@ propsys_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] Sun Dec 1 16:16:11 2013 @@ -156,7 +156,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.7.1 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.7.1 -reactos/dll/win32/propsys # Synced to Wine-1.5.26 +reactos/dll/win32/propsys # Synced to Wine-1.7.1 reactos/dll/win32/pstorec # Synced to Wine-1.7.1 reactos/dll/win32/qmgr # Synced to Wine-1.7.1 reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.1

10 years, 9 months

[akhaldi] 61183: [IMM32_WINETEST] * Improve build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 16:11:05 2013 New Revision: 61183 URL: http://svn.reactos.org/svn/reactos?rev=61183&view=rev Log: [IMM32_WINETEST] * Improve build. Modified: trunk/rostests/winetests/imm32/CMakeLists.txt trunk/rostests/winetests/imm32/testlist.c Modified: trunk/rostests/winetests/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/CMakeList… ============================================================================== --- trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] Sun Dec 1 16:11:05 2013 @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__ROS_LONG64__) add_executable(imm32_winetest imm32.c testlist.c) set_module_type(imm32_winetest win32cui) add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32) Modified: trunk/rostests/winetests/imm32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/testlist.… ============================================================================== --- trunk/rostests/winetests/imm32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/testlist.c [iso-8859-1] Sun Dec 1 16:11:05 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_imm32(void);

10 years, 9 months

[akhaldi] 61182: [IMM32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 15:57:54 2013 New Revision: 61182 URL: http://svn.reactos.org/svn/reactos?rev=61182&view=rev Log: [IMM32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/imm32/CMakeLists.txt trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/CMakeList… ============================================================================== --- trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] Sun Dec 1 15:57:54 2013 @@ -1,10 +1,7 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__ROS_LONG64__) add_executable(imm32_winetest imm32.c testlist.c) -target_link_libraries(imm32_winetest wine) set_module_type(imm32_winetest win32cui) -add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32 ntdll) +add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32) add_cd_file(TARGET imm32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Sun Dec 1 15:57:54 2013 @@ -24,11 +24,13 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" +#include "ddk/imm.h" #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); /* * msgspy - record and analyse message traces sent to a certain window @@ -45,6 +47,19 @@ imm_msgs msgs[32]; unsigned int i_msg; } msg_spy; + +typedef struct +{ + DWORD type; + union + { + MOUSEINPUT mi; + KEYBDINPUT ki; + HARDWAREINPUT hi; + } u; +} TEST_INPUT; + +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) { @@ -169,11 +184,13 @@ static BOOL init(void) { WNDCLASSEX wc; HIMC imc; - HMODULE hmod; + HMODULE hmod,huser; hmod = GetModuleHandleA("imm32.dll"); + huser = GetModuleHandleA("user32"); pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); + pSendInput = (void*)GetProcAddress(huser, "SendInput"); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -671,6 +688,152 @@ DestroyWindow(hwnd); } +static void test_ImmGetIMCLockCount(void) +{ + HIMC imc; + DWORD count, ret, i; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMC(imc); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMC(imc); + ok(ret == TRUE, "expect TRUE, ret %d\n", ret); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT * 2; i++) + { + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + } + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT - 1; i++) + ImmUnlockIMC(imc); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 1, "expect 1, returned %d\n", count); + ImmUnlockIMC(imc); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + + ImmDestroyContext(imc); +} + +static void test_ImmGetIMCCLockCount(void) +{ + HIMCC imcc; + DWORD count, g_count, ret, i; + VOID *p; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + ImmLockIMCC(imcc); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmUnlockIMCC(imcc); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + ret = ImmUnlockIMCC(imcc); + ok(ret == FALSE, "expect FALSE, ret %d\n", ret); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + + p = ImmLockIMCC(imcc); + ok(GlobalHandle(p) == imcc, "expect %p, returned %p\n", imcc, GlobalHandle(p)); + + for (i = 0; i < GMEM_LOCKCOUNT * 2; i++) + { + ImmLockIMCC(imcc); + count = ImmGetIMCCLockCount(imcc); + g_count = GlobalFlags(imcc) & GMEM_LOCKCOUNT; + ok(count == g_count, "count %d, g_count %d\n", count, g_count); + } + count = ImmGetIMCCLockCount(imcc); + ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT - 1; i++) + GlobalUnlock(imcc); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + GlobalUnlock(imcc); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + + ImmDestroyIMCC(imcc); +} + +static void test_ImmDestroyContext(void) +{ + HIMC imc; + DWORD ret, count; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmDestroyContext(imc); + ok(ret == TRUE, "Destroy a locked IMC should success!\n"); + ic = ImmLockIMC(imc); + todo_wine ok(ic == NULL, "Lock a destroyed IMC should fail!\n"); + ret = ImmUnlockIMC(imc); + todo_wine ok(ret == FALSE, "Unlock a destroyed IMC should fail!\n"); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "Get lock count of a destroyed IMC should return 0!\n"); + SetLastError(0xdeadbeef); + ret = ImmDestroyContext(imc); + todo_wine ok(ret == FALSE, "Destroy a destroyed IMC should fail!\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + +static void test_ImmDestroyIMCC(void) +{ + HIMCC imcc; + DWORD ret, count, size; + VOID *p; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + p = ImmLockIMCC(imcc); + ok(p != NULL, "ImmLockIMCC failed!\n"); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + size = ImmGetIMCCSize(imcc); + ok(size == sizeof(CANDIDATEINFO), "returned %d\n", size); + p = ImmDestroyIMCC(imcc); + ok(p == NULL, "Destroy a locked IMCC should success!\n"); + p = ImmLockIMCC(imcc); + ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); + ret = ImmUnlockIMCC(imcc); + ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); + size = ImmGetIMCCSize(imcc); + ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); + SetLastError(0xdeadbeef); + p = ImmDestroyIMCC(imcc); + ok(p != NULL, "returned NULL\n"); + ret = GetLastError(); + ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -699,6 +862,122 @@ ImmSetOpenStatus(imc, FALSE); ImmReleaseContext(hwnd, imc); DestroyWindow(hwnd); +} + +static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam ) +{ + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +static void test_ime_processkey(void) +{ + WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; + WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; + + MSG msg; + WNDCLASSW wclass; + HANDLE hInstance = GetModuleHandleW(NULL); + TEST_INPUT inputs[2]; + HIMC imc; + INT rc; + HWND hWndTest; + + wclass.lpszClassName = classNameW; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = processkey_wnd_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIcon(0, IDI_APPLICATION); + wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + if(!RegisterClassW(&wclass)){ + win_skip("Failed to register window.\n"); + return; + } + + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + + ShowWindow(hWndTest, SW_SHOW); + SetWindowPos(hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hWndTest); + UpdateWindow(hWndTest); + + imc = ImmGetContext(hWndTest); + if (!imc) + { + win_skip("IME not supported\n"); + DestroyWindow(hWndTest); + return; + } + + rc = ImmSetOpenStatus(imc, TRUE); + if (rc != TRUE) + { + win_skip("Unable to open IME\n"); + ImmReleaseContext(hWndTest, imc); + DestroyWindow(hWndTest); + return; + } + + /* flush pending messages */ + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); + + SetFocus(hWndTest); + + /* init input data that never changes */ + inputs[1].type = inputs[0].type = INPUT_KEYBOARD; + inputs[1].u.ki.dwExtraInfo = inputs[0].u.ki.dwExtraInfo = 0; + inputs[1].u.ki.time = inputs[0].u.ki.time = 0; + + /* Pressing a key */ + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = 0x0; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYDOWN) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + if(msg.wParam == VK_PROCESSKEY) + trace("ProcessKey was correctly found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYUP) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + ok(msg.wParam != VK_PROCESSKEY,"ProcessKey should still not be Found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + ImmReleaseContext(hWndTest, imc); + ImmSetOpenStatus(imc, FALSE); + DestroyWindow(hWndTest); } START_TEST(imm32) { @@ -714,11 +993,18 @@ test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_ImmGetIMCLockCount(); + test_ImmGetIMCCLockCount(); + test_ImmDestroyContext(); + test_ImmDestroyIMCC(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL); test_ImmMessages(); msg_spy_cleanup(); + if (pSendInput) + test_ime_processkey(); + else win_skip("SendInput is not available\n"); } cleanup(); }

10 years, 9 months

[akhaldi] 61181: [IMM32] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 15:57:34 2013 New Revision: 61181 URL: http://svn.reactos.org/svn/reactos?rev=61181&view=rev Log: [IMM32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/CMakeLists.txt [iso-8859-1] Sun Dec 1 15:57:34 2013 @@ -1,10 +1,9 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(imm32.dll imm32.spec ADD_IMPORTLIB) @@ -13,9 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) -add_library(imm32 SHARED - ${SOURCE} - version.rc) +add_library(imm32 SHARED ${SOURCE} version.rc) if(MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Sun Dec 1 15:57:34 2013 @@ -37,12 +37,6 @@ #include <wine/list.h> WINE_DEFAULT_DEBUG_CHANNEL(imm); - -typedef struct tagIMCCInternal -{ - DWORD dwLock; - DWORD dwSize; -} IMCCInternal; #define MAKE_FUNCPTR(f) typeof(f) * p##f typedef struct _tagImmHkl{ @@ -413,6 +407,7 @@ IMM_FreeThreadData(); break; case DLL_PROCESS_DETACH: + if (lpReserved) break; IMM_FreeThreadData(); IMM_FreeAllImmHkl(); TlsFree(tlsIndex); @@ -2632,8 +2627,9 @@ BOOL WINAPI ImmUnlockIMC(HIMC hIMC) { InputContextData *data = hIMC; - data->dwLock--; - return (data->dwLock!=0); + if (data->dwLock) + data->dwLock--; + return TRUE; } /*********************************************************************** @@ -2650,15 +2646,7 @@ */ HIMCC WINAPI ImmCreateIMCC(DWORD size) { - IMCCInternal *internal; - int real_size = size + sizeof(IMCCInternal); - - internal = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, real_size); - if (internal == NULL) - return NULL; - - internal->dwSize = size; - return internal; + return GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE, size); } /*********************************************************************** @@ -2666,8 +2654,7 @@ */ HIMCC WINAPI ImmDestroyIMCC(HIMCC block) { - HeapFree(GetProcessHeap(),0,block); - return NULL; + return GlobalFree(block); } /*********************************************************************** @@ -2675,11 +2662,7 @@ */ LPVOID WINAPI ImmLockIMCC(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - internal->dwLock ++; - return internal + 1; + return GlobalLock(imcc); } /*********************************************************************** @@ -2687,11 +2670,7 @@ */ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - internal->dwLock --; - return (internal->dwLock!=0); + return GlobalUnlock(imcc); } /*********************************************************************** @@ -2699,10 +2678,7 @@ */ DWORD WINAPI ImmGetIMCCLockCount(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - return internal->dwLock; + return GlobalFlags(imcc) & GMEM_LOCKCOUNT; } /*********************************************************************** @@ -2710,15 +2686,7 @@ */ HIMCC WINAPI ImmReSizeIMCC(HIMCC imcc, DWORD size) { - IMCCInternal *internal,*newone; - int real_size = size + sizeof(IMCCInternal); - - internal = imcc; - - newone = HeapReAlloc(GetProcessHeap(), 0, internal, real_size); - newone->dwSize = size; - - return newone; + return GlobalReAlloc(imcc, size, GMEM_ZEROINIT | GMEM_MOVEABLE); } /*********************************************************************** @@ -2726,10 +2694,7 @@ */ DWORD WINAPI ImmGetIMCCSize(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - return internal->dwSize; + return GlobalSize(imcc); } /*********************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Dec 1 15:57:34 2013 @@ -84,7 +84,7 @@ reactos/dll/win32/ieframe # Synced to Wine-1.7.1 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.1 reactos/dll/win32/imagehlp # Synced to Wine-1.7.1 -reactos/dll/win32/imm32 # Synced to Wine-1.5.19 +reactos/dll/win32/imm32 # Synced to Wine-1.7.1 reactos/dll/win32/inetcomm # Synced to Wine-1.7.1 reactos/dll/win32/inetmib1 # Synced to Wine-1.7.1 reactos/dll/win32/initpki # Synced to Wine-1.7.1

10 years, 9 months

[ekohl] 61180: [BOOTDATA] Add registry entries for certain file types. Patch by Lee Schroeder. CORE-7513 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 1 15:20:52 2013 New Revision: 61180 URL: http://svn.reactos.org/svn/reactos?rev=61180&view=rev Log: [BOOTDATA] Add registry entries for certain file types. Patch by Lee Schroeder. CORE-7513 #resolve Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sun Dec 1 15:20:52 2013 @@ -73,6 +73,7 @@ HKCR,"cplfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel" HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" +HKCR,"cplfile\shell\runas\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLLAsUser %1,%*" ; Cursors HKCR,".cur","",0x00000000,"curfile" @@ -98,6 +99,7 @@ HKCR,"exefile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-165" HKCR,"exefile\Defaulticon","",0x00000000,"%1" HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" +HKCR,"exefile\shell\runas\command","",0x00020000,"""%1"" %*" ; Fonts HKCR,".fon","",0x00000000,"fonfile" @@ -167,6 +169,7 @@ HKCR,"inifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-169" HKCR,"inifile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" HKCR,"inifile\shell\open\command","",0x00000000,"notepad.exe ""%1""" +HKCR,"inifile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" ; Setup Information Files HKCR,".inf","",0x00000000,"inffile" @@ -204,6 +207,7 @@ HKCR,".txt","Content Type",0x00000000,"text/plain" HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152" HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"txtfile\shell\print\command","",0x00000000,"notepad.exe /p ""%1""" ; XML Documents HKCR,".xml","",0x00000000,"xmlfile"

10 years, 9 months

[akhaldi] 61179: [VGAFONTS] * Add a VGA Font for Codepage 857 (Turkish). By Erdem Ersoy. CORE-7449 #resolve #comment Committed in r61179. Thanks.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 1 15:12:01 2013 New Revision: 61179 URL: http://svn.reactos.org/svn/reactos?rev=61179&view=rev Log: [VGAFONTS] * Add a VGA Font for Codepage 857 (Turkish). By Erdem Ersoy. CORE-7449 #resolve #comment Committed in r61179. Thanks. Added: trunk/reactos/media/vgafonts/857-8x8.bin (with props) Modified: trunk/reactos/media/vgafonts/CMakeLists.txt Added: trunk/reactos/media/vgafonts/857-8x8.bin URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/857-8x8.bin… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/vgafonts/857-8x8.bin ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/CMakeLists.… ============================================================================== --- trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] Sun Dec 1 15:12:01 2013 @@ -5,12 +5,12 @@ ${CMAKE_CURRENT_SOURCE_DIR}/775-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/850-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/852-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/857-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/862-8x8.bin - ${CMAKE_CURRENT_SOURCE_DIR}/865-8x8.bin + ${CMAKE_CURRENT_SOURCE_DIR}/865-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/866-8x8.bin ${CMAKE_CURRENT_SOURCE_DIR}/932-8x8.bin ) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab COMMAND native-cabman -M raw -S ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab ${SOURCE} DEPENDS ${SOURCE} native-cabman)

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2013