Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 48889: [CMAKE] Add importlibs for c++ modules.
by spetreolle＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: spetreolle Date: Sat Sep 25 19:43:52 2010 New Revision: 48889 URL: http://svn.reactos.org/svn/reactos?rev=48889&view=rev Log: [CMAKE] Add importlibs for c++ modules. Added: branches/cmake-bringup/importlibs/libmingw32.a (with props) branches/cmake-bringup/importlibs/libmingwex.a (with props) branches/cmake-bringup/importlibs/libstdc++.a (with props) branches/cmake-bringup/importlibs/libsupc++.a (with props) Added: branches/cmake-bringup/importlibs/libmingw32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libmingw32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libmingwex.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmin… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libmingwex.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libstdc++.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libstd… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libstdc++.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libsupc++.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsup… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libsupc++.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[mkupfer] 48888: one more fix (on request of Pierre S.)
by mkupfer＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: mkupfer Date: Sat Sep 25 19:24:03 2010 New Revision: 48888 URL: http://svn.reactos.org/svn/reactos?rev=48888&view=rev Log: one more fix (on request of Pierre S.) Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sat Sep 25 19:24:03 2010 @@ -683,14 +683,12 @@ REG_SZ, (PVOID)(LanguageId + 4), 8 * sizeof(PWCHAR)); + NtClose(KeyHandle); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); + return FALSE; + } return TRUE; } @@ -990,14 +988,13 @@ REG_SZ, (PVOID)Id, (wcslen(Id) + 1) * sizeof(WCHAR)); + NtClose(KeyHandle); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status); - NtClose(KeyHandle); return FALSE; } - NtClose(KeyHandle); return TRUE; }

1 0

[spetreolle] 48887: [CMAKE] Add explorer to build. Not enabled now, it links but executable is not valid.
by spetreolle＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: spetreolle Date: Sat Sep 25 19:17:39 2010 New Revision: 48887 URL: http://svn.reactos.org/svn/reactos?rev=48887&view=rev Log: [CMAKE] Add explorer to build. Not enabled now, it links but executable is not valid. Added: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt (with props) branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libcoldname.a (with props) branches/cmake-bringup/importlibs/libcomctl32.a (with props) branches/cmake-bringup/importlibs/libmsimg32.a (with props) branches/cmake-bringup/importlibs/libole32.a (with props) branches/cmake-bringup/importlibs/liboleaut32.a (with props) branches/cmake-bringup/importlibs/libws2_32.a (with props) Added: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Sep 25 19:17:39 2010 @@ -1,0 +1,70 @@ +add_subdirectory(notifyhook) + +add_definitions(-DUNICODE -D_UNICODE) +add_definitions(-DWIN32) +add_definitions(-D__WINDRES__) + +#add_pch(explorer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +list(APPEND SOURCE + shell/mainframe.cpp + shell/unixfs.cpp + shell/ntobjfs.cpp + shell/filechild.cpp + shell/shellfs.cpp + shell/fatfs.cpp + shell/pane.cpp + shell/regfs.cpp + shell/webchild.cpp + shell/entries.cpp + shell/shellbrowser.cpp + shell/winfs.cpp + dialogs/searchprogram.cpp + dialogs/settings.cpp + i386-stub-win32.c + taskbar/taskbar.cpp + taskbar/favorites.cpp + taskbar/quicklaunch.cpp + taskbar/desktopbar.cpp + taskbar/startmenu.cpp + taskbar/traynotify.cpp + precomp.cpp + services/startup.c + services/shellservices.cpp + desktop/desktop.cpp + explorer.cpp + utility/xs-native.cpp + utility/shellclasses.cpp + utility/dragdropimpl.cpp + utility/utility.cpp + utility/xmlstorage.cpp + utility/splitpath.c + utility/window.cpp + utility/shellbrowserimpl.cpp) # utility/shelltests.cpp + + +add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE}) + +set_module_type(explorer win32gui) + +target_link_libraries(explorer + mingw_wmain + mingw_common + coldname + oldnames + wine + uuid) + +add_importlibs(explorer + advapi32 + gdi32 + user32 + ws2_32 + msimg32 + comctl32 + ole32 + oleaut32 + shell32 + notifyhook + msvcrt) Propchange: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] Sat Sep 25 19:17:39 2010 @@ -1,0 +1,10 @@ +add_definitions(-D_NOTIFYHOOK_IMPL) + +add_library(notifyhook SHARED notifyhook.c ${CMAKE_CURRENT_SOURCE_DIR}/notifyhook.rc) + +set_module_type(notifyhook win32dll) + +target_link_libraries(notifyhook + ${CMAKE_CURRENT_SOURCE_DIR}/notifyhook.def + -lkernel32 + -luser32) Propchange: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcol… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libcoldname.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libcomctl32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcom… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libcomctl32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libmsimg32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libmsimg32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libole32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libole32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/liboleaut32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/liboleaut32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libws2_32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libws2_32.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[mkupfer] 48886: add missing close for handle
by mkupfer＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: mkupfer Date: Sat Sep 25 19:07:37 2010 New Revision: 48886 URL: http://svn.reactos.org/svn/reactos?rev=48886&view=rev Log: add missing close for handle Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sat Sep 25 19:07:37 2010 @@ -997,6 +997,7 @@ return FALSE; } + NtClose(KeyHandle); return TRUE; }

1 0

[jgardou] 48885: merge r48884 from trunk
by jgardou＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: jgardou Date: Sat Sep 25 18:48:17 2010 New Revision: 48885 URL: http://svn.reactos.org/svn/reactos?rev=48885&view=rev Log: merge r48884 from trunk Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc Propchange: branches/cmake-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 25 18:48:17 2010 @@ -2,4 +2,4 @@ /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 -/trunk/reactos:48236-48828 +/trunk/reactos:48236-48828,48884 Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Bulgarian Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Catalan Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -3,8 +3,6 @@ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2008-11-30 by Kario */ - -#include "resource.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: German Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Greek Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_GREEK, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: English Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -6,8 +6,6 @@ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) * ACTUALIZADO: Javier Remacha - 13/01/09 */ -#include "resource.h" - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Basque Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: French Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -6,8 +6,6 @@ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) * TRANSLATOR: Xxxx00 */ -#include "resource.h" - LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,9 +5,6 @@ * PURPOSE: Indonesian Language File for Solitaire * TRANSLATOR: Zaenal Mutaqin (ade999(a)gmail.com) */ - -#include "resource.h" - LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,9 +5,6 @@ * PURPOSE: Italian Language File for Solitaire (gabriel ilardi) * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ - -#include "resource.h" - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Japanese Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -1,8 +1,6 @@ /* *Korean translation of solitaire by Seungju Kim(manatails007) (www.seungjukim.com) */ -#include "resource.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -6,8 +6,6 @@ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) * TRANSLATORS: Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ -#include "resource.h" - LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Dutch Language Resource File for Solitaire * TRANSLATOR: Wouter De Vlieger */ -#include "resource.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,9 +5,6 @@ * PURPOSE: Norwegian Language File for Solitaire * TRANSLATOR: LMH1 */ - -#include "resource.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -4,8 +4,6 @@ * https://sourceforge.net/projects/reactospl * updated by Caemyr (olaf_siejka(a)o2.pl), Nov, 2008 */ - -#include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -4,8 +4,6 @@ * FILE: base/applications/games/solitaire/lang/ro-RO.rc * PURPOSE: Romanian Language File for Solitaire */ - -#include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -1,6 +1,4 @@ // Russian language resource file (Dmitry Chapyshev, 2007-06-10) - -#include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -7,7 +7,6 @@ * DATE OF TR.: 13-07-2007 * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Thai Language File for Solitaire * TRANSLATOR: Sumath Aowsakulsutthi */ - -#include "resource.h" LANGUAGE LANG_THAI, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,7 +5,6 @@ * PURPOSE: Ukraianian Language File for Solitaire * TRANSLATOR: Artem Reznikov */ -#include "resource.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] Sat Sep 25 18:48:17 2010 @@ -5,8 +5,6 @@ * PURPOSE: Simplified Chinese Language resources File for Solitaire * TRANSLATOR: zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> */ - -#include "resource.h" LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

1 0

[jgardou] 48884: [SOLITAIRE] - do not include already included file in rc files
by jgardou＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: jgardou Date: Sat Sep 25 18:44:54 2010 New Revision: 48884 URL: http://svn.reactos.org/svn/reactos?rev=48884&view=rev Log: [SOLITAIRE] - do not include already included file in rc files Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/hu-HU.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Bulgarian Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Catalan Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -3,8 +3,6 @@ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2008-11-30 by Kario */ - -#include "resource.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: German Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Greek Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_GREEK, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: English Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -6,8 +6,6 @@ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) * ACTUALIZADO: Javier Remacha - 13/01/09 */ -#include "resource.h" - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Basque Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: French Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/hu-HU.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -6,8 +6,6 @@ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) * TRANSLATOR: Xxxx00 */ -#include "resource.h" - LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,9 +5,6 @@ * PURPOSE: Indonesian Language File for Solitaire * TRANSLATOR: Zaenal Mutaqin (ade999(a)gmail.com) */ - -#include "resource.h" - LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,9 +5,6 @@ * PURPOSE: Italian Language File for Solitaire (gabriel ilardi) * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ - -#include "resource.h" - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Japanese Language File for Solitaire * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" - LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -1,8 +1,6 @@ /* *Korean translation of solitaire by Seungju Kim(manatails007) (www.seungjukim.com) */ -#include "resource.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -6,8 +6,6 @@ * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) * TRANSLATORS: Vytis "CMan" Girdþijauskas (cman(a)cman.us) */ -#include "resource.h" - LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Dutch Language Resource File for Solitaire * TRANSLATOR: Wouter De Vlieger */ -#include "resource.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,9 +5,6 @@ * PURPOSE: Norwegian Language File for Solitaire * TRANSLATOR: LMH1 */ - -#include "resource.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -4,8 +4,6 @@ * https://sourceforge.net/projects/reactospl * updated by Caemyr (olaf_siejka(a)o2.pl), Nov, 2008 */ - -#include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -4,8 +4,6 @@ * FILE: base/applications/games/solitaire/lang/ro-RO.rc * PURPOSE: Romanian Language File for Solitaire */ - -#include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -1,6 +1,4 @@ // Russian language resource file (Dmitry Chapyshev, 2007-06-10) - -#include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -7,7 +7,6 @@ * DATE OF TR.: 13-07-2007 * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) */ -#include "resource.h" LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Thai Language File for Solitaire * TRANSLATOR: Sumath Aowsakulsutthi */ - -#include "resource.h" LANGUAGE LANG_THAI, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,7 +5,6 @@ * PURPOSE: Ukraianian Language File for Solitaire * TRANSLATOR: Artem Reznikov */ -#include "resource.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1] Sat Sep 25 18:44:54 2010 @@ -5,8 +5,6 @@ * PURPOSE: Simplified Chinese Language resources File for Solitaire * TRANSLATOR: zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> */ - -#include "resource.h" LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED

1 0

[mkupfer] 48883: fix GeoID bug (forgotten \0)
by mkupfer＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: mkupfer Date: Sat Sep 25 18:24:57 2010 New Revision: 48883 URL: http://svn.reactos.org/svn/reactos?rev=48883&view=rev Log: fix GeoID bug (forgotten \0) Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sat Sep 25 18:24:57 2010 @@ -989,7 +989,7 @@ 0, REG_SZ, (PVOID)Id, - (wcslen(Id) * sizeof(WCHAR))); + (wcslen(Id) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status);

1 0

[akhaldi] 48882: [CMAKE] - Fix the linking regression.
by akhaldi＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: akhaldi Date: Sat Sep 25 17:57:03 2010 New Revision: 48882 URL: http://svn.reactos.org/svn/reactos?rev=48882&view=rev Log: [CMAKE] - Fix the linking regression. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sat Sep 25 17:57:03 2010 @@ -32,7 +32,7 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") # Use stdcall fixups, and don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "-lgcc") +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard Libraries") MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) set(CMAKE_CXX_STANDARD_LIBRARIES "")

1 0

[jgardou] 48881: [CMAKE] - improve cacls build file - add control and extrac32 to build
by jgardou＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: jgardou Date: Sat Sep 25 17:42:29 2010 New Revision: 48881 URL: http://svn.reactos.org/svn/reactos?rev=48881&view=rev Log: [CMAKE] - improve cacls build file - add control and extrac32 to build Added: branches/cmake-bringup/base/applications/control/CMakeLists.txt (with props) branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libsetupapi.a (with props) branches/cmake-bringup/importlibs/libshlwapi.a (with props) Modified: branches/cmake-bringup/base/applications/CMakeLists.txt branches/cmake-bringup/base/applications/cacls/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:42:29 2010 @@ -3,9 +3,9 @@ add_subdirectory(calc) add_subdirectory(charmap) add_subdirectory(cmdutils) -#add_subdirectory(control) +add_subdirectory(control) #add_subdirectory(dxdiag) -#add_subdirectory(extrac32) +add_subdirectory(extrac32) #add_subdirectory(fontview) #add_subdirectory(games) #add_subdirectory(hh) Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:42:29 2010 @@ -1,12 +1,16 @@ -add_executable(cacls +list(APPEND SOURCE cacls.c cacls.rc) -set_module_type(cacls win32cui) +add_executable(cacls + ${CMAKE_CURRENT_BINARY_DIR}/cacls_precomp.h.gch + ${SOURCE}) + +add_pch(cacls ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_unicode(cacls yes) -add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt) +set_module_type(cacls win32cui) -add_dependencies(cacls psdk) +add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt) Added: branches/cmake-bringup/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/control/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:42:29 2010 @@ -1,0 +1,10 @@ + +add_executable(control + control.c + control.rc) + +set_unicode(control yes) + +set_module_type(control win32gui) + +add_importlibs(control advapi32 shell32 kernel32 msvcrt) Propchange: branches/cmake-bringup/base/applications/control/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:42:29 2010 @@ -1,0 +1,10 @@ + +add_executable(extrac32 extrac32.c) + +set_unicode(extrac32 yes) + +set_module_type(extrac32 win32gui) + +target_link_libraries(extrac32 wine) + +add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt) Propchange: branches/cmake-bringup/base/applications/extrac32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libsetupapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libset… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libsetupapi.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libshlwapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshl… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libshlwapi.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[spetreolle] 48880: [CMAKE] Add cmd to build.
by spetreolle＠svn.reactos.org 25 Sep '10

25 Sep '10

Author: spetreolle Date: Sat Sep 25 17:40:02 2010 New Revision: 48880 URL: http://svn.reactos.org/svn/reactos?rev=48880&view=rev Log: [CMAKE] Add cmd to build. Added: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt Modified: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:40:02 2010 @@ -2,5 +2,5 @@ add_subdirectory(applications) #add_subdirectory(services) add_subdirectory(setup) -#add_subdirectory(shell) +add_subdirectory(shell) #add_subdirectory(system) Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:40:02 2010 @@ -1,4 +1,4 @@ -#add_subdirectory(cmd) +add_subdirectory(cmd) #add_subdirectory(explorer) #add_subdirectory(explorer_new) Added: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt (added) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sat Sep 25 17:40:02 2010 @@ -1,0 +1,77 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_definitions(-DANONYMOUSUNIONS) +add_definitions(-D_DEBUG_MEM) + +list(APPEND SOURCE + cmd.rc + main.c) + +add_pch(cmd ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) + +list(APPEND SOURCE + alias.c + assoc.c + attrib.c + batch.c + beep.c + call.c + chcp.c + choice.c + cls.c + cmd.c + cmddbg.c + cmdinput.c + cmdtable.c + color.c + console.c + copy.c + date.c + del.c + delay.c + dir.c + dirstack.c + echo.c + error.c + filecomp.c + for.c + free.c + goto.c + history.c + if.c + internal.c + label.c + locale.c + memory.c + misc.c + mklink.c + move.c + msgbox.c + parser.c + path.c + pause.c + prompt.c + redir.c + ren.c + replace.c + screen.c + set.c + setlocal.c + shift.c + start.c + strtoclr.c + time.c + timer.c + title.c + type.c + ver.c + verify.c + vol.c + where.c + window.c) + +add_executable(cmd ${CMAKE_CURRENT_BINARY_DIR}/cmd_precomp.h.gch ${SOURCE}) +set_module_type(cmd win32cui) +set_unicode(cmd yes) +target_link_libraries(cmd oldnames wine) +add_importlibs(cmd advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs