Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[phater] 73053: Fix build
by phater＠svn.reactos.org 28 Oct '16

28 Oct '16

Author: phater Date: Fri Oct 28 07:11:20 2016 New Revision: 73053 URL: http://svn.reactos.org/svn/reactos?rev=73053&view=rev Log: Fix build Modified: trunk/rostests/apitests/ws2_32/WSAAsync.c Modified: trunk/rostests/apitests/ws2_32/WSAAsync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAAsync.… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAAsync.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/WSAAsync.c [iso-8859-1] Fri Oct 28 07:11:20 2016 @@ -139,7 +139,7 @@ { addrsize = sizeof(addr_remote); sockaccept = accept(fSockets[dwWait - WAIT_OBJECT_0], (struct sockaddr*)&addr_remote, &addrsize); - ok(sockaccept != INVALID_SOCKET, "ERROR: Connection accept function failed, error %ld\n", WSAGetLastError()); + ok(sockaccept != INVALID_SOCKET, "ERROR: Connection accept function failed, error %d\n", WSAGetLastError()); dwFlags |= FD_ACCEPT; } }

1 0

[phater] 73052: [WS2_32_APITESTS] Add tests for WSAAsync original by Miroslav Mastný. Converted to api test by me. CORE-12152 #resolve #comment Thanks
by phater＠svn.reactos.org 28 Oct '16

28 Oct '16

Author: phater Date: Fri Oct 28 07:01:16 2016 New Revision: 73052 URL: http://svn.reactos.org/svn/reactos?rev=73052&view=rev Log: [WS2_32_APITESTS] Add tests for WSAAsync original by Miroslav Mastný. Converted to api test by me. CORE-12152 #resolve #comment Thanks Added: trunk/rostests/apitests/ws2_32/WSAAsync.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Fri Oct 28 07:01:16 2016 @@ -9,6 +9,7 @@ nostartup.c recv.c send.c + WSAAsync.c WSAIoctl.c WSARecv.c WSAStartup.c Added: trunk/rostests/apitests/ws2_32/WSAAsync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAAsync.… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAAsync.c (added) +++ trunk/rostests/apitests/ws2_32/WSAAsync.c [iso-8859-1] Fri Oct 28 07:01:16 2016 @@ -0,0 +1,167 @@ +/* +* PROJECT: ReactOS api tests +* LICENSE: GPL - See COPYING in the top level directory +* PURPOSE: Test for WSAAsync +* PROGRAMMERS: Miroslav Mastny +*/ + +#include <apitest.h> + +#include <stdio.h> +#include <windows.h> +#include <winsock2.h> + +#define SVR_PORT 5000 +#define WAIT_TIMEOUT_ 10000 +#define EXIT_FLAGS (FD_ACCEPT|FD_CONNECT) + +START_TEST(WSAAsync) +{ + WSADATA WsaData; + SOCKET ServerSocket = INVALID_SOCKET, + ClientSocket = INVALID_SOCKET; + WSAEVENT ServerEvent = WSA_INVALID_EVENT, + ClientEvent = WSA_INVALID_EVENT; + struct hostent *ent = NULL; + struct sockaddr_in server_addr_in; + struct sockaddr_in addr_remote; + struct sockaddr_in addr_con_loc; + int nConRes; + int addrsize, len; + WSAEVENT fEvents[2]; + SOCKET fSockets[2]; + SOCKET sockaccept; + WSANETWORKEVENTS WsaNetworkEvents; + ULONG ulValue = 1; + DWORD dwWait; + DWORD dwFlags = 0; + + if (WSAStartup(MAKEWORD(2, 2), &WsaData) != 0) + { + skip("WSAStartup failed\n"); + return; + } + + ServerSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ClientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ServerEvent = WSACreateEvent(); + ClientEvent = WSACreateEvent(); + + if (ServerSocket == INVALID_SOCKET) + { + skip("ERROR: Server socket creation failed\n"); + return; + } + if (ClientSocket == INVALID_SOCKET) + { + skip("ERROR: Client socket creation failed\n"); + closesocket(ServerSocket); + return; + } + if (ServerEvent == WSA_INVALID_EVENT) + { + skip("ERROR: Server WSAEvent creation failed\n"); + closesocket(ClientSocket); + closesocket(ServerSocket); + return; + } + if (ClientEvent == WSA_INVALID_EVENT) + { + skip("ERROR: Client WSAEvent creation failed\n"); + WSACloseEvent(ServerEvent); + closesocket(ClientSocket); + closesocket(ServerSocket); + return; + } + ent = gethostbyname("127.0.0.1"); + if (ent == NULL) + { + ok(ent != NULL, "ERROR: gethostbyname '127.0.0.1' failed, trying 'localhost'\n"); + ent = gethostbyname("localhost"); + + if (ent == NULL) + { + skip("ERROR: gethostbyname 'localhost' failed\n"); + goto done; + } + } + + server_addr_in.sin_family = AF_INET; + server_addr_in.sin_port = htons(SVR_PORT); + memcpy(&server_addr_in.sin_addr.S_un.S_addr, ent->h_addr_list[0], 4); + + // server inialialization + trace("Initializing server and client connections ...\n"); + ok(bind(ServerSocket, (struct sockaddr*)&server_addr_in, sizeof(server_addr_in)) == 0, "ERROR: server bind failed\n"); + ok(ioctlsocket(ServerSocket, FIONBIO, &ulValue) == 0, "ERROR: server ioctlsocket FIONBIO failed\n"); + ok(WSAEventSelect(ServerSocket, ServerEvent, FD_ACCEPT | FD_CLOSE) == 0, "ERROR: server accept EventSelect failed\n"); + + // client inialialization + ok(WSAEventSelect(ClientSocket, ClientEvent, FD_CONNECT | FD_CLOSE) == 0, "ERROR: client EventSelect failed\n"); + ok(ioctlsocket(ClientSocket, FIONBIO, &ulValue) == 0, "ERROR: client ioctlsocket FIONBIO failed\n"); + + // listen + trace("Starting server listening mode ...\n"); + ok(listen(ServerSocket, SOMAXCONN) == 0, "ERROR: cannot initialize server listen\n"); + + trace("Starting client to server connection ...\n"); + // connect + nConRes = connect(ClientSocket, (struct sockaddr*)&server_addr_in, sizeof(server_addr_in)); + ok(nConRes == SOCKET_ERROR, "ERROR: client connect() result is not SOCKET_ERROR\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "ERROR: client connect() last error is not WSAEWOULDBLOCK\n"); + + fSockets[0] = ServerSocket; + fSockets[1] = ClientSocket; + + fEvents[0] = ServerEvent; + fEvents[1] = ClientEvent; + + while (dwFlags != EXIT_FLAGS) + { + dwWait = WaitForMultipleObjects(2, fEvents, FALSE, WAIT_TIMEOUT_); + + ok(dwWait == WAIT_OBJECT_0 || // server socket event + dwWait == WAIT_OBJECT_0+1, // client socket event + "Unknown event received %ld\n", dwWait); + if (dwWait != WAIT_OBJECT_0 && dwWait != WAIT_OBJECT_0+1) + { + skip("ERROR: Connection timeout\n"); + break; + } + + WSAEnumNetworkEvents(fSockets[dwWait-WAIT_OBJECT_0], fEvents[dwWait-WAIT_OBJECT_0], &WsaNetworkEvents); + + if ((WsaNetworkEvents.lNetworkEvents & FD_ACCEPT) != 0) + {// connection accepted + trace("Event FD_ACCEPT...\n"); + ok(WsaNetworkEvents.iErrorCode[FD_ACCEPT_BIT] == 0, "Error on accept %d\n", WsaNetworkEvents.iErrorCode[FD_ACCEPT_BIT]); + if (WsaNetworkEvents.iErrorCode[FD_ACCEPT_BIT] == 0) + { + addrsize = sizeof(addr_remote); + sockaccept = accept(fSockets[dwWait - WAIT_OBJECT_0], (struct sockaddr*)&addr_remote, &addrsize); + ok(sockaccept != INVALID_SOCKET, "ERROR: Connection accept function failed, error %ld\n", WSAGetLastError()); + dwFlags |= FD_ACCEPT; + } + } + + if ((WsaNetworkEvents.lNetworkEvents & FD_CONNECT) != 0) + {// client connected + trace("Event FD_CONNECT...\n"); + ok(WsaNetworkEvents.iErrorCode[FD_CONNECT_BIT] == 0, "Error on connect %d\n", WsaNetworkEvents.iErrorCode[FD_CONNECT_BIT]); + if (WsaNetworkEvents.iErrorCode[FD_CONNECT_BIT] == 0) + { + len = sizeof(addr_con_loc); + ok(getsockname(fSockets[dwWait - WAIT_OBJECT_0], (struct sockaddr*)&addr_con_loc, &len) == 0, "\n"); + dwFlags |= FD_CONNECT; + } + } + } + +done: + WSACloseEvent(ServerEvent); + WSACloseEvent(ClientEvent); + closesocket(ServerSocket); + closesocket(ClientSocket); + + WSACleanup(); +} Propchange: trunk/rostests/apitests/ws2_32/WSAAsync.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Fri Oct 28 07:01:16 2016 @@ -11,6 +11,7 @@ extern void func_nostartup(void); extern void func_recv(void); extern void func_send(void); +extern void func_WSAAsync(void); extern void func_WSAIoctl(void); extern void func_WSARecv(void); extern void func_WSAStartup(void); @@ -25,6 +26,7 @@ { "nostartup", func_nostartup }, { "recv", func_recv }, { "send", func_send }, + { "WSAAsync", func_WSAAsync }, { "WSAIoctl", func_WSAIoctl }, { "WSARecv", func_WSARecv }, { "WSAStartup", func_WSAStartup },

1 0

[cfinck] 73051: [MKISOFS] Import a minimal version of the highly portable mkisofs tool from schily-2016-10-27 (https://sf.net/projects/schilytools) and use it for creating ReactOS ISOs from now on....
by cfinck＠svn.reactos.org 27 Oct '16

27 Oct '16

Author: cfinck Date: Thu Oct 27 22:51:59 2016 New Revision: 73051 URL: http://svn.reactos.org/svn/reactos?rev=73051&view=rev Log: [MKISOFS] Import a minimal version of the highly portable mkisofs tool from schily-2016-10-27 (https://sf.net/projects/schilytools) and use it for creating ReactOS ISOs from now on. mkisofs is the de-facto standard ISO creation tool on most platforms and actively maintained. Compared to cdmake, its features have matured and it adds ISO9660:1999 support among many other things. I can import its UDF features as soon as we need them. mkisofs has been integrated into our buildsystem in the sdk/tools/mkisofs folder with these subfolders: * "reactos" Host-specific include files that are usually generated by the upstream buildsystem. For us, I have handcrafted them to be enough for mkisofs and compatible with Windows, Linux and Mac OS X. Follow the original layout of the generated files whenever you have to edit these. * "schilytools" Contains the actual mkisofs code and dependencies while maintaining the original directory layout. Only synchronize with newer versions, but never modify. Submit patches upstream instead :) ISOs are now being built with a single ISO9660:1999 filesystem instead of classic ISO9660 + Joliet. For the moment, you can switch back to cdmake using -DUSE_MKISOFS:BOOL=0 on the CMake commandline. cdmake will be completely removed in about a month if no problems occur. CORE-11988 Added: trunk/reactos/sdk/tools/mkisofs/ trunk/reactos/sdk/tools/mkisofs/CMakeLists.txt (with props) trunk/reactos/sdk/tools/mkisofs/reactos/ trunk/reactos/sdk/tools/mkisofs/reactos/align.h (with props) trunk/reactos/sdk/tools/mkisofs/reactos/avoffset.h (with props) trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/ trunk/reactos/sdk/tools/mkisofs/schilytools/CDDL.Schily.txt (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/ trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/ trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/ trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/align.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/archdefs.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/avoffset.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/btorder.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/ccomdefs.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/checkerr.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/ctype.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/device.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/dirent.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/dlfcn.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/errno.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/fcntl.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/float.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/fnmatch.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/getargs.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/iconv.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/intcvt.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/inttypes.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/io.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/libport.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/limits.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/locale.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/math.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/maxpath.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/mconfig.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/nlsdefs.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/param.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/patmatch.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/prototyp.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/siconv.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/sigblk.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/standard.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stat.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stdint.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stdio.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stdlib.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/string.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/time.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/types.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/unistd.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/utypes.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/varargs.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/wchar.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/wctype.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/windows.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/xconfig.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/ trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/astoll.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/checkerr.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/comerr.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/eaccess.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/error.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/fconv.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/fillbytes.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/fnmatch.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/format.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/getargs.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/geterrno.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/getexecpath.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/gettimeofday.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/gid.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/jsprintf.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/jssnprintf.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/match.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/mem.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/movebytes.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/raisecond.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/saveargs.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/searchinpath.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/seterrno.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/ trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/cvmod.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/dat.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/fcons.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/ffileread.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/fgetline.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/fileopen.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/filewrite.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/flag.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/niwrite.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/schilyio.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/streql.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/strlcat.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/strlcpy.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/uid.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/zerobytes.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/libsiconv/ trunk/reactos/sdk/tools/mkisofs/schilytools/libsiconv/sic_nls.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/ trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/boot.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/bootinfo.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/defaults.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/diskmbr.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/eltorito.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/hash.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/inode.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/iso9660.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/isonum.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/joliet.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/match.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/match.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/multi.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/name.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/rock.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/rock.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/scsi.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/stream.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/sunlabel.h (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/tree.c (with props) trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/write.c (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/boot/CMakeLists.txt trunk/reactos/sdk/cmake/host-tools.cmake trunk/reactos/sdk/tools/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=73051&r… Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=73… Modified: trunk/reactos/sdk/cmake/host-tools.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/host-tools.cmake… Modified: trunk/reactos/sdk/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/CMakeLists.txt?r… Added: trunk/reactos/sdk/tools/mkisofs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/CMakeLis… Added: trunk/reactos/sdk/tools/mkisofs/reactos/align.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/reactos/… Added: trunk/reactos/sdk/tools/mkisofs/reactos/avoffset.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/reactos/… Added: trunk/reactos/sdk/tools/mkisofs/reactos/xconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/reactos/… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/CDDL.Schily.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/cdrecord/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/align.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/archdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/avoffset.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/btorder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/ccomdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/checkerr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/dirent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/dlfcn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/fnmatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/getargs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/iconv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/intcvt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/inttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/libport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/maxpath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/mconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/nlsdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/param.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/patmatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/prototyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/schily.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/siconv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/sigblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/standard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/utypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/varargs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/include/schily/xconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/astoll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/checkerr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/comerr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/dirent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/eaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/fconv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/fillbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/fnmatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/geterrno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/getexecpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/gettimeofday.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/gid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/jsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/jssnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/match.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/movebytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/raisecond.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/saveargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/searchinpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/seterrno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/cvmod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/dat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/fcons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/ffileread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/fgetline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/fileopen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/filewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/flag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/niwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/stdio/schilyio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/streql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/strlcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/strlcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/uid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libschily/zerobytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/libsiconv/sic_nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/bootinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/defaults.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/diskmbr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/eltorito.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/inode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/iso9660.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/isonum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/joliet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/match.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/match.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/mkisofs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/multi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/rock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/rock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/sunlabel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto… Added: trunk/reactos/sdk/tools/mkisofs/schilytools/mkisofs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkisofs/schilyto…

1 0

[tfaber] 73050: [PROGMAN] - Fix MSVC warnings - Use strsafe printf
by tfaber＠svn.reactos.org 27 Oct '16

27 Oct '16

Author: tfaber Date: Thu Oct 27 10:21:13 2016 New Revision: 73050 URL: http://svn.reactos.org/svn/reactos?rev=73050&view=rev Log: [PROGMAN] - Fix MSVC warnings - Use strsafe printf Modified: trunk/reactos/base/shell/progman/dialog.c trunk/reactos/base/shell/progman/group.c trunk/reactos/base/shell/progman/main.c trunk/reactos/base/shell/progman/progman.h Modified: trunk/reactos/base/shell/progman/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/dialog.… ============================================================================== --- trunk/reactos/base/shell/progman/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/dialog.c [iso-8859-1] Thu Oct 27 10:21:13 2016 @@ -32,7 +32,6 @@ */ #include "progman.h" -#include <strsafe.h> #include <commdlg.h> @@ -514,7 +513,7 @@ WCHAR szName[100]; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u", lpszName); + StringCbPrintfW(szName, sizeof(szName), L"%u", (unsigned)(UINT_PTR)lpszName); else StringCbCopyW(szName, sizeof(szName), lpszName); Modified: trunk/reactos/base/shell/progman/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/group.c… ============================================================================== --- trunk/reactos/base/shell/progman/group.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/group.c [iso-8859-1] Thu Oct 27 10:21:13 2016 @@ -463,7 +463,7 @@ &WndPl.rcNormalPosition.top, &WndPl.rcNormalPosition.right, &WndPl.rcNormalPosition.bottom, - &WndPl.ptMinPosition, + &WndPl.ptMinPosition.x, &WndPl.ptMinPosition.y, &WndPl.showCmd, &skip) == 7) Modified: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… ============================================================================== --- trunk/reactos/base/shell/progman/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/main.c [iso-8859-1] Thu Oct 27 10:21:13 2016 @@ -306,7 +306,7 @@ caption = Alloc(HEAP_ZERO_MEMORY, size); if (caption) { - swprintf(caption, L"%s - %s\\%s", szTitle, lpDomainName, lpUserName); + StringCbPrintfW(caption, size, L"%s - %s\\%s", szTitle, lpDomainName, lpUserName); SetWindowTextW(Globals.hMainWnd, caption); Free(caption); } @@ -582,12 +582,13 @@ WndPl.length = sizeof(WndPl); GetWindowPlacement(Globals.hMainWnd, &WndPl); - swprintf(buffer, L"%d %d %d %d %d", - WndPl.rcNormalPosition.left, - WndPl.rcNormalPosition.top, - WndPl.rcNormalPosition.right, - WndPl.rcNormalPosition.bottom, - WndPl.showCmd); + StringCbPrintfW(buffer, sizeof(buffer), + L"%d %d %d %d %d", + WndPl.rcNormalPosition.left, + WndPl.rcNormalPosition.top, + WndPl.rcNormalPosition.right, + WndPl.rcNormalPosition.bottom, + WndPl.showCmd); dwSize = wcslen(buffer) * sizeof(WCHAR); RegSetValueExW(Globals.hKeyPMSettings, L"Window", 0, REG_SZ, (LPBYTE)buffer, dwSize); Modified: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.h [iso-8859-1] Thu Oct 27 10:21:13 2016 @@ -48,6 +48,7 @@ #include <richedit.h> #include <windowsx.h> +#include <strsafe.h> #define MAX_STRING_LEN 255 #define MAX_PATHNAME_LEN 1024

1 0

[hbelusca] 73049: [DESK.CPL]: Fix "antiali(a)sed" typo, caught by DopefishJustin; complete the other translations.
by hbelusca＠svn.reactos.org 27 Oct '16

27 Oct '16

Author: hbelusca Date: Thu Oct 27 00:07:29 2016 New Revision: 73049 URL: http://svn.reactos.org/svn/reactos?rev=73049&view=rev Log: [DESK.CPL]: Fix "antiali(a)sed" typo, caught by DopefishJustin; complete the other translations. Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pt-BR.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/lang/zh-TW.rc Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÐÐ±Ð¸ÑÐ°ÐµÐ½" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -184,7 +184,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "StandardnÃ" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "AnticrÃ©nelage FreeType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "×¨×××" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ã¹ã¿ã³ãã¼ã" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standaard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Vanlig" - IDS_CLEARTYPEEFFECT "Klartype" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -187,7 +187,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standardowe" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pt-BR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "PadrÃ£o" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -183,7 +183,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÐÐ±ÑÑÐ½ÑÐ¹" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Å tandardnÃ¡" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -182,7 +182,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standart" - IDS_CLEARTYPEEFFECT "Tip Paster" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÃlÃ§Ã¼nlÃ¼" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -186,7 +186,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -185,7 +185,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "æ å" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-TW.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] Thu Oct 27 00:07:29 2016 @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "æ¨æº" - IDS_CLEARTYPEEFFECT "FreeType Antialised" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" END STRINGTABLE

1 0

[hbelusca] 73048: [README.WINE]: After Colin's print merging in r73039, some files are not WINE-synced anymore: localspl, spoolss; ntprint is completely removed now (will be reimplemented later on)...
by hbelusca＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: hbelusca Date: Wed Oct 26 22:54:05 2016 New Revision: 73048 URL: http://svn.reactos.org/svn/reactos?rev=73048&view=rev Log: [README.WINE]: After Colin's print merging in r73039, some files are not WINE-synced anymore: localspl, spoolss; ntprint is completely removed now (will be reimplemented later on). The only remaining file is localui.dll, that is now found under win32ss/printing/monitors/localmon/ui/. CORE-10489 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] Wed Oct 26 22:54:05 2016 @@ -88,8 +88,6 @@ reactos/dll/win32/jscript # Synced to WineStaging-1.9.16 reactos/dll/win32/jsproxy # Synced to WineStaging-1.9.11 reactos/dll/win32/loadperf # Synced to WineStaging-1.9.11 -reactos/dll/win32/localspl # Synced to WineStaging-1.9.11 -reactos/dll/win32/localui # Synced to WineStaging-1.9.11 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16 @@ -138,7 +136,6 @@ reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-1.9.11 reactos/dll/win32/ntdsapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/ntprint # Synced to WineStaging-1.9.11 reactos/dll/win32/objsel # Synced to WineStaging-1.9.11 reactos/dll/win32/odbc32 # Synced to WineStaging-1.9.11. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 @@ -181,7 +178,6 @@ reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.11 reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/softpub # Synced to WineStaging-1.9.11 -reactos/dll/win32/spoolss # Synced to WineStaging-1.9.11 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/sti # Synced to WineStaging-1.9.11 @@ -226,6 +222,8 @@ reactos/dll/cpl/inetcpl # Synced to WineStaging-1.9.11 +reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-1.9.11 (known there as /dll/win32/localui) + ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.11

1 0

[hbelusca] 73047: [WINSPOOL_PRINT]: Improve the test application: - Do not hardcode the test file name, but instead take it from the command line (and add a Usage() function); - Do not use a too la...
by hbelusca＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: hbelusca Date: Wed Oct 26 22:43:53 2016 New Revision: 73047 URL: http://svn.reactos.org/svn/reactos?rev=73047&view=rev Log: [WINSPOOL_PRINT]: Improve the test application: - Do not hardcode the test file name, but instead take it from the command line (and add a Usage() function); - Do not use a too large fixed-size buffer to read & print the file, but instead use a correctly-size buffer, get the file size, and then do a loop to read data from the file by chunks & send it to the printer. Modified: trunk/rosapps/applications/cmdutils/winspool_print/CMakeLists.txt trunk/rosapps/applications/cmdutils/winspool_print/main.c Modified: trunk/rosapps/applications/cmdutils/winspool_print/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/wins… ============================================================================== --- trunk/rosapps/applications/cmdutils/winspool_print/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/winspool_print/CMakeLists.txt [iso-8859-1] Wed Oct 26 22:43:53 2016 @@ -1,4 +1,4 @@ add_executable(winspool_print main.c) -set_module_type(winspool_print win32cui) +set_module_type(winspool_print win32cui UNICODE) add_importlibs(winspool_print winspool msvcrt kernel32) add_cd_file(TARGET winspool_print DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/cmdutils/winspool_print/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/wins… ============================================================================== --- trunk/rosapps/applications/cmdutils/winspool_print/main.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/winspool_print/main.c [iso-8859-1] Wed Oct 26 22:43:53 2016 @@ -1,26 +1,38 @@ #include <stdio.h> #include <windows.h> -int main() +void Usage(WCHAR* name) +{ + wprintf(L"Usage: %s testfile\n", name); +} + +int wmain(int argc, WCHAR* argv[]) { int ReturnValue = 1; - DWORD dwRead; - DWORD dwWritten; + DWORD dwFileSize; + DWORD dwRead, dwWritten; HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE hPrinter = NULL; DOC_INFO_1W docInfo; - BYTE Buffer[20000]; + BYTE Buffer[4096]; - hFile = CreateFileW(L"testfile", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (argc <= 1) + { + Usage(argv[0]); + return 0; + } + + hFile = CreateFileW(argv[1], GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { printf("CreateFileW failed, last error is %lu!\n", GetLastError()); goto Cleanup; } - if (!ReadFile(hFile, Buffer, sizeof(Buffer), &dwRead, NULL)) + dwFileSize = GetFileSize(hFile, NULL); + if (dwFileSize == INVALID_FILE_SIZE) { - printf("ReadFile failed, last error is %lu!\n", GetLastError()); + printf("File is too big, or GetFileSize failed; last error is %lu!\n", GetLastError()); goto Cleanup; } @@ -30,6 +42,7 @@ goto Cleanup; } + /* Print to a printer, with the "RAW" datatype (pDatatype == NULL or "RAW") */ ZeroMemory(&docInfo, sizeof(docInfo)); docInfo.pDocName = L"winspool_print"; @@ -45,10 +58,21 @@ goto Cleanup; } - if (!WritePrinter(hPrinter, Buffer, dwRead, &dwWritten)) + while (dwFileSize > 0) { - printf("WritePrinter failed, last error is %lu!\n", GetLastError()); - goto Cleanup; + dwRead = min(sizeof(Buffer), dwFileSize); + if (!ReadFile(hFile, Buffer, dwRead, &dwRead, NULL)) + { + printf("ReadFile failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + dwFileSize -= dwRead; + + if (!WritePrinter(hPrinter, Buffer, dwRead, &dwWritten)) + { + printf("WritePrinter failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } } if (!EndPagePrinter(hPrinter)) @@ -66,11 +90,11 @@ ReturnValue = 0; Cleanup: + if (hPrinter) + ClosePrinter(hPrinter); + if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); - if (hPrinter) - ClosePrinter(hPrinter); - return ReturnValue; }

1 0

[hbelusca] 73046: Fix a comment.
by hbelusca＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: hbelusca Date: Wed Oct 26 22:06:02 2016 New Revision: 73046 URL: http://svn.reactos.org/svn/reactos?rev=73046&view=rev Log: Fix a comment. Modified: trunk/reactos/dll/cpl/desk/effappdlg.c Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Wed Oct 26 22:06:02 2016 @@ -101,7 +101,7 @@ FILL_COMBOBOX(IDC_EFFAPPEARANCE_SMOOTHINGTYPE, IDS_STANDARDEFFECT, IDS_CLEARTYPEEFFECT); - /* Sundry checkboxes */ + /* Other checkboxes */ INIT_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); INIT_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); INIT_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues);

1 0

[hbelusca] 73045: [DESK.CPL]: Patch by Ismael Ferreras Morezuelas: Implement all the controls in the ``Effects'' section of desk.cpl, except 'Big icons'; make the comboboxes slightly wider; rename ...
by hbelusca＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: hbelusca Date: Wed Oct 26 22:02:24 2016 New Revision: 73045 URL: http://svn.reactos.org/svn/reactos?rev=73045&view=rev Log: [DESK.CPL]: Patch by Ismael Ferreras Morezuelas: Implement all the controls in the ``Effects'' section of desk.cpl, except 'Big icons'; make the comboboxes slightly wider; rename user-facing ``ClearType'' to ``FreeType Antialised'' as a nod to the supporting library while avoiding patented and trademarked words. CORE-10606 Modified: trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/effappdlg.c trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/pt-BR.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/lang/zh-TW.rc trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -47,10 +47,11 @@ BOOL bTooltipAnimation; BOOL bTooltipFade; BOOL bCursorShadow; + BOOL bDropShadow; BOOL bUiEffects; BOOL bFontSmoothing; + UINT uiFontSmoothingType; BOOL bDragFullWindows; - UINT uiFontSmoothingType; } EFFECTS; typedef struct Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -4,8 +4,8 @@ * FILE: dll/cpl/desk/effappdlg.c * PURPOSE: Effects appearance dialog * - * PROGRAMMER: Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) - * + * PROGRAMMERS: Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) + * Ismael Ferreras Morezuelas (swyterzone+reactos(a)gmail.com) */ #include "desk.h" @@ -15,41 +15,63 @@ UpdateControls(HWND hwndDlg, GLOBALS *g) { WPARAM state; - state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_GETCHECK, 0, 0); - g->SchemeAdv.Effects.bMenuAnimation = (state == BST_CHECKED) ? TRUE : FALSE; - EnableWindow(GetDlgItem(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE), g->SchemeAdv.Effects.bMenuAnimation); - // A boolean as an index for a 2-value list: - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_SETCURSEL, (WPARAM)g->SchemeAdv.Effects.bMenuFade, 0); +#define SAVE_CHECKBOX(__CONTROL_ID, __MEMBER) \ +do { \ + state = SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_GETCHECK, 0, 0); \ + g->SchemeAdv.Effects.__MEMBER = /* Do a XOR of both the conditions */ \ + ((state == BST_CHECKED) != (__CONTROL_ID == IDC_EFFAPPEARANCE_KEYBOARDCUES)); \ +} while(0) - state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_GETCHECK, 0, 0); - g->SchemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? TRUE : FALSE; - state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_GETCHECK, 0, 0); - g->SchemeAdv.Effects.bDragFullWindows = (state == BST_CHECKED) ? TRUE : FALSE; +#define RSET_COMBOBOX(__CONTROL_ID, __PARENT_MEMBER, __MEMBER) \ +do { \ + SendDlgItemMessageW(hwndDlg, __CONTROL_ID, CB_SETCURSEL, (WPARAM)g->SchemeAdv.Effects.__MEMBER, 0); \ + EnableWindow(GetDlgItem(hwndDlg, __CONTROL_ID), g->SchemeAdv.Effects.__PARENT_MEMBER); \ +} while(0) + + /* Animated menu transitions section (checkbox + combo) */ + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_ANIMATION, bMenuAnimation); + RSET_COMBOBOX(IDC_EFFAPPEARANCE_ANIMATIONTYPE, bMenuAnimation, bMenuFade); + + /* Font antialiasing section (checkbox + combo) */ + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_SMOOTHING, bFontSmoothing); + RSET_COMBOBOX(IDC_EFFAPPEARANCE_SMOOTHINGTYPE, bFontSmoothing, uiFontSmoothingType - 1); + + /* Other checkboxes */ + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); + SAVE_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues); + +#undef SAVE_CHECKBOX +#undef RSET_COMBOBOX + g->bSchemeChanged = TRUE; } - static VOID SaveCurrentValues(HWND hwndDlg, GLOBALS *g) { + /* The settings get saved at the end of ApplyScheme() in theme.c, + * when clicking Apply in the main dialog. */ } static VOID -AddToCombo(HWND hwndDlg, INT From, INT To, INT Combo) +AddToCombobox(INT Combo, HWND hwndDlg, INT From, INT To) { - INT iElement, iListIndex, i=0; + INT iElement, iListIndex, i = 0; TCHAR tstrText[80]; + + if (Combo == IDC_EFFAPPEARANCE_SMOOTHINGTYPE) i = 1; for (iElement = From; iElement<=To; iElement++) { - LoadString(hApplet, iElement, (LPTSTR)tstrText, 80); + LoadString(hApplet, iElement, (LPTSTR)tstrText, ARRAYSIZE(tstrText)); iListIndex = SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)tstrText); - SendDlgItemMessage(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++ ); + SendDlgItemMessageW(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++); } } -/* Initialize the effects appearance dialog */ +/* Initialize the effects appearance dialog from the scheme populated in LoadCurrentScheme(), in theme.c */ static VOID EffAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) { @@ -58,25 +80,37 @@ /* Copy the current theme values */ g->SchemeAdv = g->Scheme; - AddToCombo(hwndDlg, IDS_SLIDEEFFECT, IDS_FADEEFFECT, IDC_EFFAPPEARANCE_ANIMATIONTYPE); +#define INIT_CHECKBOX(__CONTROL_ID, __MEMBER) \ +do { \ + state = /* Do a XOR of both the conditions */ \ + ((g->SchemeAdv.Effects.__MEMBER) != (__CONTROL_ID == IDC_EFFAPPEARANCE_KEYBOARDCUES)) \ + ? BST_CHECKED : BST_UNCHECKED; \ + SendDlgItemMessageW(hwndDlg, __CONTROL_ID, BM_SETCHECK, state, 0); \ +} while(0) - state = g->SchemeAdv.Effects.bMenuAnimation ? BST_CHECKED : BST_UNCHECKED; - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_SETCHECK, state, 0); +#define FILL_COMBOBOX(__CONTROL_ID, __FIRST_STR, __LAST_STR) \ + AddToCombobox(__CONTROL_ID, hwndDlg, __FIRST_STR, __LAST_STR) - state = g->SchemeAdv.Effects.bKeyboardCues ? BST_CHECKED : BST_UNCHECKED; - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_SETCHECK, state, 0); + /* Animated menu transitions section (checkbox + combo) */ + INIT_CHECKBOX(IDC_EFFAPPEARANCE_ANIMATION, bMenuAnimation); + FILL_COMBOBOX(IDC_EFFAPPEARANCE_ANIMATIONTYPE, IDS_SLIDEEFFECT, + IDS_FADEEFFECT); - state = g->SchemeAdv.Effects.bDragFullWindows ? BST_CHECKED : BST_UNCHECKED; - SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_SETCHECK, state, 0); + /* Font antialiasing section (checkbox + combo) */ + INIT_CHECKBOX(IDC_EFFAPPEARANCE_SMOOTHING, bFontSmoothing); + FILL_COMBOBOX(IDC_EFFAPPEARANCE_SMOOTHINGTYPE, IDS_STANDARDEFFECT, + IDS_CLEARTYPEEFFECT); + + /* Sundry checkboxes */ + INIT_CHECKBOX(IDC_EFFAPPEARANCE_SETDROPSHADOW, bDropShadow); + INIT_CHECKBOX(IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, bDragFullWindows); + INIT_CHECKBOX(IDC_EFFAPPEARANCE_KEYBOARDCUES, bKeyboardCues); + +#undef INIT_CHECKBOX +#undef FILL_COMBOBOX /* Update the controls */ UpdateControls(hwndDlg, g); -} - - -static VOID -EffAppearanceDlg_CleanUp(HWND hwndDlg, GLOBALS* g) -{ } INT_PTR CALLBACK @@ -95,7 +129,6 @@ break; case WM_DESTROY: - EffAppearanceDlg_CleanUp(hwndDlg, g); break; case WM_COMMAND: @@ -112,8 +145,10 @@ break; case IDC_EFFAPPEARANCE_ANIMATION: + case IDC_EFFAPPEARANCE_SMOOTHING: + case IDC_EFFAPPEARANCE_SETDROPSHADOW: + case IDC_EFFAPPEARANCE_DRAGFULLWINDOWS: case IDC_EFFAPPEARANCE_KEYBOARDCUES: - case IDC_EFFAPPEARANCE_DRAGFULLWINDOWS: if (HIWORD(wParam) == BN_CLICKED) { UpdateControls(hwndDlg, g); @@ -121,10 +156,14 @@ break; case IDC_EFFAPPEARANCE_ANIMATIONTYPE: + case IDC_EFFAPPEARANCE_SMOOTHINGTYPE: if (HIWORD(wParam) == CBN_SELCHANGE) { - SaveCurrentValues(hwndDlg, g); - g->SchemeAdv.Effects.bMenuFade = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_GETCURSEL, 0, 0); + INT fontTypeIndex = SendDlgItemMessageW(hwndDlg, IDC_EFFAPPEARANCE_SMOOTHINGTYPE, CB_GETCURSEL, 0, 0); + + g->SchemeAdv.Effects.bMenuFade = SendDlgItemMessageW(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_GETCURSEL, 0, 0); + g->SchemeAdv.Effects.uiFontSmoothingType = SendDlgItemMessageW(hwndDlg, IDC_EFFAPPEARANCE_SMOOTHINGTYPE, CB_GETITEMDATA, fontTypeIndex, 0); + UpdateControls(hwndDlg, g); } break; Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "ÐÐ·&Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð½Ð¸ÑÐµ Ð¿ÑÐµÑÐ¾Ð´Ð½Ð¸ ÐµÑÐµÐºÑÐ¸ Ð·Ð° Ð¸Ð·Ð±Ð¾ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð¸ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ¸ÑÐµ", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "&ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð¿Ð¾ÑÐ²Ð°Ñ Ð·Ð° Ð¸Ð·Ð³Ð»Ð°Ð¶Ð´Ð°Ð½Ðµ ÑÑÐ±Ð¾Ð²ÐµÑÐµ Ð½Ð° ÐµÐºÑÐ°Ð½Ð½Ð¸ÑÐµ ÑÑÐ¸ÑÑÐ¾Ð²Ðµ", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½&Ðµ Ð½Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸ Ð·Ð½Ð°ÑÐµÑÐ°", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "ÐÐ·Ð¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ Ð½Ð° &ÑÐµÐ½ÐºÐ¸ Ð¿Ð¾Ð´ Ð¸Ð·Ð±Ð¾ÑÐ½Ð¸ÑÑÐµ", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾ Ð½Ð° &Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ÑÐµ Ð¿Ð¾ Ð²ÑÐµÐ¼Ðµ Ð½Ð° Ð²Ð»Ð°ÑÐµÐ½Ðµ", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ð¡&ÐºÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð´ÑÐµÑÑÐ°Ð²Ð°Ð½ÐµÑÐ¾ Ð·Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð¾ÑÐ¾ Ð½Ð°ÑÐ¾ÑÐ²Ð°Ð½Ðµ, Ð´Ð¾ Ð½Ð°ÑÐ¸ÑÐºÐ°Ð½Ðµ Ð½Ð° Alt", @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÐÐ±Ð¸ÑÐ°ÐµÐ½" - IDS_CLEARTYPEEFFECT "ÐÐ·ÑÐ¸ÑÑÐµÐ½" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -101,16 +101,16 @@ BEGIN CONTROL "PouÅ¾Ãt nÃ¡sledujÃcÃ &efekt pÅechodu pro nabÃdky a popisky", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "PouÅ¾Ãt nÃ¡sledujÃcÃ metodu vyhlazovÃ¡nÃ &hran obrazovkovÃ½ch pÃsem", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "PouÅ¾Ãt velkÃ© &ikony", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Zobrazovat &stÃny pod nabÃdkami", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Zobrazovat &obsah okna bÄhem pÅesouvÃ¡nÃ", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Nezobrazovat podtrÅ¾enÃ pÃsmen u klÃ¡vesovÃ½ch zkratek, dokud nestisknu klÃ¡vesu Alt", @@ -184,7 +184,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "StandardnÃ" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Verwende folgenden Ãbergangseffekt fÃ¼r MenÃ¼s und Tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "V&erwende folgende KantenglÃ¤ttungsmethode fÃ¼r Bildschirmschriften", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Ve&rwende groÃe Icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Zeige MenÃ¼sch&atten", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Zeige &Fensterinhalt beim Verschieben", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ver&stecke Unterstrich der Tastaturnavigation bis zum Druck der Alt-Taste", @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", @@ -178,7 +178,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "&Animar transiciones de menÃºs y sugerencias emergentes", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&sar el siguiente mÃ©todo para suavizar los bordes de las fuentes de pantalla", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Usar i&conos grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Mostrar som&bras bajo los menÃºs", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "&Mostrar el contenido de la ventana mientras se arrastra", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar el subrayado de acceso rÃ¡pido hasta presionar la tecla Alt", @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "EstÃ¡ndar" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_CLEARTYPEEFFECT "Suavizado de FreeType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "&Utilisez l'effet de transition suivant pour les menus et les bulles d'aides", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&tilisez la mÃ©thode suivante pour aplanir les bords des polices d'Ã©cran", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Uti&liser de grandes icones", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Montrer ombrage sous les menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Montrer contenu des fenÃªtres lorsqu'elles sont bougÃ©s", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Cacher les lettres soulignÃ©es pour la navigation du clavier jusqu'Ã ce que j'appuie sur la touche Alt", Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "××©×ª××© ××¡×××× ××××××", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Usare il seguente effetto per le transizioni in menu e tooltip", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&sare il seguente metodo per arrotondare i bordi dei font per lo schermo", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Usare le icone grandi", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&Ombreggiatura sotto i menu", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Mostrare il contenuto delle finestr mentre le si trascina", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Nascondere la sottolineatura delle lettere di navigazione finche non Ã¨ premuto il tasto Alt", Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "æ¬¡ã®ã¢ãã¡ã¼ã·ã§ã³å¹æãã¡ãã¥ã¼ã¨ãã¼ã« ãããã«ä½¿ç¨ãã(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "æ¬¡ã®æ¹æ³ã§ã¹ã¯ãªã¼ã³ ãã©ã³ãã®ç¸ãæ»ããã«ãã(&S):", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "å¤§ããã¢ã¤ã³ã³ãä½¿ç¨ãã(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "ã¡ãã¥ã¼ã®ä¸ã«å½±ãè¡¨ç¤ºãã(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "ãã©ãã°ä¸ã«ã¦ã£ã³ãã¦ã®åå®¹ãè¡¨ç¤ºãã(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Alt ãã¼ãæ¼ãã¾ã§ãã¼ãã¼ã ããã²ã¼ã·ã§ã³ã®ä¸ç·ãé ãã¦ãã(&H)", Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "De volgende overgangseffecten voor men&u's en knopinfo gebruiken", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Randen van letter&s vloeiend op het scherm weergeven, en wel als volgt", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&Grote pictogrammen gebruiken", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Sch&aduw onder menu's weergeven", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "De in&houd van het venster tijdens het slepen weergeven", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot ALT wordt ingedrukt", Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Bruk fÃ¸lgende overgang effekter for menyer og verktÃ¸ytips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "B&ruk fÃ¸lgende metode for kantutjevning av skjerm skifter", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Br&uk store ikoner", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Vis sk&ygger under menyer", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Vis &vindu innholdet ved flytting", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker pÃ¥ Alt tasten", Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -104,16 +104,16 @@ BEGIN CONTROL "&UÅ¼yj nastÄpujÄcego efektu przejÅcia dla menu i etykiet narzÄdzi:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "UÅ¼yj n&astÄpujÄcej metody wygÅadzania krawÄdzi czcionek ekranowych:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "UÅ¼yj &duÅ¼ych ikon", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&PokaÅ¼ cienie pod menu", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "PokaÅ¼ &zawartoÅÄ okna podczas przeciÄgania", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ukryj podkreÅlenie liter do nawigacji &klawiaturÄ, dopÃ³ki nie nacisnÄ klawisza Alt", Modified: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pt-BR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&Usar este efeito de transiÃ§Ã£o para menus e dicas de ferramenta:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&sar este mÃ©todo para suavizar as bordas das fontes de tela:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Usar Ãco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Mostr&ar sombras sob menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "&Mostrar conteÃºdo da janela ao arrastar", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Ocultar sublinhados para navegaÃ§Ã£o do teclado atÃ© eu pressionar a tecla Alt", Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -100,16 +100,16 @@ BEGIN CONTROL "AplicÄ &efect de tranziÈie pentru meniuri Èi ponturi:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "&RotunjeÈte marginile de text folosind metoda:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&Pictograme mari", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "AfiÈeazÄ &umbre sub meniuri", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "AfiÈeazÄ ferestrele Èi Ã®n timpul &miÈcÄrii lor", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&AmÃ¢nÄ sublinierea literelor navigÄrii din tastaturÄ pÃ¢nÄ la apÄsarea tastei Â«AltÂ»", Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -95,16 +95,16 @@ BEGIN CONTROL "&ÐÑÐ¸Ð¼ÐµÐ½ÑÑÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ Ð¿ÐµÑÐµÑÐ¾Ð´Ð½ÑÐ¹ ÑÑÑÐµÐºÑ Ð´Ð»Ñ Ð¼ÐµÐ½Ñ Ð¸ Ð¿Ð¾Ð´ÑÐºÐ°Ð·Ð¾Ðº", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "ÐÑ&Ð¸Ð¼ÐµÐ½ÑÑÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ Ð¼ÐµÑÐ¾Ð´ ÑÐ³Ð»Ð°Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐºÑÐ°Ð½Ð½ÑÑ ÑÑÐ¸ÑÑÐ¾Ð²", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "ÐÑÐ¸Ð¼ÐµÐ½ÑÑÑ &ÐºÑÑÐ¿Ð½ÑÐµ Ð·Ð½Ð°ÑÐºÐ¸", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ &ÑÐµÐ½Ð¸, Ð¾ÑÐ±ÑÐ°ÑÑÐ²Ð°ÐµÐ¼ÑÐµ Ð¼ÐµÐ½Ñ", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "&ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð¾ÐºÐ½Ð° Ð¿ÑÐ¸ Ð¿ÐµÑÐµÑÐ°ÑÐºÐ¸Ð²Ð°Ð½Ð¸Ð¸", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Ð¡ÐºÑ&ÑÐ²Ð°ÑÑ ÑÐºÐ°Ð·Ð°ÑÐµÐ»Ð¸ Ð²ÑÐ·Ð¾Ð²Ð° Ñ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ Ð´Ð¾ Ð½Ð°Ð¶Ð°ÑÐ¸Ñ <Alt>", Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "&PouÅ¾ÃvaÅ¥ nasledovnÃ½ efekt prechodu pre ponuky a nÃ¡zvy tlaÄidiel", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Po&uÅ¾ÃvaÅ¥ nasledovnÃº metÃ³du vyhladenia okrajov zobrazenÃ©ho pÃsma", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "PouÅ¾ÃvaÅ¥ &veÄ¾kÃ© ikony", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&ZobrazovaÅ¥ tiene pod ponukami", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "ZobrazovaÅ¥ &obsah okna poÄas presÃºvania", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&SkrÃ½vaÅ¥ podÄiarknutÃ© pÃsmenÃ¡ (klÃ¡vesovÃ© skratky) aÅ¾ do stlaÄenia klÃ¡vesu Alt", Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -99,16 +99,16 @@ BEGIN CONTROL "&PÃ«rdorni efektin e mÃ«poshtme tranzicionit pÃ«r menutÃ« dhe ndihmesa", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "PÃ«rdor metodÃ«n e mÃ«poshtme pÃ«r tÃ« zbutÃ« skajet e fonts ekran", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "PÃ«rdor ikona tÃ« mÃ«dha", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Shfaq hije poshte menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Shfaq &pÃ«rmbajtjen dritare ndÃ«rsa zvarritet", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "Fsheh gÃ«rma tÃ« nÃ«nvizuara pÃ«r kÃ«rkimin e tastierÃ«s deri sa tÃ« shtypni butonin Alt", Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "&Use the following transition effect for menus and tooltips", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "&AraÃ§ Ä°puÃ§larÄ± ve SeÃ§keler Ä°Ã§in AÅaÄÄ±daki GeÃ§iÅ Etkisi Kullan:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "&GÃ¶rÃ¼ntÃ¼lÃ¼k YazÄ± Tiplerinin KÄ±yÄ±larÄ±nÄ± YumuÅatmak Ä°Ã§in AÅaÄÄ±daki YÃ¶ntemi Kullan:", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&BÃ¼yÃ¼k Simgeler Kullan", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "&SeÃ§keler AltÄ±nda GÃ¶lge GÃ¶ster", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "S&Ã¼rÃ¼klerken Pencere Ä°Ã§eriÄini GÃ¶ster", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "S&eÃ§enek DÃ¼Ämesine Basana Dek DÃ¼Äme TakÄ±mÄ±yla Gezinme Ä°Ã§in AltÄ± Ãizili Harfleri Gizle", Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -103,16 +103,16 @@ BEGIN CONTROL "&ÐÐ°ÑÑÐ¾ÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½Ð°ÑÑÑÐ¿Ð½Ð¸Ð¹ Ð¿ÐµÑÐµÑÑÐ´Ð½Ð¸Ð¹ ÐµÑÐµÐºÑ Ð´Ð»Ñ Ð¼ÐµÐ½Ñ ÑÐ° Ð¿ÑÐ´ÐºÐ°Ð·Ð¾Ðº", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "Ð&Ð°ÑÑÐ¾ÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð½Ð°ÑÑÑÐ¿Ð½Ð¸Ð¹ Ð¼ÐµÑÐ¾Ð´ Ð·Ð³Ð»Ð°Ð´Ð¶ÑÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÐµÐºÑÐ°Ð½Ð½Ð¸Ñ ÑÑÐ¸ÑÑÑÐ²", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "ÐÐ°ÑÑÐ¾ÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ &Ð²ÐµÐ»Ð¸ÐºÑ Ð·Ð½Ð°ÑÐºÐ¸", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "ÐÑÐ´Ð¾Ð±ÑÐ°Ð¶Ð°ÑÐ¸ ÑÑÐ½Ñ Ð²ÑÐ´ Ð¼ÐµÐ½Ñ", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "ÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ &Ð²Ð¼ÑÑÑ Ð²ÑÐºÐ½Ð° Ð¿ÑÐ´ ÑÐ°Ñ Ð¿ÐµÑÐµÑÑÐ³ÑÐ²Ð°Ð½Ð½Ñ", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "&ÐÑÐ¸ÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ Ð¿Ð¾ÐºÐ°Ð¶ÑÐ¸ÐºÐ¸ Ð²Ð¸ÐºÐ»Ð¸ÐºÑ Ð· ÐºÐ»Ð°Ð²ÑÐ°ÑÑÑÐ¸ Ð´Ð¾ Ð½Ð°ÑÐ¸ÑÐ½ÐµÐ½Ð½Ñ <Alt>", @@ -186,7 +186,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹" - IDS_CLEARTYPEEFFECT "ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÑÐ¸Ð¿" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -102,16 +102,16 @@ BEGIN CONTROL "ä¸ºèååå·¥å·æç¤ºä½¿ç¨ä»¥ä¸è¿æ¸¡ææ(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "ä½¿ç¨ä¸åæ¹å¼ä½¿å±å¹åä½çè¾¹ç¼å¹³æ»(&S)", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "ä½¿ç¨å¤§å¾æ (&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "å¨èåä¸æ¾ç¤ºé´å½±(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "æå¨æ¶æ¾ç¤ºçªå£åå®¹(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "ç´å°ææ Alt é®ä¹åï¼è¯·éèæä¸åçº¿çåæ¯ä¾é®çä½¿ç¨", @@ -185,7 +185,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "æ å" - IDS_CLEARTYPEEFFECT "æ¸æ°åä½" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-TW.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-TW.rc [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -97,16 +97,16 @@ BEGIN CONTROL "çºé¸å®åå·¥å·æç¤ºä½¿ç¨ä»¥ä¸éæ¸¡ææ(&U):", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP CONTROL "ä½¿ç¨ä¸åæ¹å¼ä½¿è¢å¹ååçéç·£å¹³æ»(&S)", IDC_EFFAPPEARANCE_SMOOTHING, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 - COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | - CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "ä½¿ç¨å¤§åç¤º(&E)", IDC_EFFAPPEARANCE_LARGEICONS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 CONTROL "å¨é¸å®ä¸é¡¯ç¤ºé°å½±(&A)", IDC_EFFAPPEARANCE_SETDROPSHADOW, - "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 CONTROL "æåæé¡¯ç¤ºè¦çªå§å®¹(&W)", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 CONTROL "ç´å°ææ Alt éµä¹åï¼è«é±èæä¸åç·çåæ¯ä¾éµç¤ä½¿ç¨", @@ -180,7 +180,7 @@ STRINGTABLE BEGIN IDS_STANDARDEFFECT "æ¨æº" - IDS_CLEARTYPEEFFECT "æ¸æ°åå" + IDS_CLEARTYPEEFFECT "FreeType Antialised" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Wed Oct 26 22:02:24 2016 @@ -5,6 +5,7 @@ * PURPOSE: Handling themes and visual effects * * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Ismael Ferreras Morezuelas (swyterzone+reactos(a)gmail.com) */ #include "desk.h" @@ -61,7 +62,7 @@ VOID SchemeSetMetric(IN COLOR_SCHEME *scheme, int id, int value) { - switch(id) + switch (id) { case SIZE_BORDER_WIDTH: scheme->ncMetrics.iBorderWidth = value; break; case SIZE_SCROLL_WIDTH: scheme->ncMetrics.iScrollWidth = value; break; @@ -173,6 +174,26 @@ scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation; scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; + /* Use the following transition effect for menus and tooltips */ + ret = SystemParametersInfoW(SPI_GETFONTSMOOTHING, + 0, + &scheme->Effects.bFontSmoothing, + 0); + if (!ret) return FALSE; + + ret = SystemParametersInfoW(SPI_GETFONTSMOOTHINGTYPE, + 0, + &scheme->Effects.uiFontSmoothingType, + 0); + if (!ret) return FALSE; + + /* Show shadows under menus */ + ret = SystemParametersInfoW(SPI_GETDROPSHADOW, + 0, + &scheme->Effects.bDropShadow, + 0); + if (!ret) return FALSE; + /* Show content of windows during dragging */ ret = SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, @@ -180,7 +201,7 @@ 0); if (!ret) return FALSE; - /* Hide underlined letters for keyboard navigation until I press the Alt key */ + /* Hide underlined letters for keyboard navigation until the Alt key is pressed */ ret = SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &scheme->Effects.bKeyboardCues, @@ -339,23 +360,53 @@ /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings * Just keep them in sync for now. */ + +#define SYS_CONFIG(__uiAction, __uiParam, __pvParam) \ + SystemParametersInfoW(__uiAction, __uiParam, __pvParam, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE) + scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation; - scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; - SystemParametersInfoW(SPI_SETDRAGFULLWINDOWS, scheme->Effects.bDragFullWindows, (PVOID)&scheme->Effects.bDragFullWindows, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - SystemParametersInfoW(SPI_SETKEYBOARDCUES, 0, IntToPtr(scheme->Effects.bKeyboardCues), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - //SystemParametersInfoW(SPI_SETACTIVEWINDOWTRACKING, 0, (PVOID)&scheme->Effects.bActiveWindowTracking, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETMENUANIMATION, 0, (PVOID)&scheme->Effects.bMenuAnimation, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETCOMBOBOXANIMATION, 0, (PVOID)&scheme->Effects.bComboBoxAnimation, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETLISTBOXSMOOTHSCROLLING, 0, (PVOID)&scheme->Effects.bListBoxSmoothScrolling, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETGRADIENTCAPTIONS, 0, (PVOID)&scheme->Effects.bGradientCaptions, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETACTIVEWNDTRKZORDER, 0, (PVOID)&scheme->Effects.bActiveWndTrkZorder, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETHOTTRACKING, 0, (PVOID)&scheme->Effects.bHotTracking, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - SystemParametersInfoW(SPI_SETMENUFADE, 0, (PVOID)&scheme->Effects.bMenuFade, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETSELECTIONFADE, 0, (PVOID)&scheme->Effects.bSelectionFade, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - SystemParametersInfoW(SPI_SETTOOLTIPANIMATION, 0, (PVOID)&scheme->Effects.bTooltipAnimation, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - SystemParametersInfoW(SPI_SETTOOLTIPFADE, 0, (PVOID)&scheme->Effects.bTooltipFade, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETCURSORSHADOW, 0, (PVOID)&scheme->Effects.bCursorShadow, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); - //SystemParametersInfoW(SPI_SETUIEFFECTS, 0, (PVOID)&scheme->Effects.bUiEffects, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; + + /* Use the following transition effect for menus and tooltips */ + SYS_CONFIG(SPI_SETMENUANIMATION, 0, IntToPtr(scheme->Effects.bMenuAnimation)); + SYS_CONFIG(SPI_SETMENUFADE, 0, IntToPtr(scheme->Effects.bMenuFade)); + + /* Use the following method to smooth edges of screen fonts */ + SYS_CONFIG(SPI_SETFONTSMOOTHING, scheme->Effects.bFontSmoothing, 0); + SYS_CONFIG(SPI_SETFONTSMOOTHINGTYPE, 0, IntToPtr(scheme->Effects.uiFontSmoothingType)); + + /* + * Refresh and redraw all the windows, otherwise the font smoothing changes + * only appear after any future partial region invalidation. + * Not everyone listens for this WM_SETTINGCHANGE, including the shell and most third party programs. + */ + InvalidateRect(NULL, NULL, TRUE); + + /* Use large icons */ + //SYS_CONFIG(SPI_GETDRAGFULLWINDOWS, (PVOID) g->SchemeAdv.Effects.bMenuFade); + + /* Show shadows under menus */ + SYS_CONFIG(SPI_SETDROPSHADOW, 0, IntToPtr(scheme->Effects.bDropShadow)); + + /* Show window contents while dragging */ + SYS_CONFIG(SPI_SETDRAGFULLWINDOWS, scheme->Effects.bDragFullWindows, 0); + + /* Hide underlined letters for keyboard navigation until I press the Alt key */ + SYS_CONFIG(SPI_SETKEYBOARDCUES, 0, IntToPtr(scheme->Effects.bKeyboardCues)); + + // SYS_CONFIG(SPI_SETACTIVEWINDOWTRACKING, 0, IntToPtr(scheme->Effects.bActiveWindowTracking)); + // SYS_CONFIG(SPI_SETCOMBOBOXANIMATION, 0, IntToPtr(scheme->Effects.bComboBoxAnimation)); + // SYS_CONFIG(SPI_SETLISTBOXSMOOTHSCROLLING, 0, IntToPtr(scheme->Effects.bListBoxSmoothScrolling)); + // SYS_CONFIG(SPI_SETGRADIENTCAPTIONS, 0, IntToPtr(scheme->Effects.bGradientCaptions)); + // SYS_CONFIG(SPI_SETACTIVEWNDTRKZORDER, 0, IntToPtr(scheme->Effects.bActiveWndTrkZorder)); + // SYS_CONFIG(SPI_SETHOTTRACKING, 0, IntToPtr(scheme->Effects.bHotTracking)); + // SYS_CONFIG(SPI_SETSELECTIONFADE, 0, IntToPtr(scheme->Effects.bSelectionFade)); + SYS_CONFIG(SPI_SETTOOLTIPANIMATION, 0, IntToPtr(scheme->Effects.bTooltipAnimation)); + SYS_CONFIG(SPI_SETTOOLTIPFADE, 0, IntToPtr(scheme->Effects.bTooltipFade)); + // SYS_CONFIG(SPI_SETCURSORSHADOW, 0, IntToPtr(scheme->Effects.bCursorShadow)); + // SYS_CONFIG(SPI_SETUIEFFECTS, 0, IntToPtr(scheme->Effects.bUiEffects)); + +#undef SYS_CONFIG /* Save SchemeId in the registry */ if (pSelectedTheme->Theme != NULL && pSelectedTheme->ThemeActive == FALSE) @@ -668,7 +719,7 @@ * the visual styles of the system */ PTHEME -LoadThemes() +LoadThemes(VOID) { HRESULT hret; PTHEME pClassicTheme;

1 0

[hbelusca] 73044: [DESK.CPL]: Fix trailing whitespace, some indent + code formatting style.
by hbelusca＠svn.reactos.org 26 Oct '16

26 Oct '16

Author: hbelusca Date: Wed Oct 26 21:14:39 2016 New Revision: 73044 URL: http://svn.reactos.org/svn/reactos?rev=73044&view=rev Log: [DESK.CPL]: Fix trailing whitespace, some indent + code formatting style. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/advmon.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/classinst.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/draw.c trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/desk/muireg.c trunk/reactos/dll/cpl/desk/preview.c trunk/reactos/dll/cpl/desk/preview.h trunk/reactos/dll/cpl/desk/screensaver.c trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -522,7 +522,7 @@ break; case WM_COMMAND: - if(g == NULL) + if (g == NULL) return TRUE; switch(LOWORD(wParam)) @@ -558,7 +558,7 @@ if (HIWORD(wParam) == EN_CHANGE) { iProperty = g_Assignment[g->CurrentElement].Size; - if(iProperty == -1) + if (iProperty == -1) return TRUE; iSelection = LOWORD(SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD, UDM_GETPOS,0,0L)); @@ -566,7 +566,7 @@ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SETSIZE, iProperty, iSelection); iProperty = g_Assignment[g->CurrentElement].Size2; - if(iProperty != -1) + if (iProperty != -1) SchemeSetMetric(&g->SchemeAdv, iProperty, iSelection); } break; @@ -575,7 +575,7 @@ if (HIWORD(wParam) == CBN_SELCHANGE) { iProperty = g_Assignment[g->CurrentElement].Font; - if(iProperty == -1) + if (iProperty == -1) return TRUE; plfFont = SchemeGetFont(&g->SchemeAdv, iProperty); @@ -590,7 +590,7 @@ HDC hdcDlg; iProperty = g_Assignment[g->CurrentElement].Font; - if(iProperty == -1) + if (iProperty == -1) return TRUE; hdcDlg = GetDC(hwndDlg); @@ -608,7 +608,7 @@ if (HIWORD(wParam) == BN_CLICKED) { iProperty = g_Assignment[g->CurrentElement].Font; - if(iProperty == -1) + if (iProperty == -1) return TRUE; plfFont = SchemeGetFont(&g->SchemeAdv, iProperty); @@ -622,7 +622,7 @@ if (HIWORD(wParam) == BN_CLICKED) { iProperty = g_Assignment[g->CurrentElement].Font; - if(iProperty == -1) + if (iProperty == -1) return TRUE; plfFont = SchemeGetFont(&g->SchemeAdv, iProperty); Modified: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advmon.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -111,7 +111,7 @@ #ifdef _MSC_VER hShell32 = LoadLibrary(_T("shell32.dll")); - if(hShell32 == NULL) + if (hShell32 == NULL) return FALSE; msvc_SHCreatePropSheetExtArrayEx = (CPSEAE)GetProcAddress(hShell32, (LPCSTR)194); hpsxaDev = msvc_SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo); Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -31,7 +31,7 @@ SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SET_HDC_PREVIEW, 0, 0); } -static void +static void AppearancePage_LoadSelectedScheme(HWND hwndDlg, GLOBALS *g) { if (g->ActiveTheme.ThemeActive == FALSE ) @@ -39,7 +39,7 @@ LoadSchemeFromReg(&g->Scheme, &g->ActiveTheme); } else - { + { LoadSchemeFromTheme(&g->Scheme, &g->ActiveTheme); } @@ -71,9 +71,9 @@ static void AppearancePage_ShowColorSchemes(HWND hwndDlg, GLOBALS *g) { - AppearancePage_ShowStyles(hwndDlg, - IDC_APPEARANCE_COLORSCHEME, - g->ActiveTheme.Theme->ColoursList, + AppearancePage_ShowStyles(hwndDlg, + IDC_APPEARANCE_COLORSCHEME, + g->ActiveTheme.Theme->ColoursList, g->ActiveTheme.Color); } @@ -87,9 +87,9 @@ else pSizes = g->ActiveTheme.Color->ChildStyle; - AppearancePage_ShowStyles(hwndDlg, - IDC_APPEARANCE_SIZE, - pSizes, + AppearancePage_ShowStyles(hwndDlg, + IDC_APPEARANCE_SIZE, + pSizes, g->ActiveTheme.Size); } @@ -120,7 +120,7 @@ if (!GetActiveTheme(g->pThemes, &g->ActiveTheme)) g->ActiveTheme.ThemeActive = FALSE; - /* + /* * Keep a copy of the selected classic theme in order to select this * when user selects the classic theme (and not a horrible random theme ) */ @@ -203,7 +203,7 @@ break; case WM_COMMAND: - if(g == NULL || g->bInitializing) + if (g == NULL || g->bInitializing) return FALSE; switch (LOWORD(wParam)) @@ -254,7 +254,7 @@ if (HIWORD(wParam) == CBN_SELCHANGE) { PTHEME pTheme = (PTHEME)GetSelectedData(hwndDlg, IDC_APPEARANCE_VISUAL_STYLE); - + if (g->ClassicTheme.Theme == pTheme) g->ActiveTheme = g->ClassicTheme; else @@ -282,7 +282,7 @@ { g->ActiveTheme.Size = (PTHEME_STYLE)GetSelectedData(hwndDlg, IDC_APPEARANCE_SIZE); g->bSchemeChanged = TRUE; - if(g->ActiveTheme.ThemeActive) + if (g->ActiveTheme.ThemeActive) g->bThemeChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -258,7 +258,7 @@ pData->listViewItemCount++; } - if(!FindNextFile(hFind, &fd)) + if (!FindNextFile(hFind, &fd)) break; } @@ -1111,9 +1111,9 @@ switch(lpnm->code) { case PSN_APPLY: - if(pData->bWallpaperChanged) + if (pData->bWallpaperChanged) SetWallpaper(pData); - if(pData->bClrBackgroundChanged) + if (pData->bClrBackgroundChanged) SetDesktopBackColor(hwndDlg, pData); SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)_T("")); return TRUE; Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/classinst.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -38,7 +38,7 @@ return ERROR_DI_DO_DEFAULT; /* Set DI_DONOTCALLCONFIGMG flag */ - InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + InstallParams.cbSize = sizeof(InstallParams); result = SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams); if (!result) { @@ -67,7 +67,7 @@ } /* Get .inf file name and section name */ - DriverInfoData.cbSize = sizeof(SP_DRVINFO_DATA); + DriverInfoData.cbSize = sizeof(DriverInfoData); result = SetupDiGetSelectedDriver(DeviceInfoSet, DeviceInfoData, &DriverInfoData); if (!result) { @@ -76,11 +76,10 @@ goto cleanup; } - DriverInfoDetailData.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA); - result = SetupDiGetDriverInfoDetail( - DeviceInfoSet, DeviceInfoData, - &DriverInfoData, &DriverInfoDetailData, - sizeof(SP_DRVINFO_DETAIL_DATA), NULL); + DriverInfoDetailData.cbSize = sizeof(DriverInfoDetailData); + result = SetupDiGetDriverInfoDetail(DeviceInfoSet, DeviceInfoData, + &DriverInfoData, &DriverInfoDetailData, + sizeof(DriverInfoDetailData), NULL); if (!result && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { rc = GetLastError(); Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=73… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -120,7 +120,7 @@ INT_PTR CALLBACK AdvGeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -LONG +LONG RegLoadMUIStringW(IN HKEY hKey, IN LPCWSTR pszValue OPTIONAL, OUT LPWSTR pszOutBuf, Modified: trunk/reactos/dll/cpl/desk/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=73… ============================================================================== --- trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -81,16 +81,16 @@ RBInnerI = RBInnerNormal[uType & (BDR_INNER|BDR_OUTER)]; RBOuterI = RBOuterNormal[uType & (BDR_INNER|BDR_OUTER)]; - if((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) + if ((uFlags & BF_BOTTOMLEFT) == BF_BOTTOMLEFT) LBpenplus = 1; - if((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) + if ((uFlags & BF_TOPRIGHT) == BF_TOPRIGHT) RTpenplus = 1; - if((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) + if ((uFlags & BF_BOTTOMRIGHT) == BF_BOTTOMRIGHT) RBpenplus = 1; - if((uFlags & BF_TOPLEFT) == BF_TOPLEFT) + if ((uFlags & BF_TOPLEFT) == BF_TOPLEFT) LTpenplus = 1; - if((uFlags & MY_BF_ACTIVEBORDER)) + if ((uFlags & MY_BF_ACTIVEBORDER)) hbr = CreateSolidBrush(scheme->crColor[COLOR_ACTIVEBORDER]); else hbr = CreateSolidBrush(scheme->crColor[COLOR_BTNFACE]); @@ -101,34 +101,34 @@ MoveToEx(hdc, 0, 0, &SavePoint); /* Draw the outer edge */ - if(LTOuterI != -1) + if (LTOuterI != -1) { LTOuterPen = GetStockObject(DC_PEN); SelectObject(hdc, LTOuterPen); SetDCPenColor(hdc, scheme->crColor[LTOuterI]); - if(uFlags & BF_TOP) + if (uFlags & BF_TOP) { MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); LineTo(hdc, InnerRect.right, InnerRect.top); } - if(uFlags & BF_LEFT) + if (uFlags & BF_LEFT) { MoveToEx(hdc, InnerRect.left, InnerRect.top, NULL); LineTo(hdc, InnerRect.left, InnerRect.bottom); } } - if(RBOuterI != -1) + if (RBOuterI != -1) { RBOuterPen = GetStockObject(DC_PEN); SelectObject(hdc, RBOuterPen); SetDCPenColor(hdc, scheme->crColor[RBOuterI]); - if(uFlags & BF_BOTTOM) + if (uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left, InnerRect.bottom-1, NULL); LineTo(hdc, InnerRect.right, InnerRect.bottom-1); } - if(uFlags & BF_RIGHT) + if (uFlags & BF_RIGHT) { MoveToEx(hdc, InnerRect.right-1, InnerRect.top, NULL); LineTo(hdc, InnerRect.right-1, InnerRect.bottom); @@ -136,34 +136,34 @@ } /* Draw the inner edge */ - if(LTInnerI != -1) + if (LTInnerI != -1) { LTInnerPen = GetStockObject(DC_PEN); SelectObject(hdc, LTInnerPen); SetDCPenColor(hdc, scheme->crColor[LTInnerI]); - if(uFlags & BF_TOP) + if (uFlags & BF_TOP) { MoveToEx(hdc, InnerRect.left+LTpenplus, InnerRect.top+1, NULL); LineTo(hdc, InnerRect.right-RTpenplus, InnerRect.top+1); } - if(uFlags & BF_LEFT) + if (uFlags & BF_LEFT) { MoveToEx(hdc, InnerRect.left+1, InnerRect.top+LTpenplus, NULL); LineTo(hdc, InnerRect.left+1, InnerRect.bottom-LBpenplus); } } - if(RBInnerI != -1) + if (RBInnerI != -1) { RBInnerPen = GetStockObject(DC_PEN); SelectObject(hdc, RBInnerPen); SetDCPenColor(hdc, scheme->crColor[RBInnerI]); - if(uFlags & BF_BOTTOM) + if (uFlags & BF_BOTTOM) { MoveToEx(hdc, InnerRect.left+LBpenplus, InnerRect.bottom-2, NULL); LineTo(hdc, InnerRect.right-RBpenplus, InnerRect.bottom-2); } - if(uFlags & BF_RIGHT) + if (uFlags & BF_RIGHT) { MoveToEx(hdc, InnerRect.right-2, InnerRect.top+RTpenplus, NULL); LineTo(hdc, InnerRect.right-2, InnerRect.bottom-RBpenplus); @@ -175,16 +175,16 @@ int add = (LTRBInnerMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0) + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); - if(uFlags & BF_LEFT) + if (uFlags & BF_LEFT) InnerRect.left += add; - if(uFlags & BF_RIGHT) + if (uFlags & BF_RIGHT) InnerRect.right -= add; - if(uFlags & BF_TOP) + if (uFlags & BF_TOP) InnerRect.top += add; - if(uFlags & BF_BOTTOM) + if (uFlags & BF_BOTTOM) InnerRect.bottom -= add; - if(uFlags & BF_ADJUST) + if (uFlags & BF_ADJUST) *rc = InnerRect; } @@ -198,7 +198,7 @@ MyDrawFrameButton(HDC hdc, LPRECT rc, UINT uState, COLOR_SCHEME *scheme) { UINT edge; - if(uState & (DFCS_PUSHED | DFCS_CHECKED | DFCS_FLAT)) + if (uState & (DFCS_PUSHED | DFCS_CHECKED | DFCS_FLAT)) edge = EDGE_SUNKEN; else edge = EDGE_RAISED; @@ -220,7 +220,7 @@ dst->top += (Height-Width)/2; dst->bottom = dst->top + SmallDiam; } - else if(Width > Height) /* SmallDiam == Height */ + else if (Width > Height) /* SmallDiam == Height */ { dst->left += (Width-Height)/2; dst->right = dst->left + SmallDiam; @@ -259,13 +259,13 @@ return FALSE; } MyIntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, BF_RECT | BF_MIDDLE | BF_SOFT, scheme); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(lf)); MyMakeSquareRect(r, &myr); myr.left += 1; myr.top += 1; myr.right -= 1; myr.bottom -= 1; - if(uFlags & DFCS_PUSHED) + if (uFlags & DFCS_PUSHED) OffsetRect(&myr,1,1); lf.lfHeight = myr.bottom - myr.top; lf.lfWidth = 0; @@ -279,7 +279,7 @@ bkmode = GetBkMode(dc); /* Set color and drawing mode */ SetBkMode(dc, TRANSPARENT); - if(uFlags & DFCS_INACTIVE) + if (uFlags & DFCS_INACTIVE) { /* Draw shadow */ SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]); @@ -330,13 +330,13 @@ return FALSE; } MyIntDrawRectEdge(dc, r, (uFlags & DFCS_PUSHED) ? EDGE_SUNKEN : EDGE_RAISED, (uFlags&DFCS_FLAT) | BF_MIDDLE | BF_RECT, scheme); - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(lf)); MyMakeSquareRect(r, &myr); myr.left += 1; myr.top += 1; myr.right -= 1; myr.bottom -= 1; - if(uFlags & DFCS_PUSHED) + if (uFlags & DFCS_PUSHED) OffsetRect(&myr,1,1); lf.lfHeight = myr.bottom - myr.top; lf.lfWidth = 0; @@ -350,7 +350,7 @@ bkmode = GetBkMode(dc); /* Set color and drawing mode */ SetBkMode(dc, TRANSPARENT); - if(uFlags & DFCS_INACTIVE) + if (uFlags & DFCS_INACTIVE) { /* Draw shadow */ SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]); @@ -554,7 +554,7 @@ bkgnd = (flat_menu ? COLOR_MENUBAR : COLOR_MENU); x = Rect->left; hFontOld = SelectObject(DC, Font); - for(i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { GetMenuStringW(Menu, i, Text, 128, MF_BYPOSITION); Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -698,7 +698,7 @@ hFont = infoPtr->Monitors[Index].hFont; if (hFont == NULL && GetObject(infoPtr->hFont, - sizeof(LOGFONT), + sizeof(lf), &lf) != 0) { rcsize.cx = infoPtr->Monitors[Index].rc.right - infoPtr->Monitors[Index].rc.left - @@ -1580,9 +1580,9 @@ case WM_CREATE: { - infoPtr = (PMONITORSELWND) HeapAlloc(GetProcessHeap(), - 0, - sizeof(MONITORSELWND)); + infoPtr = (PMONITORSELWND)HeapAlloc(GetProcessHeap(), + 0, + sizeof(MONITORSELWND)); if (infoPtr == NULL) { Ret = (LRESULT)-1; Modified: trunk/reactos/dll/cpl/desk/muireg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/muireg.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/muireg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/muireg.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -49,7 +49,7 @@ * * @implemented */ -LONG +LONG RegLoadMUIStringW(IN HKEY hKey, IN LPCWSTR pszValue OPTIONAL, OUT LPWSTR pszOutBuf, @@ -65,7 +65,7 @@ /* Parameter sanity checks. */ if (!hKey || !pszOutBuf) return ERROR_INVALID_PARAMETER; - + if (pszDirectory && *pszDirectory) { //FIXME("BaseDir parameter not yet supported!\n"); Modified: trunk/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -260,7 +260,7 @@ hdc = BeginPaint(hwnd, &ps); - if(pPreviewData->hdcPreview) + if (pPreviewData->hdcPreview) { BitBlt(hdc,0,0, pPreviewData->rcDesktop.right, pPreviewData->rcDesktop.bottom, pPreviewData->hdcPreview, 0,0, SRCCOPY); EndPaint(hwnd, &ps); @@ -470,7 +470,7 @@ CalculateItemSize(pPreviewData); InvalidateRect(hwnd, NULL, FALSE); break; - + case PVM_SETFONT: { PLOGFONTW plfFont; @@ -498,15 +498,15 @@ pPreviewData->Scheme.crColor[wParam] = lParam; switch(wParam) { - case COLOR_SCROLLBAR: + case COLOR_SCROLLBAR: DeleteObject(pPreviewData->hbrScrollbar); pPreviewData->hbrScrollbar = CreateSolidBrush(pPreviewData->Scheme.crColor[wParam]); break; - case COLOR_DESKTOP: + case COLOR_DESKTOP: DeleteObject(pPreviewData->hbrDesktop); pPreviewData->hbrDesktop = CreateSolidBrush(pPreviewData->Scheme.crColor[wParam]); break; - case COLOR_WINDOW: + case COLOR_WINDOW: DeleteObject(pPreviewData->hbrWindow); pPreviewData->hbrWindow = CreateSolidBrush(pPreviewData->Scheme.crColor[wParam]); break; @@ -540,7 +540,7 @@ { WNDCLASSEX wc = {0}; - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(wc); wc.lpfnWndProc = PreviewWndProc; wc.hInstance = hInstance; wc.hCursor = LoadCursor(NULL, IDC_ARROW); Modified: trunk/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/preview.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/preview.h [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -23,7 +23,7 @@ #define IDX_APPSPACE 16 #define IDX_QUICKINFO 20 -#define PVM_SETSIZE (WM_USER+1) +#define PVM_SETSIZE (WM_USER+1) #define PVM_GETSIZE (WM_USER+2) #define PVM_SETFONT (WM_USER+3) #define PVM_GETFONT (WM_USER+4) Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -214,7 +214,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); - if(CreateProcess(NULL, + if (CreateProcess(NULL, szCmdline, NULL, NULL, @@ -270,7 +270,7 @@ ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); ZeroMemory(&pi, sizeof(pi)); - if(CreateProcess(NULL, + if (CreateProcess(NULL, szCmdline, NULL, NULL, @@ -760,7 +760,7 @@ case IDC_SCREENS_TESTSC: // Screensaver Preview { - if(command == BN_CLICKED) + if (command == BN_CLICKED) { ScreensaverPreview(hwndDlg, pData); SetScreenSaverPreviewBox(hwndDlg, pData); Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -101,7 +101,7 @@ DeleteDC(hDC); /* List all settings */ - devmode.dmSize = (WORD)sizeof(DEVMODE); + devmode.dmSize = (WORD)sizeof(devmode); devmode.dmDriverExtra = 0; if (!EnumDisplaySettingsEx(DeviceName, ENUM_CURRENT_SETTINGS, &devmode, dwFlags)) @@ -319,7 +319,7 @@ /* Get video cards list */ pData->DisplayDeviceList = NULL; - displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); + displayDevice.cb = sizeof(displayDevice); while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) { if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) @@ -393,7 +393,7 @@ } /* Initialize the color spectrum bitmaps */ - for(i = 0; i < NUM_SPECTRUM_BITMAPS; i++) + for (i = 0; i < NUM_SPECTRUM_BITMAPS; i++) { pData->hSpectrumBitmaps[i] = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM_4 + i), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); @@ -724,8 +724,8 @@ /* Apply new settings */ LONG rc; DEVMODE devmode; - RtlZeroMemory(&devmode, sizeof(DEVMODE)); - devmode.dmSize = (WORD)sizeof(DEVMODE); + RtlZeroMemory(&devmode, sizeof(devmode)); + devmode.dmSize = (WORD)sizeof(devmode); devmode.dmPelsWidth = pData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; devmode.dmPelsHeight = pData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; devmode.dmBitsPerPel = pData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel; Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Wed Oct 26 21:14:39 2016 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/theme.c - * PURPOSE: Handling themes + * PURPOSE: Handling themes and visual effects * * PROGRAMMERS: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -58,7 +58,7 @@ /******************************************************************************/ -VOID +VOID SchemeSetMetric(IN COLOR_SCHEME *scheme, int id, int value) { switch(id) @@ -78,7 +78,7 @@ } } -int +int SchemeGetMetric(IN COLOR_SCHEME *scheme, int id) { switch (id) @@ -86,12 +86,12 @@ case SIZE_BORDER_WIDTH: return scheme->ncMetrics.iBorderWidth; case SIZE_SCROLL_WIDTH: return scheme->ncMetrics.iScrollWidth; case SIZE_SCROLL_HEIGHT: return scheme->ncMetrics.iScrollHeight; - case SIZE_CAPTION_WIDTH: return scheme->ncMetrics.iCaptionWidth; - case SIZE_CAPTION_HEIGHT: return scheme->ncMetrics.iCaptionHeight; - case SIZE_SM_CAPTION_WIDTH: return scheme->ncMetrics.iSmCaptionWidth; - case SIZE_SM_CAPTION_HEIGHT: return scheme->ncMetrics.iSmCaptionHeight; - case SIZE_MENU_WIDTH: return scheme->ncMetrics.iMenuWidth; - case SIZE_MENU_HEIGHT: return scheme->ncMetrics.iMenuHeight; + case SIZE_CAPTION_WIDTH: return scheme->ncMetrics.iCaptionWidth; + case SIZE_CAPTION_HEIGHT: return scheme->ncMetrics.iCaptionHeight; + case SIZE_SM_CAPTION_WIDTH: return scheme->ncMetrics.iSmCaptionWidth; + case SIZE_SM_CAPTION_HEIGHT: return scheme->ncMetrics.iSmCaptionHeight; + case SIZE_MENU_WIDTH: return scheme->ncMetrics.iMenuWidth; + case SIZE_MENU_HEIGHT: return scheme->ncMetrics.iMenuHeight; case SIZE_ICON: return scheme->iIconSize; case SIZE_ICON_SPACE_X: return scheme->icMetrics.iHorzSpacing; case SIZE_ICON_SPACE_Y: return scheme->icMetrics.iVertSpacing; @@ -132,38 +132,38 @@ /* Load non client metrics */ scheme->ncMetrics.cbSize = sizeof(NONCLIENTMETRICSW); - ret = SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, - sizeof(NONCLIENTMETRICSW), - &scheme->ncMetrics, + ret = SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICSW), + &scheme->ncMetrics, 0); if (!ret) return FALSE; /* Load icon metrics */ scheme->icMetrics.cbSize = sizeof(ICONMETRICSW); - ret = SystemParametersInfoW(SPI_GETICONMETRICS, - sizeof(ICONMETRICSW), - &scheme->icMetrics, + ret = SystemParametersInfoW(SPI_GETICONMETRICS, + sizeof(ICONMETRICSW), + &scheme->icMetrics, 0); if (!ret) return FALSE; /* Load flat menu style */ - ret = SystemParametersInfoW(SPI_GETFLATMENU, - 0, - &scheme->bFlatMenus, + ret = SystemParametersInfoW(SPI_GETFLATMENU, + 0, + &scheme->bFlatMenus, 0); if (!ret) return FALSE; /* Effects */ - /* "Use the following transition effect for menus and tooltips" */ - ret = SystemParametersInfoW(SPI_GETMENUANIMATION, - 0, - &scheme->Effects.bMenuAnimation, + /* Use the following transition effect for menus and tooltips */ + ret = SystemParametersInfoW(SPI_GETMENUANIMATION, + 0, + &scheme->Effects.bMenuAnimation, 0); if (!ret) return FALSE; - ret = SystemParametersInfoW(SPI_GETMENUFADE, - 0, - &scheme->Effects.bMenuFade, + ret = SystemParametersInfoW(SPI_GETMENUFADE, + 0, + &scheme->Effects.bMenuFade, 0); if (!ret) return FALSE; @@ -174,16 +174,16 @@ scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; /* Show content of windows during dragging */ - ret = SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, - 0, - &scheme->Effects.bDragFullWindows, + ret = SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, + 0, + &scheme->Effects.bDragFullWindows, 0); if (!ret) return FALSE; - /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ - ret = SystemParametersInfoW(SPI_GETKEYBOARDCUES, - 0, - &scheme->Effects.bKeyboardCues, + /* Hide underlined letters for keyboard navigation until I press the Alt key */ + ret = SystemParametersInfoW(SPI_GETKEYBOARDCUES, + 0, + &scheme->Effects.bKeyboardCues, 0); if (!ret) return FALSE; @@ -199,7 +199,7 @@ } /* - * LoadSchemeFromReg: Populates the passed scheme with values retireved from registry + * LoadSchemeFromReg: Populates the passed scheme with values retireved from registry */ BOOL LoadSchemeFromReg(OUT COLOR_SCHEME *scheme, IN PTHEME_SELECTION pSelectedTheme) @@ -212,9 +212,9 @@ BOOL Ret = TRUE; LONG result; - wsprintf(strSchemeKey, L"%s\\%s\\Sizes\\%s", - g_CPANewSchemes, - pSelectedTheme->Color->StyleName, + wsprintf(strSchemeKey, L"%s\\%s\\Sizes\\%s", + g_CPANewSchemes, + pSelectedTheme->Color->StyleName, pSelectedTheme->Size->StyleName); result = RegOpenKeyW(HKEY_CURRENT_USER, strSchemeKey, &hkScheme); @@ -226,11 +226,11 @@ { wsprintf(strValueName, L"Color #%d", i); dwLength = sizeof(COLORREF); - result = RegQueryValueExW(hkScheme, - strValueName, - NULL, - &dwType, - (LPBYTE)&scheme->crColor[i], + result = RegQueryValueExW(hkScheme, + strValueName, + NULL, + &dwType, + (LPBYTE)&scheme->crColor[i], &dwLength); if (result != ERROR_SUCCESS || dwType != REG_DWORD) { @@ -245,13 +245,13 @@ wsprintf(strValueName, L"Font #%d", i); dwLength = sizeof(LOGFONT); - result = RegQueryValueExW(hkScheme, - strValueName, - NULL, - &dwType, - (LPBYTE)lpfFont, + result = RegQueryValueExW(hkScheme, + strValueName, + NULL, + &dwType, + (LPBYTE)lpfFont, &dwLength); - if (result != ERROR_SUCCESS || dwType != REG_BINARY || + if (result != ERROR_SUCCESS || dwType != REG_BINARY || dwLength != sizeof(LOGFONT)) { /* Failed to read registry value */ @@ -263,13 +263,13 @@ { wsprintf(strValueName, L"Size #%d", i); dwLength = sizeof(UINT64); - result = RegQueryValueExW(hkScheme, - strValueName, - NULL, - &dwType, - (LPBYTE)&iSize, + result = RegQueryValueExW(hkScheme, + strValueName, + NULL, + &dwType, + (LPBYTE)&iSize, &dwLength); - if (result != ERROR_SUCCESS || dwType != REG_QWORD || + if (result != ERROR_SUCCESS || dwType != REG_QWORD || dwLength != sizeof(UINT64)) { /* Failed to read registry value, initialize with current setting for now */ @@ -281,12 +281,12 @@ } RegCloseKey(hkScheme); - + return Ret; } /* - ApplyScheme: Applies the selected scheme and stores its id in the registry if needed + * ApplyScheme: Applies the selected scheme and stores its id in the registry if needed */ VOID ApplyScheme(IN COLOR_SCHEME *scheme, IN PTHEME_SELECTION pSelectedTheme) @@ -307,32 +307,32 @@ { for (i = 0; i < NUM_COLORS; i++) { - wsprintf(clText, - L"%d %d %d", - GetRValue(scheme->crColor[i]), - GetGValue(scheme->crColor[i]), + wsprintf(clText, + L"%d %d %d", + GetRValue(scheme->crColor[i]), + GetGValue(scheme->crColor[i]), GetBValue(scheme->crColor[i])); - - RegSetValueExW(hKey, - g_RegColorNames[i], - 0, - REG_SZ, - (BYTE *)clText, + + RegSetValueExW(hKey, + g_RegColorNames[i], + 0, + REG_SZ, + (BYTE *)clText, (lstrlen(clText) + 1) * sizeof(WCHAR)); } RegCloseKey(hKey); } /* Apply non client metrics */ - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, - sizeof(NONCLIENTMETRICS), - &scheme->ncMetrics, + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), + &scheme->ncMetrics, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); /* Apply icon metrics */ - SystemParametersInfoW(SPI_SETICONMETRICS, - sizeof(ICONMETRICS), - &scheme->icMetrics, + SystemParametersInfoW(SPI_SETICONMETRICS, + sizeof(ICONMETRICS), + &scheme->icMetrics, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); /* Effects, save only when needed: */ @@ -361,11 +361,11 @@ if (pSelectedTheme->Theme != NULL && pSelectedTheme->ThemeActive == FALSE) { StyleName = pSelectedTheme->Color->StyleName; - SHSetValueW(HKEY_CURRENT_USER, + SHSetValueW(HKEY_CURRENT_USER, g_CPANewSchemes, - g_SelectedStyle, - REG_SZ, - StyleName, + g_SelectedStyle, + REG_SZ, + StyleName, (lstrlenW(StyleName) + 1) * sizeof(WCHAR)); } } @@ -377,7 +377,7 @@ pTheme = (PTHEME) malloc(sizeof(THEME)); if (pTheme == NULL) return NULL; - + pTheme->DisplayName = _wcsdup(pszDisplayName); if (pTheme->DisplayName == NULL) { @@ -402,7 +402,7 @@ free(pTheme); return NULL; } - + return pTheme; } @@ -446,7 +446,7 @@ if (pStyle->ChildStyle) CleanupStyles(pStyle->ChildStyle); if (pStyle->DisplayName) free(pStyle->DisplayName); if (pStyle->StyleName) free(pStyle->StyleName); - + pStyleOld = pStyle; pStyle = pStyle->NextStyle; free(pStyleOld); @@ -472,7 +472,7 @@ } } -static PTHEME_STYLE +static PTHEME_STYLE FindStyle(IN PTHEME_STYLE pStylesList, IN PCWSTR StyleName) { PTHEME_STYLE pStyle; @@ -492,7 +492,7 @@ /* * LoadSchemeSizes: Returns a list of sizes from the registry key of a scheme */ -static PTHEME_STYLE +static PTHEME_STYLE LoadSchemeSizes(IN HKEY hkScheme) { HKEY hkSizes, hkSize; @@ -511,25 +511,25 @@ Result = RegOpenKeyW(hkSizes, wstrSizeName, &hkSize); if (Result != ERROR_SUCCESS) continue; - - Result = RegLoadMUIStringW(hkSize, - L"DisplayName", - wstrDisplayName, - sizeof(wstrDisplayName), - NULL, - 0, + + Result = RegLoadMUIStringW(hkSize, + L"DisplayName", + wstrDisplayName, + sizeof(wstrDisplayName), + NULL, + 0, NULL); if (Result != ERROR_SUCCESS) { - Result = RegLoadMUIStringW(hkSize, - L"LegacyName", - wstrDisplayName, - sizeof(wstrDisplayName), - NULL, - 0, + Result = RegLoadMUIStringW(hkSize, + L"LegacyName", + wstrDisplayName, + sizeof(wstrDisplayName), + NULL, + 0, NULL); } - + if (Result == ERROR_SUCCESS) pCurrentStyle = CreateStyle(wstrSizeName, wstrDisplayName); else @@ -549,9 +549,9 @@ } /* - LoadClassicColorSchemes: Returns a list of classic theme colours from the registry key of a scheme -*/ -static THEME_STYLE* + * LoadClassicColorSchemes: Returns a list of classic theme colours from the registry key of a scheme + */ +static THEME_STYLE* LoadClassicColorSchemes(VOID) { INT Result; @@ -570,22 +570,22 @@ Result = RegOpenKeyW(hkNewSchemes, wstrStyleName, &hkScheme); if (Result != ERROR_SUCCESS) continue; - - Result = RegLoadMUIStringW(hkScheme, + + Result = RegLoadMUIStringW(hkScheme, L"DisplayName", - wstrDisplayName, - sizeof(wstrDisplayName), - NULL, - 0, + wstrDisplayName, + sizeof(wstrDisplayName), + NULL, + 0, NULL); if (Result != ERROR_SUCCESS) { - Result = RegLoadMUIStringW(hkScheme, - L"LegacyName", - wstrDisplayName, - sizeof(wstrDisplayName), - NULL, - 0, + Result = RegLoadMUIStringW(hkScheme, + L"LegacyName", + wstrDisplayName, + sizeof(wstrDisplayName), + NULL, + 0, NULL); } @@ -613,7 +613,7 @@ typedef HRESULT (WINAPI *ENUMTHEMESTYLE) (LPCWSTR, LPWSTR, DWORD, PTHEMENAMES); -static THEME_STYLE* +static THEME_STYLE* EnumThemeStyles(IN LPCWSTR pszThemeFileName, IN ENUMTHEMESTYLE pfnEnumTheme) { DWORD index = 0; @@ -634,11 +634,11 @@ return List; } -BOOL CALLBACK -EnumThemeProc(IN LPVOID lpReserved, +BOOL CALLBACK +EnumThemeProc(IN LPVOID lpReserved, IN LPCWSTR pszThemeFileName, - IN LPCWSTR pszThemeName, - IN LPCWSTR pszToolTip, + IN LPCWSTR pszThemeName, + IN LPCWSTR pszToolTip, IN LPVOID lpReserved2, IN OUT LPVOID lpData) { @@ -663,10 +663,10 @@ return TRUE; } -/* - LoadThemes: Returns a list that contains tha classic theme and - the visual styles of the system -*/ +/* + * LoadThemes: Returns a list that contains tha classic theme and + * the visual styles of the system + */ PTHEME LoadThemes() { @@ -705,9 +705,9 @@ return pClassicTheme; } -/* - * GetActiveTheme: Gets the active theme and populates pSelectedTheme - * with entries from the list of loaded themes +/* + * GetActiveTheme: Gets the active theme and populates pSelectedTheme + * with entries from the list of loaded themes */ BOOL GetActiveTheme(IN PTHEME pThemeList, OUT PTHEME_SELECTION pSelectedTheme) @@ -717,21 +717,21 @@ WCHAR szSizeBuff[MAX_PATH]; PTHEME pTheme; HRESULT hret; - + ZeroMemory(pSelectedTheme, sizeof(THEME_SELECTION)); /* Retrieve the name of the current theme */ - hret = GetCurrentThemeName(szThemeFileName, - MAX_PATH, - szColorBuff, - MAX_PATH, - szSizeBuff, + hret = GetCurrentThemeName(szThemeFileName, + MAX_PATH, + szColorBuff, + MAX_PATH, + szSizeBuff, MAX_PATH); if (FAILED(hret)) return FALSE; for (pTheme = pThemeList; pTheme; pTheme = pTheme->NextTheme) { - if(pTheme->ThemeFileName && + if (pTheme->ThemeFileName && _wcsicmp(pTheme->ThemeFileName, szThemeFileName) == 0) { break; @@ -748,10 +748,10 @@ return TRUE; } -/* - GetActiveTheme: Gets the active classic theme and populates pSelectedTheme - with entries from the list of loaded themes -*/ +/* + * GetActiveTheme: Gets the active classic theme and populates pSelectedTheme + * with entries from the list of loaded themes + */ BOOL GetActiveClassicTheme(IN PTHEME pThemeList, OUT PTHEME_SELECTION pSelectedTheme) { @@ -762,7 +762,7 @@ PTHEME_STYLE pCurrentStyle, pCurrentSize; ZeroMemory(pSelectedTheme, sizeof(THEME_SELECTION)); - + /* Assume failure */ szSelectedClassicScheme[0] = 0; szSelectedClassicSize[0] = 0; @@ -772,7 +772,7 @@ dwType = REG_SZ; dwDisplayNameLength = sizeof(szSelectedClassicScheme); - Result = RegQueryValueEx(hkNewSchemes, L"SelectedStyle", NULL, &dwType, + Result = RegQueryValueEx(hkNewSchemes, L"SelectedStyle", NULL, &dwType, (LPBYTE)&szSelectedClassicScheme, &dwDisplayNameLength); if (Result == ERROR_SUCCESS) { @@ -802,10 +802,10 @@ if (pSelectedTheme->ThemeActive) { - hret = OpenThemeFile(pSelectedTheme->Theme->ThemeFileName, - pSelectedTheme->Color->StyleName, - pSelectedTheme->Size->StyleName, - &hThemeFile, + hret = OpenThemeFile(pSelectedTheme->Theme->ThemeFileName, + pSelectedTheme->Color->StyleName, + pSelectedTheme->Size->StyleName, + &hThemeFile, 0); if (!SUCCEEDED(hret)) return FALSE; @@ -829,14 +829,14 @@ HTHEME hTheme; int i; - hret = OpenThemeFile(pSelectedTheme->Theme->ThemeFileName, - pSelectedTheme->Color->StyleName, - pSelectedTheme->Size->StyleName, - &hThemeFile, + hret = OpenThemeFile(pSelectedTheme->Theme->ThemeFileName, + pSelectedTheme->Color->StyleName, + pSelectedTheme->Size->StyleName, + &hThemeFile, 0); if (!SUCCEEDED(hret)) return FALSE; - + hTheme = OpenThemeDataFromFile(hThemeFile, hCPLWindow, L"WINDOW", 0); if (hTheme == NULL) return FALSE; @@ -865,7 +865,7 @@ GetThemeSysFont(hTheme, TMT_STATUSFONT, &scheme->ncMetrics.lfStatusFont); GetThemeSysFont(hTheme, TMT_MSGBOXFONT, &scheme->ncMetrics.lfMessageFont); GetThemeSysFont(hTheme, TMT_ICONTITLEFONT, &scheme->icMetrics.lfFont); - + CloseThemeData(hTheme); return TRUE; @@ -884,13 +884,13 @@ InflateRect(prcWindow, -10, -10); - hres = DrawNCPreview(hdcMem, + hres = DrawNCPreview(hdcMem, DNCP_DRAW_ALL, prcWindow, - pSelectedTheme->Theme->ThemeFileName, - pSelectedTheme->Color->StyleName, - pSelectedTheme->Size->StyleName, - &scheme->ncMetrics, + pSelectedTheme->Theme->ThemeFileName, + pSelectedTheme->Color->StyleName, + pSelectedTheme->Size->StyleName, + &scheme->ncMetrics, scheme->crColor); return SUCCEEDED(hres);

1 0

← Newer
1
2
3
4
5
6
7
8
...
23
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 2016