Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 02/05: [PSDK] Add some missing definitions from Wine in vss.idl Required by vssapi stubs and Wine's vsbackup.idl CORE-9511.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9994a4309c666acd28567… commit 9994a4309c666acd2856721dad0c1475b46554fd Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Mar 25 20:59:25 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 7 19:45:05 2020 +0200 [PSDK] Add some missing definitions from Wine in vss.idl Required by vssapi stubs and Wine's vsbackup.idl CORE-9511. --- sdk/include/psdk/vss.idl | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/sdk/include/psdk/vss.idl b/sdk/include/psdk/vss.idl index 62335ea8408..902a6aec784 100644 --- a/sdk/include/psdk/vss.idl +++ b/sdk/include/psdk/vss.idl @@ -19,6 +19,8 @@ import "oaidl.idl"; typedef GUID VSS_ID; +typedef [unique, string] WCHAR *VSS_PWSZ; +typedef LONGLONG VSS_TIMESTAMP; typedef enum _VSS_APPLICATION_LEVEL { @@ -29,3 +31,91 @@ typedef enum _VSS_APPLICATION_LEVEL VSS_APP_FRONT_END = 3, VSS_APP_SYSTEM_RM = 4 } VSS_APPLICATION_LEVEL; + +typedef enum _VSS_BACKUP_TYPE +{ + VSS_BT_UNDEFINED, + VSS_BT_FULL, + VSS_BT_INCREMENTAL, + VSS_BT_DIFFERENTIAL, + VSS_BT_LOG, + VSS_BT_COPY, + VSS_BT_OTHER +} VSS_BACKUP_TYPE, *PVSS_BACKUP_TYPE; + +typedef enum _VSS_RESTORE_TYPE +{ + VSS_RTYPE_UNDEFINED, + VSS_RTYPE_BY_COPY, + VSS_RTYPE_IMPORT, + VSS_RTYPE_OTHER +} VSS_RESTORE_TYPE, *PVSS_RESTORE_TYPE; + +typedef enum _VSS_WRITER_STATE +{ + VSS_WS_UNKNOWN, + VSS_WS_STABLE, + VSS_WS_WAITING_FOR_FREEZE, + VSS_WS_WAITING_FOR_THAW, + VSS_WS_WAITING_FOR_POST_SNAPSHOT, + VSS_WS_WAITING_FOR_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_IDENTIFY, + VSS_WS_FAILED_AT_PREPARE_BACKUP, + VSS_WS_FAILED_AT_PREPARE_SNAPSHOT, + VSS_WS_FAILED_AT_FREEZE, + VSS_WS_FAILED_AT_THAW, + VSS_WS_FAILED_AT_POST_SNAPSHOT, + VSS_WS_FAILED_AT_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_PRE_RESTORE, + VSS_WS_FAILED_AT_POST_RESTORE, + VSS_WS_FAILED_AT_BACKUPSHUTDOWN, + VSS_WS_COUNT +} VSS_WRITER_STATE, *PVSS_WRITER_STATE; + +typedef enum _VSS_OBJECT_TYPE +{ + VSS_OBJECT_UNKNOWN, + VSS_OBJECT_NONE, + VSS_OBJECT_SNAPSHOT_SET, + VSS_OBJECT_SNAPSHOT, + VSS_OBJECT_PROVIDER, + VSS_OBJECT_TYPE_COUNT +} VSS_OBJECT_TYPE, *PVSS_OBJECT_TYPE; + +typedef enum _VSS_SNAPSHOT_STATE +{ + VSS_SS_UNKNOWN = 0, + VSS_SS_PREPARING, + VSS_SS_PROCESSING_PREPARE, + VSS_SS_PREPARED, + VSS_SS_PROCESSING_PRECOMMIT, + VSS_SS_PRECOMMITTED, + VSS_SS_PROCESSING_COMMIT, + VSS_SS_COMMITTED, + VSS_SS_PROCESSING_POSTCOMMIT, + VSS_SS_PROCESSING_PREFINALCOMMIT, + VSS_SS_PREFINALCOMMITTED, + VSS_SS_PROCESSING_POSTFINALCOMMIT, + VSS_SS_CREATED, + VSS_SS_ABORTED, + VSS_SS_DELETED, + VSS_SS_POSTCOMMITTED, + VSS_SS_COUNT +} VSS_SNAPSHOT_STATE, *PVSS_SNAPSHOT_STATE; + +typedef struct _VSS_SNAPSHOT_PROP +{ + VSS_ID m_SnapshotId; + VSS_ID m_SnapshotSetId; + LONG m_lSnapshotsCount; + VSS_PWSZ m_pwszSnapshotDeviceObject; + VSS_PWSZ m_pwszOriginalVolumeName; + VSS_PWSZ m_pwszOriginatingMachine; + VSS_PWSZ m_pwszServiceMachine; + VSS_PWSZ m_pwszExposedName; + VSS_PWSZ m_pwszExposedPath; + VSS_ID m_ProviderId; + LONG m_lSnapshotAttributes; + VSS_TIMESTAMP m_tsCreationTimestamp; + VSS_SNAPSHOT_STATE m_eStatus; +} VSS_SNAPSHOT_PROP, *PVSS_SNAPSHOT_PROP;

4 years, 6 months

[reactos] 01/05: [PSDK] Replace our vswriter.h by Wine's vswriter.idl and enable it in CMakeLists.txt Required by vssapi stubs CORE-9511. Our current vswriter.h has no some needed definitions, but simple adding them in the current header is not an option, since Wine's vsbackup.idl (which is required too) depends on it. Then it will not need to add ROS-specific diff(s) in Wine's vsbackup.idl.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eac44a7f9d54d85c6d137… commit eac44a7f9d54d85c6d137e613636593504c09e3e Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Mar 25 20:33:28 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 7 19:45:05 2020 +0200 [PSDK] Replace our vswriter.h by Wine's vswriter.idl and enable it in CMakeLists.txt Required by vssapi stubs CORE-9511. Our current vswriter.h has no some needed definitions, but simple adding them in the current header is not an option, since Wine's vsbackup.idl (which is required too) depends on it. Then it will not need to add ROS-specific diff(s) in Wine's vsbackup.idl. --- sdk/include/psdk/CMakeLists.txt | 1 + sdk/include/psdk/{vswriter.h => vswriter.idl} | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index 4d6b5e6e049..a30e7cd47cf 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -127,6 +127,7 @@ list(APPEND SOURCE vmr9.idl # vmrender.idl vss.idl + vswriter.idl wbemcli.idl wbemdisp.idl wbemprov.idl diff --git a/sdk/include/psdk/vswriter.h b/sdk/include/psdk/vswriter.idl similarity index 81% rename from sdk/include/psdk/vswriter.h rename to sdk/include/psdk/vswriter.idl index 043b871cb60..9d7d4dcf6a0 100644 --- a/sdk/include/psdk/vswriter.h +++ b/sdk/include/psdk/vswriter.idl @@ -15,9 +15,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#ifndef __WINE_VSWRITER_H -#define __WINE_VSWRITER_H +import "oaidl.idl"; typedef enum { @@ -44,4 +42,17 @@ typedef enum VSS_AWS_THIS_IS_ALTERNATE_WRITER } VSS_ALTERNATE_WRITER_STATE; -#endif /* ___WINE_VSWRITER_H */ +typedef enum VSS_COMPONENT_TYPE +{ + VSS_CT_UNDEFINED, + VSS_CT_DATABASE, + VSS_CT_FILEGROUP +} VSS_COMPONENT_TYPE; + +typedef enum VSS_FILE_RESTORE_STATUS +{ + VSS_RS_UNDEFINED, + VSS_RS_NONE, + VSS_RS_ALL, + VSS_RS_FAILED +} VSS_FILE_RESTORE_STATUS;

4 years, 6 months

[reactos] 01/01: [CHARMAP] Functionality Improvements and Bug Fixes (#2560)

by Charles Ambrye

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99dd292553132adacd709… commit 99dd292553132adacd7095c4d03f2c2a9fbbf2ab Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Sun Jun 7 10:34:45 2020 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jun 7 19:34:45 2020 +0200 [CHARMAP] Functionality Improvements and Bug Fixes (#2560) - Resize the window slightly when compiled with REMOVE_ADVANCED to avoid deadspace at the bottom of the window. - Skip over the non-printable characters by starting with character ' ' + 1. - Instead of iterating over every cell, simply compute the cell x and y using the CellSize. - Modify behaviour of charmap to allow large character render on mouse move, only hiding the larger character on double click. - Simplify math for moving window to be on desktop. Added FIXME to highlight this doesn't work well on multi-monitor setups. Changed xPos and yPos to LONG since negative numbers are valid on multi-monitor setups. - Do not draw invalid glyphs on the map (can happen when switching fonts or filtering existing font). - Do not allow mouse-over of invalid glyphs. - Fix bug that caused the Help button to remain enabled as it was being modified before it was even created. - Do a better job at finding the correct glyph under the mouse. - Ensure the active cell is cleared correctly. - Invalidate the rect around the previously active cell to ensure it gets redrawn as inactive. - Fix bug from CORE-10518 (initial active cell was not being invalidated on scroll). - Do not try to copy a character to the output if there is no active cell selected. - Populate the advanced portion of the screen with several built-in code pages (the list is hardcoded so that we don't enumerate everything). - Add functionality to filter the character map by a code page (called a character set in this program). - Some fonts list 0x0000 as drawable, even when it isn't, so ignore any valid glyphs that contain it. --- base/applications/charmap/charmap.c | 90 ++++++++++++++++++++++++++++-- base/applications/charmap/lang/bg-BG.rc | 2 + base/applications/charmap/lang/ca-ES.rc | 2 + base/applications/charmap/lang/cs-CZ.rc | 2 + base/applications/charmap/lang/de-DE.rc | 2 + base/applications/charmap/lang/el-GR.rc | 2 + base/applications/charmap/lang/en-US.rc | 2 + base/applications/charmap/lang/es-ES.rc | 2 + base/applications/charmap/lang/et-EE.rc | 2 + base/applications/charmap/lang/fr-FR.rc | 2 + base/applications/charmap/lang/he-IL.rc | 2 + base/applications/charmap/lang/id-ID.rc | 2 + base/applications/charmap/lang/it-IT.rc | 2 + base/applications/charmap/lang/ja-JP.rc | 2 + base/applications/charmap/lang/ko-KR.rc | 2 + base/applications/charmap/lang/lt-LT.rc | 2 + base/applications/charmap/lang/nl-NL.rc | 2 + base/applications/charmap/lang/no-NO.rc | 2 + base/applications/charmap/lang/pl-PL.rc | 2 + base/applications/charmap/lang/pt-BR.rc | 2 + base/applications/charmap/lang/ro-RO.rc | 2 + base/applications/charmap/lang/ru-RU.rc | 2 + base/applications/charmap/lang/sk-SK.rc | 2 + base/applications/charmap/lang/sq-AL.rc | 2 + base/applications/charmap/lang/sv-SE.rc | 2 + base/applications/charmap/lang/tr-TR.rc | 2 + base/applications/charmap/lang/uk-UA.rc | 2 + base/applications/charmap/lang/zh-CN.rc | 2 + base/applications/charmap/lang/zh-TW.rc | 2 + base/applications/charmap/map.c | 99 +++++++++++++++++++++++++++++---- base/applications/charmap/precomp.h | 16 ++++-- base/applications/charmap/resource.h | 2 + 32 files changed, 242 insertions(+), 21 deletions(-) diff --git a/base/applications/charmap/charmap.c b/base/applications/charmap/charmap.c index 1ed517b390f..90008a812a1 100644 --- a/base/applications/charmap/charmap.c +++ b/base/applications/charmap/charmap.c @@ -13,7 +13,7 @@ #include <richedit.h> #include <winnls.h> -#define REMOVE_ADVANCED +//#define REMOVE_ADVANCED #define ID_ABOUT 0x1 @@ -25,6 +25,55 @@ HICON hSmIcon; HICON hBgIcon; SETTINGS Settings; +static +VOID +FillCharacterSetComboList(HWND hwndCombo) +{ + WCHAR szCharSetText[256]; + LPWSTR trimmedName; + CPINFOEXW cpInfo; + INT i; + + if (LoadStringW(hInstance, IDS_UNICODE, szCharSetText, SIZEOF(szCharSetText))) + { + SendMessageW(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)szCharSetText); + } + + for (i = 0; i < SIZEOF(codePages); i++) + { + if (GetCPInfoExW(codePages[i], 0, &cpInfo)) + { + trimmedName = wcschr(cpInfo.CodePageName, L'('); + if (!trimmedName) + trimmedName = cpInfo.CodePageName; + + SendMessageW(hwndCombo, + CB_ADDSTRING, + 0, + (LPARAM)trimmedName); + } + } + + SendMessageW(hwndCombo, CB_SETCURSEL, 0, 0); +} + +static +VOID +FillGroupByComboList(HWND hwndCombo) +{ + WCHAR szAllText[256]; + + if (LoadStringW(hInstance, IDS_ALL, szAllText, SIZEOF(szAllText))) + { + SendMessageW(hwndCombo, CB_ADDSTRING, 0, (LPARAM)szAllText); + } + + SendMessageW(hwndCombo, CB_SETCURSEL, 0, 0); +} + /* Font-enumeration callback */ static int @@ -283,7 +332,7 @@ ChangeView(HWND hWnd) RECT rcPanelInt; RECT rcStatus; UINT DeX, DeY; - UINT xPos, yPos; + LONG xPos, yPos; UINT Width, Height; UINT DeskTopWidth, DeskTopHeight; #ifdef REMOVE_ADVANCED @@ -325,11 +374,12 @@ ChangeView(HWND hWnd) Shrink the window height a bit here to accomodate for that lost control. */ Height = rcCharmap.bottom + rcCopy.bottom + 10; #endif + // FIXME: This fails on multi monitor setups if ((xPos + Width) > DeskTopWidth) - xPos += DeskTopWidth - (xPos + Width); + xPos = DeskTopWidth - Width; if ((yPos + Height) > DeskTopHeight) - yPos += DeskTopHeight - (yPos + Height); + yPos = DeskTopHeight - Height; MoveWindow(hWnd, xPos, yPos, @@ -438,6 +488,26 @@ AdvancedDlgProc(HWND hDlg, case WM_INITDIALOG: return TRUE; + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_COMBO_CHARSET: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + INT idx = (INT)SendMessageW((HWND)lParam, + CB_GETCURSEL, + 0, 0); + SendMessageW(GetDlgItem(hCharmapDlg, IDC_FONTMAP), + FM_SETCHARMAP, + idx, 0); + + EnableWindow(GetDlgItem(hAdvancedDlg, IDC_EDIT_UNICODE), idx == 0); + } + break; + } + } + default: return FALSE; } @@ -456,11 +526,21 @@ PanelOnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam) MAKEINTRESOURCE(IDD_CHARMAP), hWnd, CharMapDlgProc); + + // For now, the Help push button is disabled because of lacking of HTML Help support + EnableWindow(GetDlgItem(hCharmapDlg, IDC_CMHELP), FALSE); + #ifndef REMOVE_ADVANCED hAdvancedDlg = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_ADVANCED), hWnd, AdvancedDlgProc); + + FillCharacterSetComboList(GetDlgItem(hAdvancedDlg, IDC_COMBO_CHARSET)); + + FillGroupByComboList(GetDlgItem(hAdvancedDlg, IDC_COMBO_GROUPBY)); + EnableWindow(GetDlgItem(hAdvancedDlg, IDC_COMBO_GROUPBY), FALSE); // FIXME: Implement + EnableWindow(GetDlgItem(hAdvancedDlg, IDC_BUTTON_SEARCH), FALSE); // FIXME: Implement #endif hStatusWnd = CreateWindow(STATUSCLASSNAME, NULL, @@ -495,8 +575,6 @@ PanelWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case WM_CREATE: - // For now, the Help push button is disabled because of lacking of HTML Help support - EnableWindow(GetDlgItem(hWnd, IDC_CMHELP), FALSE); return PanelOnCreate(hWnd, wParam, lParam); case WM_CLOSE: diff --git a/base/applications/charmap/lang/bg-BG.rc b/base/applications/charmap/lang/bg-BG.rc index 6dda6e4002c..fb1f1ff75ac 100644 --- a/base/applications/charmap/lang/bg-BG.rc +++ b/base/applications/charmap/lang/bg-BG.rc @@ -54,4 +54,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "&За..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/ca-ES.rc b/base/applications/charmap/lang/ca-ES.rc index aa01fa2d198..c80905b9ef6 100644 --- a/base/applications/charmap/lang/ca-ES.rc +++ b/base/applications/charmap/lang/ca-ES.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "&En quant a..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/cs-CZ.rc b/base/applications/charmap/lang/cs-CZ.rc index 4a58d3ecda7..c30c75c0537 100644 --- a/base/applications/charmap/lang/cs-CZ.rc +++ b/base/applications/charmap/lang/cs-CZ.rc @@ -56,4 +56,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "&O programu..." IDS_TITLE "Mapa znaků" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/de-DE.rc b/base/applications/charmap/lang/de-DE.rc index e14c0942ca6..e29798fd949 100644 --- a/base/applications/charmap/lang/de-DE.rc +++ b/base/applications/charmap/lang/de-DE.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Publ [...] IDS_ABOUT "Ü&ber..." IDS_TITLE "Zeichentabelle" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/el-GR.rc b/base/applications/charmap/lang/el-GR.rc index 8dab3c78ec7..8f8c416b5b2 100644 --- a/base/applications/charmap/lang/el-GR.rc +++ b/base/applications/charmap/lang/el-GR.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "&Πληροφορίες..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/en-US.rc b/base/applications/charmap/lang/en-US.rc index eacc22072bf..afb222b68bf 100644 --- a/base/applications/charmap/lang/en-US.rc +++ b/base/applications/charmap/lang/en-US.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "A&bout..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/es-ES.rc b/base/applications/charmap/lang/es-ES.rc index fd439f4d354..f1d912f8a8b 100644 --- a/base/applications/charmap/lang/es-ES.rc +++ b/base/applications/charmap/lang/es-ES.rc @@ -54,4 +54,6 @@ BEGIN IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como se publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más info [...] IDS_ABOUT "&Acerca de ..." IDS_TITLE "Mapa de caracteres" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/et-EE.rc b/base/applications/charmap/lang/et-EE.rc index a6d49e08529..e914a7977a4 100644 --- a/base/applications/charmap/lang/et-EE.rc +++ b/base/applications/charmap/lang/et-EE.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "T&eave..." IDS_TITLE "Märgistik" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/fr-FR.rc b/base/applications/charmap/lang/fr-FR.rc index abfd238cb28..44046fa4f0a 100644 --- a/base/applications/charmap/lang/fr-FR.rc +++ b/base/applications/charmap/lang/fr-FR.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. \r\n [...] IDS_ABOUT "À propos..." IDS_TITLE "Table des Caractères" + IDS_UNICODE "Unicode" + IDS_ALL "Tous" END diff --git a/base/applications/charmap/lang/he-IL.rc b/base/applications/charmap/lang/he-IL.rc index 47c94fbc629..e1840774a19 100644 --- a/base/applications/charmap/lang/he-IL.rc +++ b/base/applications/charmap/lang/he-IL.rc @@ -55,4 +55,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "&אודות..." IDS_TITLE "מפת תווים" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/id-ID.rc b/base/applications/charmap/lang/id-ID.rc index b5cd57edbc5..03b6a3d0a81 100644 --- a/base/applications/charmap/lang/id-ID.rc +++ b/base/applications/charmap/lang/id-ID.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License un [...] IDS_ABOUT "Te&ntang..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/it-IT.rc b/base/applications/charmap/lang/it-IT.rc index 076edf08832..fb663df9039 100644 --- a/base/applications/charmap/lang/it-IT.rc +++ b/base/applications/charmap/lang/it-IT.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "Questo programma è software libero; può redistribuirlo e/o modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free Software Foundation; sia la versione 2 sia una versione successiva (a sua scelta).\r\n\r\nQuesto programma è distribuito\nnella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o APPLICABILITA' per un particolare scopo. Si veda la licenza generale pubblica GNU per maggiori de [...] IDS_ABOUT "&Informazioni su..." IDS_TITLE "Mappa caratteri" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/ja-JP.rc b/base/applications/charmap/lang/ja-JP.rc index 3c671d6d71f..1a00e46f0bf 100644 --- a/base/applications/charmap/lang/ja-JP.rc +++ b/base/applications/charmap/lang/ja-JP.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "バージョン情報(&B)..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/ko-KR.rc b/base/applications/charmap/lang/ko-KR.rc index 35e36dcd0d8..dedc3d69335 100644 --- a/base/applications/charmap/lang/ko-KR.rc +++ b/base/applications/charmap/lang/ko-KR.rc @@ -55,4 +55,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "정보(&A)" IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/lt-LT.rc b/base/applications/charmap/lang/lt-LT.rc index 6dacfb06eba..d6f62feaae1 100644 --- a/base/applications/charmap/lang/lt-LT.rc +++ b/base/applications/charmap/lang/lt-LT.rc @@ -60,4 +60,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "&Apie..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/nl-NL.rc b/base/applications/charmap/lang/nl-NL.rc index 706fa9683db..b370b17cc03 100644 --- a/base/applications/charmap/lang/nl-NL.rc +++ b/base/applications/charmap/lang/nl-NL.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "Over..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/no-NO.rc b/base/applications/charmap/lang/no-NO.rc index c59575a32e6..1d41bb4bf28 100644 --- a/base/applications/charmap/lang/no-NO.rc +++ b/base/applications/charmap/lang/no-NO.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere [...] IDS_ABOUT "O&m..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/pl-PL.rc b/base/applications/charmap/lang/pl-PL.rc index cba1a4abad9..50dbdc1f9d6 100644 --- a/base/applications/charmap/lang/pl-PL.rc +++ b/base/applications/charmap/lang/pl-PL.rc @@ -60,4 +60,6 @@ BEGIN IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej Licencji lub (według twojego wyboru) którejś z późniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKRES [...] IDS_ABOUT "&O programie..." IDS_TITLE "Tablica znaków" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/pt-BR.rc b/base/applications/charmap/lang/pt-BR.rc index 347f0612db5..a58d9f4e629 100644 --- a/base/applications/charmap/lang/pt-BR.rc +++ b/base/applications/charmap/lang/pt-BR.rc @@ -51,4 +51,6 @@ BEGIN IDS_LICENSE "Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License conforme publicada pela Free Software Foundation; quer a versão 2 da licença, ou (conforme você escolha) qualquer versão posterior.\r\n\r\nEste programa é distribuído com a esperança de que seja útil, mas SEM QUALQUER GARANTIA; mesmo sem a garantia implícita de MERCANTIBILIDADE OU ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes, veja a GNU Gen [...] IDS_ABOUT "So&bre..." IDS_TITLE "Mapa de Caracteres" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/ro-RO.rc b/base/applications/charmap/lang/ro-RO.rc index af66aaeaa82..d59f6299825 100644 --- a/base/applications/charmap/lang/ro-RO.rc +++ b/base/applications/charmap/lang/ro-RO.rc @@ -57,4 +57,6 @@ BEGIN IDS_LICENSE "Această aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUME. Pentru mai multe detalii consultați Licența P [...] IDS_ABOUT "&Despre…" IDS_TITLE "Hartă de caractere" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/ru-RU.rc b/base/applications/charmap/lang/ru-RU.rc index b3715194b33..e4b3872de5d 100644 --- a/base/applications/charmap/lang/ru-RU.rc +++ b/base/applications/charmap/lang/ru-RU.rc @@ -53,4 +53,6 @@ BEGIN IDS_LICENSE "Эта программа является свободно распространяемой; Вы можете распространять ее повторно и (или) изменять, соблюдая условия Открытого лицензионного соглашения GNU, опубликованного Фондом свободно распространяемого программного обеспечения; либо редакции 2 Соглашения, либо (на ваше усмотрение) любой редакции, выпущенной позже.\r\n\r\nЭта программа распространяется в надежде на то, что она окажется полезной, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, включая подразумеваемую гарантию КАЧЕСТ [...] IDS_ABOUT "&О программе..." IDS_TITLE "Таблица символов" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/sk-SK.rc b/base/applications/charmap/lang/sk-SK.rc index 96083960913..e61403e7d9c 100644 --- a/base/applications/charmap/lang/sk-SK.rc +++ b/base/applications/charmap/lang/sk-SK.rc @@ -60,4 +60,6 @@ BEGIN IDS_LICENSE "Tento program je voľný softvér; môžete ho šíriť a/alebo modifikovať podľa podmienok GNU Všeobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buď verzie 2 tejto licencie, alebo (podľa Vášho uváženia) niektorej neskoršej verzie.\r\n\r\nTento program je distribuovaný v nádeji, že bude užitočný, avšak BEZ AKEJKOĽVEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URČITÝ ÚČEL. Pre viac detailov si pozrite [...] IDS_ABOUT "Č&o je Mapa znakov" IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/sq-AL.rc b/base/applications/charmap/lang/sq-AL.rc index 9829abf1f06..5ce97b3482c 100644 --- a/base/applications/charmap/lang/sq-AL.rc +++ b/base/applications/charmap/lang/sq-AL.rc @@ -55,4 +55,6 @@ BEGIN IDS_LICENSE "Ky program eshte falas; ju mund ta shperndani ose modifikoni nen termat e liçenses publike te GNU nga Free Software Foundation; ose versionin 2 te Liçenses, ose (opsionet tend) versionet me te reja.\r\n\r\nKy program shperndahet me shpresen qe do te jete i nevojshem, POR PA ASNJE GARANCI; madje dhe pa nënkuptimin e garancisë së tregtimit apo përshtatshmerise për qëllim të veçantë. Shiko liçensen publike te GNU per me shume detaje.\r\n\r\nJu duhet te jeni paisur me nje ko [...] IDS_ABOUT "R&reth..." IDS_TITLE "Karakter Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/sv-SE.rc b/base/applications/charmap/lang/sv-SE.rc index 6ea641fef05..c99c309c4d2 100644 --- a/base/applications/charmap/lang/sv-SE.rc +++ b/base/applications/charmap/lang/sv-SE.rc @@ -58,4 +58,6 @@ BEGIN IDS_LICENSE "Detta programmet är fri programvara; du kan distribuera det och/eller ändra det under villkoren enligt GNU General Public License som är utgivet av Free Software Foundation; version 2, eller (om du så önskar) alla senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall kunne användas, men DET FINNS INGA GARANTIER; även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se på GNU General Public Licensen för mer detaljer [...] IDS_ABOUT "O&m..." IDS_TITLE "Character Map" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/tr-TR.rc b/base/applications/charmap/lang/tr-TR.rc index 43bbb83a998..27170f2c52c 100644 --- a/base/applications/charmap/lang/tr-TR.rc +++ b/base/applications/charmap/lang/tr-TR.rc @@ -53,4 +53,6 @@ BEGIN IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır [...] IDS_ABOUT "&Üzerine..." IDS_TITLE "Damga Eşlemi" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/uk-UA.rc b/base/applications/charmap/lang/uk-UA.rc index 8bf08b489eb..a373a30d3d6 100644 --- a/base/applications/charmap/lang/uk-UA.rc +++ b/base/applications/charmap/lang/uk-UA.rc @@ -59,4 +59,6 @@ BEGIN IDS_LICENSE "Таблиця символів - вільне програмне забезпечення; Ви можете розповсюджувати її та змінювати, дотримуючись умови Відкритої ліцензійної угоди GNU, опублікованої Фондом вільного програмного забезпечення; або редакції 2 Угоди, або будь-якої редакції, випущеної пізніше.\r\n\r\nЦя програма розповсюджується в надії на те, що вона виявиться корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, включаючи УЯВНОЮ ГАРАНТІЄЮ ЯКОСТІ або ПРИДАТНОСТІ для певних цілей. Подробиці містяться у Відкритій лі [...] IDS_ABOUT "&Про програму..." IDS_TITLE "Таблиця Cимволів" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/zh-CN.rc b/base/applications/charmap/lang/zh-CN.rc index f8724175cdc..a7456d3dd1c 100644 --- a/base/applications/charmap/lang/zh-CN.rc +++ b/base/applications/charmap/lang/zh-CN.rc @@ -59,4 +59,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "关于(&A)..." IDS_TITLE "字符映射表" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/lang/zh-TW.rc b/base/applications/charmap/lang/zh-TW.rc index 15f0e8a1ec8..f227133710d 100644 --- a/base/applications/charmap/lang/zh-TW.rc +++ b/base/applications/charmap/lang/zh-TW.rc @@ -59,4 +59,6 @@ BEGIN IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more det [...] IDS_ABOUT "關於(&A)..." IDS_TITLE "字元對應表" + IDS_UNICODE "Unicode" + IDS_ALL "All" END diff --git a/base/applications/charmap/map.c b/base/applications/charmap/map.c index 7b2d7838ef8..334980b3f61 100644 --- a/base/applications/charmap/map.c +++ b/base/applications/charmap/map.c @@ -10,6 +10,7 @@ #include "precomp.h" #include <stdlib.h> +#include <winnls.h> static const WCHAR szMapWndClass[] = L"FontMapWnd"; static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd"; @@ -40,6 +41,7 @@ SetGrid(PMAP infoPtr) } } + static VOID DrawActiveCell(PMAP infoPtr, @@ -111,6 +113,8 @@ FillGrid(PMAP infoPtr, for (y = 0; y < YCELLS; y++) for (x = 0; x < XCELLS; x++) { + if (i >= infoPtr->NumValidGlyphs) break; + ch = (WCHAR)infoPtr->ValidGlyphs[i]; Cell = &infoPtr->Cells[y][x]; @@ -206,6 +210,38 @@ MoveLargeCell(PMAP infoPtr) } +static +VOID +GetPossibleCharacters(WCHAR* ch, INT chLen, INT codePageIdx) +{ + INT i, j; + + memset(ch, 0, sizeof(ch[0]) * chLen); + + if (codePageIdx <= 0 || codePageIdx > SIZEOF(codePages)) + { + /* this is unicode, so just load up the first MAX_GLYPHS characters + start at 0x21 to bypass whitespace characters */ + INT len = min(MAX_GLYPHS, chLen); + for (i = 0x21, j = 0; i < len; i++) + ch[j++] = (WCHAR)i; + } + else + { + /* This is a codepage, so use NLS to translate the first 256 characters */ + CHAR multiByteString[256] = { 0 }; + for (i = 0x21; i < SIZEOF(multiByteString); i++) + multiByteString[i] = (CHAR)i; + + if (!MultiByteToWideChar(codePages[codePageIdx - 1], 0, multiByteString, sizeof(multiByteString), ch, chLen)) + { + /* Failed for some reason, so clear the array */ + memset(ch, 0, sizeof(ch[0]) * chLen); + } + } +} + + static VOID SetFont(PMAP infoPtr, @@ -230,9 +266,9 @@ SetFont(PMAP infoPtr, infoPtr->CurrentFont.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5; infoPtr->CurrentFont.lfCharSet = DEFAULT_CHARSET; - wcsncpy(infoPtr->CurrentFont.lfFaceName, - lpFontName, - sizeof(infoPtr->CurrentFont.lfFaceName) / sizeof(infoPtr->CurrentFont.lfFaceName[0])); + lstrcpynW(infoPtr->CurrentFont.lfFaceName, + lpFontName, + SIZEOF(infoPtr->CurrentFont.lfFaceName)); infoPtr->hFont = CreateFontIndirectW(&infoPtr->CurrentFont); @@ -240,14 +276,17 @@ SetFont(PMAP infoPtr, NULL, TRUE); + if (infoPtr->pActiveCell) + infoPtr->pActiveCell->bActive = FALSE; infoPtr->pActiveCell = &infoPtr->Cells[0][0]; + infoPtr->pActiveCell->bActive = TRUE; // Get all the valid glyphs in this font SelectObject(hdc, infoPtr->hFont); - for (i = 0; i < MAX_GLYPHS; i++) - ch[i] = (WCHAR)i; + // Get the code page associated with the selected 'character set' + GetPossibleCharacters(ch, MAX_GLYPHS, infoPtr->CharMap); if (GetGlyphIndicesW(hdc, ch, @@ -256,9 +295,9 @@ SetFont(PMAP infoPtr, GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) { j = 0; - for (i = ' ' + 1; i < MAX_GLYPHS; i++) + for (i = 0; i < MAX_GLYPHS; i++) { - if (out[i] != 0xffff) + if (out[i] != 0xffff && out[i] != 0x0000 && ch[i] != 0x0000) { infoPtr->ValidGlyphs[j] = ch[i]; j++; @@ -312,10 +351,27 @@ OnClick(PMAP infoPtr, WORD ptx, WORD pty) { - INT x, y; - - x = ptx / max(1, infoPtr->CellSize.cx); - y = pty / max(1, infoPtr->CellSize.cy); + INT x, y, i; + + /* + * Find the cell the mouse pointer is over. + * Since each cell is the same size, this can be done quickly using CellSize. + * Clamp to XCELLS - 1 and YCELLS - 1 because the map can sometimes be slightly + * larger than infoPtr.CellSize * XCELLS , due to the map size being a non integer + * multiple of infoPtr.CellSize . + */ + x = min(XCELLS - 1, ptx / max(1, infoPtr->CellSize.cx)); + y = min(YCELLS - 1, pty / max(1, infoPtr->CellSize.cy)); + + /* Make sure the mouse is within a valid glyph */ + i = XCELLS * infoPtr->iYStart + y * XCELLS + x; + if (i >= infoPtr->NumValidGlyphs) + { + if (infoPtr->pActiveCell) + infoPtr->pActiveCell->bActive = FALSE; + infoPtr->pActiveCell = NULL; + return; + } /* if the cell is not already active */ if (!infoPtr->Cells[y][x].bActive) @@ -447,6 +503,15 @@ OnVScroll(PMAP infoPtr, if (abs(iYDiff) < YCELLS) { RECT rect; + + /* Invalidate the rect around the active cell since a new cell will become active */ + if (infoPtr->pActiveCell && infoPtr->pActiveCell->bActive) + { + InvalidateRect(infoPtr->hMapWnd, + &infoPtr->pActiveCell->CellExt, + TRUE); + } + GetClientRect(infoPtr->hMapWnd, &rect); rect.top += 2; rect.bottom -= 2; @@ -524,6 +589,7 @@ MapWndProc(HWND hwnd, { PMAP infoPtr; LRESULT Ret = 0; + WCHAR lfFaceName[LF_FACESIZE]; infoPtr = (PMAP)GetWindowLongPtrW(hwnd, 0); @@ -564,6 +630,9 @@ MapWndProc(HWND hwnd, case WM_LBUTTONDBLCLK: { + if (!infoPtr->pActiveCell) + break; + NotifyParentOfSelection(infoPtr, FM_SETCHAR, infoPtr->pActiveCell->ch); @@ -588,6 +657,14 @@ MapWndProc(HWND hwnd, break; } + case FM_SETCHARMAP: + infoPtr->CharMap = LOWORD(wParam); + wcsncpy(lfFaceName, + infoPtr->CurrentFont.lfFaceName, + SIZEOF(lfFaceName)); + SetFont(infoPtr, lfFaceName); + break; + case FM_SETFONT: SetFont(infoPtr, (LPWSTR)lParam); break; diff --git a/base/applications/charmap/precomp.h b/base/applications/charmap/precomp.h index 132f275d4eb..5899180bb43 100644 --- a/base/applications/charmap/precomp.h +++ b/base/applications/charmap/precomp.h @@ -19,10 +19,17 @@ #define XLARGE 45 #define YLARGE 25 -#define FM_SETFONT (WM_USER + 1) -#define FM_GETCHAR (WM_USER + 2) -#define FM_SETCHAR (WM_USER + 3) -#define FM_GETHFONT (WM_USER + 4) +#define FM_SETFONT (WM_USER + 1) +#define FM_GETCHAR (WM_USER + 2) +#define FM_SETCHAR (WM_USER + 3) +#define FM_GETHFONT (WM_USER + 4) +#define FM_SETCHARMAP (WM_USER + 5) + +// the code pages to display in the advanced 'character set' combobox +static const UINT codePages[] = { + 864, 775, 863, 855, 737, 856, 862, 861, 852, 869, 850, 858, 865, 860, 866, 857, 437, // OEM code pages + 1256, 1257, 1250, 1251, 1253, 1255, 932, 949, 1252, 936, 874, 950, 1254, 1258 // ANSI code pages +}; extern HINSTANCE hInstance; @@ -48,6 +55,7 @@ typedef struct _MAP LOGFONTW CurrentFont; INT iYStart; INT NumRows; + INT CharMap; USHORT ValidGlyphs[MAX_GLYPHS]; USHORT NumValidGlyphs; diff --git a/base/applications/charmap/resource.h b/base/applications/charmap/resource.h index 06f5aab0d66..6cee866981e 100644 --- a/base/applications/charmap/resource.h +++ b/base/applications/charmap/resource.h @@ -28,3 +28,5 @@ #define IDS_LICENSE 1010 #define IDS_ABOUT 1011 #define IDS_TITLE 1012 +#define IDS_UNICODE 1013 +#define IDS_ALL 1014

4 years, 6 months

[reactos] 01/01: [RPCRT4] Export NdrCreateServerInterfaceFromStub as `stub` Required by MS ole32.dll CORE-15395, CORE-17004.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31e00140d3dc90be67772… commit 31e00140d3dc90be67772c217a193b0c2deb5ceb Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat May 2 11:32:14 2020 +0300 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jun 7 14:08:58 2020 +0200 [RPCRT4] Export NdrCreateServerInterfaceFromStub as `stub` Required by MS ole32.dll CORE-15395, CORE-17004. --- dll/win32/rpcrt4/rpcrt4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/rpcrt4/rpcrt4.spec b/dll/win32/rpcrt4/rpcrt4.spec index 2fb389aaf41..68d319fbc20 100644 --- a/dll/win32/rpcrt4/rpcrt4.spec +++ b/dll/win32/rpcrt4/rpcrt4.spec @@ -179,7 +179,7 @@ 179 stdcall NdrCorrelationFree(ptr) 180 stdcall NdrCorrelationInitialize(ptr ptr long long) 181 stdcall NdrCorrelationPass(ptr) -# NdrCreateServerInterfaceFromStub +182 stub NdrCreateServerInterfaceFromStub 183 stub NdrDcomAsyncClientCall 184 stub NdrDcomAsyncStubCall 185 stdcall NdrDllCanUnloadNow(ptr)

4 years, 6 months

[reactos] 02/02: [SHELLBARS] Add missing psdk dependency.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=185591368d2f1deaaf99f… commit 185591368d2f1deaaf99f236d29ec9a5d7752f0b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jun 6 22:55:49 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 6 23:02:35 2020 +0200 [SHELLBARS] Add missing psdk dependency. --- dll/win32/browseui/shellbars/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index 12b5a84a019..661284c0386 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -23,4 +23,4 @@ if(NOT MSVC) endif() add_pch(shellbars shellbars.h SOURCE) -add_dependencies(shellbars xdk) +add_dependencies(shellbars xdk psdk)

4 years, 6 months

[reactos] 01/02: [MSTASK] Add netapi32 dependency to ensure atsvc_c.h is available.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=789c88c1859d9b1108e31… commit 789c88c1859d9b1108e31a590b7d107eaca666c9 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jun 6 22:55:23 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 6 23:02:35 2020 +0200 [MSTASK] Add netapi32 dependency to ensure atsvc_c.h is available. --- dll/win32/mstask/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt index 3f6c58dabb9..9571b5a0e81 100644 --- a/dll/win32/mstask/CMakeLists.txt +++ b/dll/win32/mstask/CMakeLists.txt @@ -25,5 +25,6 @@ add_library(mstask MODULE set_module_type(mstask win32dll) target_link_libraries(mstask uuid wine) add_importlibs(mstask ole32 msvcrt kernel32 ntdll) +add_dependencies(mstask netapi32) add_pch(mstask precomp.h SOURCE) add_cd_file(TARGET mstask DESTINATION reactos/system32 FOR all)

4 years, 6 months

[reactos] 01/01: [NTDLL_APITEST] Add ProcessWx86Information testcase for NtXxxInformationProcess (#2852)

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38c01a84291f5d4908e34… commit 38c01a84291f5d4908e349cd37b516ea8c5b9178 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Jun 6 21:38:37 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 21:38:37 2020 +0200 [NTDLL_APITEST] Add ProcessWx86Information testcase for NtXxxInformationProcess (#2852) --- .../apitests/ntdll/NtQueryInformationProcess.c | 71 ++++++++++++++++++++++ .../apitests/ntdll/NtSetInformationProcess.c | 51 ++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c index e392ead8760..94a07f17589 100644 --- a/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c +++ b/modules/rostests/apitests/ntdll/NtQueryInformationProcess.c @@ -253,6 +253,76 @@ Test_ProcessPriorityClassAlignment(void) free(ProcPriority); } +static +void +Test_ProcessWx86Information(void) +{ + NTSTATUS Status; + ULONG VdmPower = 1, ReturnLength; + + /* Everything is NULL */ + Status = NtQueryInformationProcess(NULL, + ProcessWx86Information, + NULL, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Given an invalid process handle */ + Status = NtQueryInformationProcess(NULL, + ProcessWx86Information, + &VdmPower, + sizeof(VdmPower), + NULL); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* Don't query anything */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + NULL, + sizeof(VdmPower), + NULL); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* The buffer is misaligned and information length is wrong */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + (PVOID)1, + 0, + NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The buffer is misaligned */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + (PVOID)1, + sizeof(VdmPower), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* The buffer is misaligned -- try with an alignment size of 2 */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + (PVOID)2, + sizeof(VdmPower), + NULL); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Query the VDM power */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + &VdmPower, + sizeof(VdmPower), + &ReturnLength); + ok_hex(Status, STATUS_SUCCESS); + ok(ReturnLength != 0, "ReturnLength shouldn't be 0!\n"); + ok(VdmPower == 0 || VdmPower == 1, "The VDM power value must be within the boundary between 0 and 1, not anything else! Got %lu\n", VdmPower); + + /* Trace the VDM power value and returned length */ + trace("ReturnLength = %lu\n", ReturnLength); + trace("VdmPower = %lu\n", VdmPower); +} + START_TEST(NtQueryInformationProcess) { NTSTATUS Status; @@ -262,4 +332,5 @@ START_TEST(NtQueryInformationProcess) Test_ProcessTimes(); Test_ProcessPriorityClassAlignment(); + Test_ProcessWx86Information(); } diff --git a/modules/rostests/apitests/ntdll/NtSetInformationProcess.c b/modules/rostests/apitests/ntdll/NtSetInformationProcess.c index 0b805b3ca66..473780fe09f 100644 --- a/modules/rostests/apitests/ntdll/NtSetInformationProcess.c +++ b/modules/rostests/apitests/ntdll/NtSetInformationProcess.c @@ -215,9 +215,60 @@ Test_ProcForegroundBackgroundClass(void) HeapFree(GetProcessHeap(), 0, ProcForeground); } +static +void +Test_ProcessWx86InformationClass(void) +{ + NTSTATUS Status; + ULONG VdmPower = 1; + + /* Everything is NULL */ + Status = NtSetInformationProcess(NULL, + ProcessWx86Information, + NULL, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Don't set anything to the process */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + NULL, + sizeof(VdmPower)); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* The buffer is misaligned and information length is wrong */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + (PVOID)1, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The buffer is misaligned */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + (PVOID)1, + sizeof(VdmPower)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* The buffer is misaligned -- try with an alignment size of 2 */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + (PVOID)2, + sizeof(VdmPower)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* We do not have privileges to set the VDM power */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessWx86Information, + &VdmPower, + sizeof(VdmPower)); + ok_hex(Status, STATUS_PRIVILEGE_NOT_HELD); +} + START_TEST(NtSetInformationProcess) { Test_ProcForegroundBackgroundClass(); Test_ProcBasePriorityClass(); Test_ProcRaisePriorityClass(); + Test_ProcessWx86InformationClass(); }

4 years, 6 months

[reactos] 01/01: [CMAKE] Implement PCH builds with target_precompile_headers. CORE-16905

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=139a3d666159c22d505e1… commit 139a3d666159c22d505e1da2bb3c19af7a95fe11 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat May 9 22:37:40 2020 +0100 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Jun 6 21:58:41 2020 +0300 [CMAKE] Implement PCH builds with target_precompile_headers. CORE-16905 --- CMakeLists.txt | 13 +++-- base/applications/winhlp32/CMakeLists.txt | 16 ++++-- base/services/dhcpcsvc/CMakeLists.txt | 10 ++-- base/services/svchost/CMakeLists.txt | 10 ++-- dll/cpl/desk/CMakeLists.txt | 10 ++-- dll/directx/wine/d3d8/CMakeLists.txt | 10 ++-- dll/directx/wine/d3d9/CMakeLists.txt | 10 ++-- dll/directx/wine/d3dcompiler_43/CMakeLists.txt | 16 +++--- dll/directx/wine/d3dx9_36/d3dx9.cmake | 12 +++-- dll/directx/wine/d3dxof/CMakeLists.txt | 10 ++-- dll/directx/wine/dxdiagn/CMakeLists.txt | 10 ++-- dll/directx/wine/msdmo/CMakeLists.txt | 10 ++-- dll/directx/wine/quartz/CMakeLists.txt | 12 +++-- dll/ntdll/CMakeLists.txt | 10 ++-- dll/opengl/glu32/CMakeLists.txt | 12 +++-- dll/shellext/netshell/CMakeLists.txt | 10 ++-- dll/shellext/shellbtrfs/CMakeLists.txt | 10 ++-- dll/win32/aclui/CMakeLists.txt | 10 ++-- dll/win32/advapi32/CMakeLists.txt | 16 +++--- dll/win32/avifil32/CMakeLists.txt | 14 +++--- dll/win32/browseui/CMakeLists.txt | 10 ++-- dll/win32/cabinet/CMakeLists.txt | 10 ++-- dll/win32/comctl32/CMakeLists.txt | 12 +++-- dll/win32/crypt32/CMakeLists.txt | 10 ++-- dll/win32/fmifs/CMakeLists.txt | 10 ++-- dll/win32/gdiplus/CMakeLists.txt | 13 ++--- dll/win32/hhctrl.ocx/CMakeLists.txt | 10 ++-- dll/win32/hlink/CMakeLists.txt | 10 ++-- dll/win32/imagehlp/CMakeLists.txt | 10 ++-- dll/win32/inetcomm/CMakeLists.txt | 12 +++-- dll/win32/inseng/CMakeLists.txt | 14 ++++-- dll/win32/itss/CMakeLists.txt | 12 +++-- dll/win32/jscript/CMakeLists.txt | 12 +++-- dll/win32/mapi32/CMakeLists.txt | 12 +++-- dll/win32/mscoree/CMakeLists.txt | 12 +++-- dll/win32/msgina/CMakeLists.txt | 17 +++---- dll/win32/mshtml/CMakeLists.txt | 12 +++-- dll/win32/msi/CMakeLists.txt | 16 +++--- dll/win32/msxml3/CMakeLists.txt | 18 ++++--- dll/win32/netapi32/CMakeLists.txt | 18 ++++--- dll/win32/ole32/CMakeLists.txt | 20 ++++---- dll/win32/oleacc/CMakeLists.txt | 16 +++--- dll/win32/oleaut32/CMakeLists.txt | 16 +++--- dll/win32/rpcrt4/CMakeLists.txt | 12 +++-- dll/win32/scrrun/CMakeLists.txt | 12 +++-- dll/win32/setupapi/CMakeLists.txt | 12 +++-- dll/win32/shell32/CMakeLists.txt | 23 ++++----- dll/win32/shlwapi/CMakeLists.txt | 12 +++-- dll/win32/sti/CMakeLists.txt | 14 +++--- dll/win32/sxs/CMakeLists.txt | 12 +++-- dll/win32/urlmon/CMakeLists.txt | 14 +++--- dll/win32/userenv/CMakeLists.txt | 10 ++-- dll/win32/vbscript/CMakeLists.txt | 10 ++-- dll/win32/wbemdisp/CMakeLists.txt | 10 ++-- dll/win32/wbemprox/CMakeLists.txt | 12 +++-- dll/win32/windowscodecs/CMakeLists.txt | 15 +++--- dll/win32/wininet/CMakeLists.txt | 10 ++-- dll/win32/wldap32/CMakeLists.txt | 12 +++-- dll/win32/wshom.ocx/CMakeLists.txt | 10 ++-- drivers/bus/acpi/CMakeLists.txt | 15 +++--- drivers/bus/acpi/cmbatt/CMakeLists.txt | 10 ++-- drivers/bus/acpi/compbatt/CMakeLists.txt | 10 ++-- drivers/bus/pcix/CMakeLists.txt | 10 ++-- drivers/hid/hidclass/CMakeLists.txt | 10 ++-- drivers/input/kbdclass/CMakeLists.txt | 10 ++-- drivers/input/mouclass/CMakeLists.txt | 10 ++-- drivers/serial/serenum/CMakeLists.txt | 10 ++-- drivers/serial/serial/CMakeLists.txt | 10 ++-- drivers/storage/class/classpnp/CMakeLists.txt | 10 ++-- drivers/storage/port/storport/CMakeLists.txt | 10 ++-- drivers/usb/usbccgp/CMakeLists.txt | 10 ++-- drivers/usb/usbhub/CMakeLists.txt | 10 ++-- drivers/usb/usbport/CMakeLists.txt | 10 ++-- drivers/usb/usbstor/CMakeLists.txt | 10 ++-- drivers/wdm/audio/backpln/portcls/CMakeLists.txt | 10 ++-- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 10 ++-- .../applications/explorer-old/CMakeLists.txt | 13 ++--- modules/rostests/apitests/advapi32/CMakeLists.txt | 13 +++-- modules/rostests/apitests/afd/CMakeLists.txt | 13 +++-- modules/rostests/apitests/atl/CMakeLists.txt | 10 ++-- modules/rostests/apitests/cmd/CMakeLists.txt | 5 +- modules/rostests/apitests/com/CMakeLists.txt | 15 ++++-- modules/rostests/apitests/gdi32/CMakeLists.txt | 14 ++++-- modules/rostests/apitests/kernel32/CMakeLists.txt | 14 ++++-- modules/rostests/apitests/mountmgr/CMakeLists.txt | 14 ++++-- modules/rostests/apitests/ntdll/CMakeLists.txt | 14 ++++-- modules/rostests/apitests/shell32/CMakeLists.txt | 10 ++-- modules/rostests/apitests/user32/CMakeLists.txt | 14 ++++-- modules/rostests/apitests/win32nt/CMakeLists.txt | 9 ++-- modules/rostests/apitests/ws2_32/CMakeLists.txt | 13 +++-- modules/rostests/apitests/zipfldr/CMakeLists.txt | 11 +++-- modules/rostests/winetests/advapi32/CMakeLists.txt | 12 +++-- modules/rostests/winetests/comctl32/CMakeLists.txt | 14 +++--- modules/rostests/winetests/comdlg32/CMakeLists.txt | 10 ++-- modules/rostests/winetests/crypt32/CMakeLists.txt | 13 +++-- modules/rostests/winetests/dinput/CMakeLists.txt | 13 +++-- modules/rostests/winetests/dinput8/CMakeLists.txt | 16 ++++-- modules/rostests/winetests/dsound/CMakeLists.txt | 13 +++-- modules/rostests/winetests/gdi32/CMakeLists.txt | 10 ++-- modules/rostests/winetests/gdiplus/CMakeLists.txt | 12 +++-- modules/rostests/winetests/kernel32/CMakeLists.txt | 10 ++-- modules/rostests/winetests/mshtml/CMakeLists.txt | 12 +++-- modules/rostests/winetests/msi/CMakeLists.txt | 14 ++++-- modules/rostests/winetests/msvcrt/CMakeLists.txt | 12 +++-- modules/rostests/winetests/msxml3/CMakeLists.txt | 12 +++-- modules/rostests/winetests/ntdll/CMakeLists.txt | 12 +++-- modules/rostests/winetests/ole32/CMakeLists.txt | 13 +++-- modules/rostests/winetests/oleaut32/CMakeLists.txt | 15 ++++-- modules/rostests/winetests/shell32/CMakeLists.txt | 10 ++-- modules/rostests/winetests/shlwapi/CMakeLists.txt | 13 +++-- modules/rostests/winetests/user32/CMakeLists.txt | 10 ++-- .../winetests/windowscodecs/CMakeLists.txt | 12 +++-- ntoskrnl/CMakeLists.txt | 7 ++- ntoskrnl/ntkrnlmp/CMakeLists.txt | 7 ++- ntoskrnl/ntos.cmake | 1 - sdk/cmake/CMakeMacros.cmake | 10 ++++ sdk/cmake/gcc.cmake | 35 ------------- sdk/cmake/msvc.cmake | 57 ---------------------- sdk/lib/3rdparty/libmpg123/CMakeLists.txt | 13 +++-- win32ss/drivers/font/ftfd/CMakeLists.txt | 10 ++-- win32ss/drivers/videoprt/CMakeLists.txt | 10 ++-- win32ss/printing/base/spoolss/CMakeLists.txt | 8 +-- win32ss/printing/base/winspool/CMakeLists.txt | 8 +-- 123 files changed, 872 insertions(+), 642 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3613211a66..d2c5fcf639b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,10 +139,17 @@ else() add_definitions(-D_WINKD_) endif() - if(CMAKE_VERSION MATCHES "ReactOS" AND CMAKE_VERSION VERSION_LESS 3.3.0) - set(PCH 1 CACHE BOOL "Whether to use precompiled headers") + if(ENABLE_CCACHE) + message(WARNING "-- Disabling precompiled headers support (ccache).") + option(PCH "Whether to use precompiled headers" OFF) + elseif(CMAKE_VERSION VERSION_LESS 3.16.0) + message(WARNING "-- Disabling precompiled headers support due to this unsupported CMake version: ${CMAKE_VERSION}.") + option(PCH "Whether to use precompiled headers" OFF) + elseif(GCC) + message(WARNING "-- Disabling precompiled headers on GCC by default CORE-17108.") + option(PCH "Whether to use precompiled headers" OFF) else() - set(PCH 0 CACHE BOOL "Whether to use precompiled headers") + option(PCH "Whether to use precompiled headers" ON) endif() # Version Options diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index 0deaeafee5d..2e0b06bbd13 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -11,16 +11,24 @@ list(APPEND SOURCE callback.c hlpfile.c macro.c - winhelp.c - precomp.h) + winhelp.c) + +list(APPEND PCH_SKIP_SOURCE + macro.lex.yy.c + string.c) # macro.lex.yy.c has been generated with relative file paths... set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) -add_executable(winhlp32 ${SOURCE} macro.lex.yy.c string.c rsrc.rc) + +add_executable(winhlp32 + ${SOURCE} + ${PCH_SKIP_SOURCE} + rsrc.rc) + set_module_type(winhlp32 win32gui) target_link_libraries(winhlp32 wine) add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll) -add_pch(winhlp32 precomp.h SOURCE) +add_pch(winhlp32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) diff --git a/base/services/dhcpcsvc/CMakeLists.txt b/base/services/dhcpcsvc/CMakeLists.txt index e559f15524e..604d21564b5 100644 --- a/base/services/dhcpcsvc/CMakeLists.txt +++ b/base/services/dhcpcsvc/CMakeLists.txt @@ -16,16 +16,18 @@ list(APPEND SOURCE dhcp/socket.c dhcp/tables.c dhcp/util.c - dhcpcsvc.c - include/rosdhcp.h) + dhcpcsvc.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_stubs.c) add_library(dhcpcsvc MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} dhcpcsvc.rc - ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def) set_module_type(dhcpcsvc win32dll) add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll) -add_pch(dhcpcsvc include/rosdhcp.h SOURCE) +add_pch(dhcpcsvc include/rosdhcp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET dhcpcsvc DESTINATION reactos/system32 FOR all) diff --git a/base/services/svchost/CMakeLists.txt b/base/services/svchost/CMakeLists.txt index ee6f64f6e06..9a9af07057f 100644 --- a/base/services/svchost/CMakeLists.txt +++ b/base/services/svchost/CMakeLists.txt @@ -4,17 +4,19 @@ list(APPEND SOURCE registry.c rpcsrv.c netbios.c - svchost.c - svchost.h) + svchost.c) + +list(APPEND PCH_SKIP_SOURCE + security.cxx) add_executable(svchost ${SOURCE} - security.cxx + ${PCH_SKIP_SOURCE} svchost.rc) target_link_libraries(svchost uuid) set_module_type(svchost win32cui UNICODE) add_delay_importlibs(svchost netapi32 ole32) add_importlibs(svchost advapi32 rpcrt4 kernel32 ntdll) -add_pch(svchost svchost.h SOURCE) +add_pch(svchost svchost.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt index 597679bbf3b..b67c167873d 100644 --- a/dll/cpl/desk/CMakeLists.txt +++ b/dll/cpl/desk/CMakeLists.txt @@ -20,20 +20,22 @@ list(APPEND SOURCE general.c draw.c theme.c - muireg.c - desk.h) + muireg.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) file(GLOB desk_rc_deps resources/*.*) add_rc_deps(desk.rc ${desk_rc_deps}) add_library(desk MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} desk.rc ${CMAKE_CURRENT_BINARY_DIR}/desk.def) set_module_type(desk cpl UNICODE) target_link_libraries(desk uuid) add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme gdiplus msvcrt kernel32 ntdll) -add_pch(desk desk.h SOURCE) +add_pch(desk desk.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index 98a24bbc5e6..9160e2ada15 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -17,17 +17,19 @@ list(APPEND SOURCE swapchain.c texture.c vertexdeclaration.c - volume.c - precomp.h) + volume.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(d3d8 MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) set_module_type(d3d8 win32dll UNICODE) target_link_libraries(d3d8 uuid wine) add_importlibs(d3d8 d3dwine msvcrt kernel32 ntdll) -add_pch(d3d8 precomp.h SOURCE) +add_pch(d3d8 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt index 14dd3e65320..5c729add466 100644 --- a/dll/directx/wine/d3d9/CMakeLists.txt +++ b/dll/directx/wine/d3d9/CMakeLists.txt @@ -18,12 +18,14 @@ list(APPEND SOURCE swapchain.c texture.c vertexdeclaration.c - volume.c - precomp.h) + volume.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(d3d9 MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) @@ -31,5 +33,5 @@ add_library(d3d9 MODULE set_module_type(d3d9 win32dll UNICODE) target_link_libraries(d3d9 wine) add_importlibs(d3d9 d3dwine user32 msvcrt kernel32 ntdll) -add_pch(d3d9 precomp.h SOURCE) +add_pch(d3d9 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index c651fb51b02..899b51ecb7e 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -15,19 +15,21 @@ list(APPEND SOURCE main.c preproc.c reflection.c - utils.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c) + utils.c) -add_library(d3dcompiler_43 MODULE - ${SOURCE} +list(APPEND PCH_SKIP_SOURCE asmshader.tab.c asmshader.yy.c hlsl.tab.c hlsl.yy.c ppy.tab.c - ppl.yy.c + ppl.yy.c) + +add_library(d3dcompiler_43 MODULE + ${SOURCE} + ${PCH_SKIP_SOURCE} version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def) # some files have been generated with relative file paths... @@ -44,5 +46,5 @@ set_module_type(d3dcompiler_43 win32dll) target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp) add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll) add_dependencies(d3dcompiler_43 d3d_idl_headers) -add_pch(d3dcompiler_43 precomp.h SOURCE) +add_pch(d3dcompiler_43 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3dx9_36/d3dx9.cmake b/dll/directx/wine/d3dx9_36/d3dx9.cmake index 80fb5d807ab..5fcdb96d21c 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9.cmake +++ b/dll/directx/wine/d3dx9_36/d3dx9.cmake @@ -22,14 +22,16 @@ function(add_d3dx9_target __version) ../d3dx9_36/texture.c ../d3dx9_36/util.c ../d3dx9_36/volume.c - ../d3dx9_36/xfile.c - ../d3dx9_36/precomp.h) + ../d3dx9_36/xfile.c) + + list(APPEND PCH_SKIP_SOURCE + ../d3dx9_36/guid.c + ${CMAKE_CURRENT_BINARY_DIR}/${module}_stubs.c) add_library(${module} MODULE ${SOURCE} - ../d3dx9_36/guid.c + ${PCH_SKIP_SOURCE} version.rc - ${CMAKE_CURRENT_BINARY_DIR}/${module}_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/${module}.def) add_definitions(-D__ROS_LONG64__) @@ -38,7 +40,7 @@ function(add_d3dx9_target __version) target_link_libraries(${module} dxguid wine) add_importlibs(${module} d3dcompiler_43 d3dxof d3dwine user32 ole32 gdi32 msvcrt kernel32 ntdll) add_delay_importlibs(${module} windowscodecs) - add_pch(${module} ../d3dx9_36/precomp.h SOURCE) + add_pch(${module} ../d3dx9_36/precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET ${module} DESTINATION reactos/system32 FOR all) target_compile_definitions(${module} PRIVATE -DD3DX_SDK_VERSION=${__version} -D__WINESRC__ -Dcopysignf=_copysignf) diff --git a/dll/directx/wine/d3dxof/CMakeLists.txt b/dll/directx/wine/d3dxof/CMakeLists.txt index 21b97cd6522..98fdae11965 100644 --- a/dll/directx/wine/d3dxof/CMakeLists.txt +++ b/dll/directx/wine/d3dxof/CMakeLists.txt @@ -6,17 +6,19 @@ spec2def(d3dxof.dll d3dxof.spec ADD_IMPORTLIB) list(APPEND SOURCE d3dxof.c main.c - parsing.c - precomp.h) + parsing.c) + +list(APPEND PCH_SKIP_SOURCE + mszip.c) add_library(d3dxof MODULE ${SOURCE} - mszip.c + ${PCH_SKIP_SOURCE} version.rc ${CMAKE_CURRENT_BINARY_DIR}/d3dxof.def) set_module_type(d3dxof win32dll) target_link_libraries(d3dxof dxguid uuid wine) add_importlibs(d3dxof msvcrt kernel32 ntdll) -add_pch(d3dxof precomp.h SOURCE) +add_pch(d3dxof precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET d3dxof DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dxdiagn/CMakeLists.txt b/dll/directx/wine/dxdiagn/CMakeLists.txt index 16fdc1f73a8..41adda026ee 100644 --- a/dll/directx/wine/dxdiagn/CMakeLists.txt +++ b/dll/directx/wine/dxdiagn/CMakeLists.txt @@ -6,12 +6,14 @@ spec2def(dxdiagn.dll dxdiagn.spec) list(APPEND SOURCE container.c dxdiag_main.c - provider.c - precomp.h) + provider.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(dxdiagn MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} dxdiagn.rc ${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def) @@ -19,5 +21,5 @@ set_module_type(dxdiagn win32dll) target_link_libraries(dxdiagn strmiids dxguid uuid wine) add_dependencies(dxdiagn wineheaders) add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 dsound msvcrt kernel32 ntdll) -add_pch(dxdiagn precomp.h SOURCE) +add_pch(dxdiagn precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET dxdiagn DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/msdmo/CMakeLists.txt b/dll/directx/wine/msdmo/CMakeLists.txt index d8d1d34bea0..03475b1d366 100644 --- a/dll/directx/wine/msdmo/CMakeLists.txt +++ b/dll/directx/wine/msdmo/CMakeLists.txt @@ -5,17 +5,19 @@ spec2def(msdmo.dll msdmo.spec ADD_IMPORTLIB) list(APPEND SOURCE dmoreg.c - dmort.c - precomp.h) + dmort.c) + +list(APPEND PCH_SKIP_SOURCE + stubs.c) add_library(msdmo MODULE ${SOURCE} - stubs.c + ${PCH_SKIP_SOURCE} rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) set_module_type(msdmo win32dll) target_link_libraries(msdmo uuid wine mediaobj_guid) add_importlibs(msdmo user32 advapi32 ole32 msvcrt kernel32 ntdll) -add_pch(msdmo precomp.h SOURCE) +add_pch(msdmo precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET msdmo DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/quartz/CMakeLists.txt b/dll/directx/wine/quartz/CMakeLists.txt index e0996b88a04..716edfd108c 100644 --- a/dll/directx/wine/quartz/CMakeLists.txt +++ b/dll/directx/wine/quartz/CMakeLists.txt @@ -34,13 +34,15 @@ list(APPEND SOURCE systemclock.c videorenderer.c vmr9.c - waveparser.c - precomp.h) + waveparser.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c) add_library(quartz MODULE ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c + ${PCH_SKIP_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/quartz.def version.rc) @@ -57,5 +59,5 @@ set_module_type(quartz win32dll) target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB}) add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 advapi32_vista shlwapi msvcrt kernel32 ntdll) add_dependencies(quartz dxsdk quartz_idlheader stdole2) -add_pch(quartz precomp.h SOURCE) +add_pch(quartz precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 5ea6ca5d3d3..6ad60fd8404 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -23,8 +23,7 @@ list(APPEND SOURCE rtl/libsupp.c rtl/uilist.c rtl/version.c - etw/trace.c - include/ntdll.h) + etw/trace.c) if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE dispatch/i386/dispatch.S) @@ -38,11 +37,14 @@ endif() add_asm_files(ntdll_asm ${ASM_SOURCE}) +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c) + add_library(ntdll MODULE ${SOURCE} ${ntdll_asm} + ${PCH_SKIP_SOURCE} def/ntdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/ntdll_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) set_module_type(ntdll win32dll ENTRYPOINT 0) @@ -56,6 +58,6 @@ if(MSVC) endif() target_link_libraries(ntdll rtl ntdllsys libcntpr uuid ${PSEH_LIB}) -add_pch(ntdll include/ntdll.h SOURCE) +add_pch(ntdll include/ntdll.h "${PCH_SKIP_SOURCE}") add_dependencies(ntdll ntstatus asm) add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all) diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index b0caa74fabf..b2e6de97f2f 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -107,13 +107,15 @@ list(APPEND LIBNURBS_SOURCE src/libnurbs/nurbtess/sampleCompTop.cc src/libnurbs/nurbtess/sampleMonoPoly.cc src/libnurbs/nurbtess/sampledLine.cc - src/libnurbs/nurbtess/searchTree.cc - precomp.h) + src/libnurbs/nurbtess/searchTree.cc) + +list(APPEND PCH_SKIP_SOURCE + src/libnurbs/nurbtess/polyDBG.cc + ${SOURCE}) add_library(glu32 MODULE ${LIBNURBS_SOURCE} - src/libnurbs/nurbtess/polyDBG.cc - ${SOURCE} + ${PCH_SKIP_SOURCE} glu32.rc ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) @@ -129,5 +131,5 @@ elseif(USE_CLANG_CL) endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll) -add_pch(glu32 precomp.h LIBNURBS_SOURCE) +add_pch(glu32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/netshell/CMakeLists.txt b/dll/shellext/netshell/CMakeLists.txt index dc4a260045a..2ed317395d0 100644 --- a/dll/shellext/netshell/CMakeLists.txt +++ b/dll/shellext/netshell/CMakeLists.txt @@ -26,21 +26,23 @@ list(APPEND SOURCE connectmanager.cpp lanconnectui.cpp lanstatusui.cpp - setup.cpp - precomp.h) + setup.cpp) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c) file(GLOB netshell_rc_deps res/*.*) add_rc_deps(netshell.rc ${netshell_rc_deps}) add_library(netshell MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} netshell.rc - ${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/netshell.def) set_module_type(netshell win32dll UNICODE) target_link_libraries(netshell uuid wine) add_delay_importlibs(netshell ole32 oleaut32 shlwapi shell32) add_importlibs(netshell version iphlpapi gdi32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll) -add_pch(netshell precomp.h SOURCE) +add_pch(netshell precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/shellbtrfs/CMakeLists.txt b/dll/shellext/shellbtrfs/CMakeLists.txt index 7022dc05a56..c8fdc857001 100644 --- a/dll/shellext/shellbtrfs/CMakeLists.txt +++ b/dll/shellext/shellbtrfs/CMakeLists.txt @@ -24,12 +24,14 @@ list(APPEND SOURCE recv.cpp scrub.cpp send.cpp - volpropsheet.cpp - precomp.h) + volpropsheet.cpp) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(shellbtrfs MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} shellbtrfs.rc ${CMAKE_CURRENT_BINARY_DIR}/shellbtrfs.def) @@ -39,5 +41,5 @@ add_rc_deps(shellbtrfs.rc ${shellbtrfs_rc_deps}) set_module_type(shellbtrfs win32dll UNICODE) target_link_libraries(shellbtrfs uuid) add_importlibs(shellbtrfs advapi32 advapi32_vista ole32 shell32 shlwapi user32 comctl32 uxtheme setupapi comdlg32 gdi32 msvcrt kernel32_vista kernel32 ntdll) -add_pch(shellbtrfs precomp.h SOURCE) +add_pch(shellbtrfs precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET shellbtrfs DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt index 24d43d5ad23..b7def507315 100644 --- a/dll/win32/aclui/CMakeLists.txt +++ b/dll/win32/aclui/CMakeLists.txt @@ -6,16 +6,18 @@ list(APPEND SOURCE aclui.c checklist.c misc.c - sidcache.c - precomp.h) + sidcache.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(aclui MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} aclui.rc ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) set_module_type(aclui win32dll UNICODE) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) -add_pch(aclui precomp.h SOURCE) +add_pch(aclui precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index 4a366badecf..3e0d816d72e 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -43,22 +43,24 @@ list(APPEND SOURCE wine/crypt.c wine/crypt_des.c wine/crypt_lmhash.c - wine/security.c - advapi32.h) + wine/security.c) -add_library(advapi32 MODULE - ${SOURCE} - advapi32.rc +list(APPEND PCH_SKIP_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/advapi32_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.c ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c ${CMAKE_CURRENT_BINARY_DIR}/winreg_c.c) +add_library(advapi32 MODULE + ${SOURCE} + ${PCH_SKIP_SOURCE} + advapi32.rc + ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) + set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) add_delay_importlibs(advapi32 secur32) add_importlibs(advapi32 advapi32_vista rpcrt4 kernel32 ntdll) -add_pch(advapi32 advapi32.h SOURCE) +add_pch(advapi32 advapi32.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt index 62daabfaea1..c1a9e84bc97 100644 --- a/dll/win32/avifil32/CMakeLists.txt +++ b/dll/win32/avifil32/CMakeLists.txt @@ -17,19 +17,21 @@ list(APPEND SOURCE getframe.c icmstream.c tmpfile.c - wavfile.c - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - precomp.h) + wavfile.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/avifil32_p.c) add_library(avifil32 MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/avifil32_p.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) set_module_type(avifil32 win32dll) target_link_libraries(avifil32 wine ${PSEH_LIB}) add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(avifil32 precomp.h SOURCE) +add_pch(avifil32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 562693288de..5c136cd02cb 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -37,19 +37,21 @@ list(APPEND SOURCE toolsband.cpp travellog.cpp utility.cpp - CProgressDialog.cpp - precomp.h) + CProgressDialog.cpp) + +list(APPEND PCH_SKIP_SOURCE + dllinstall.c) add_library(browseui MODULE ${SOURCE} - dllinstall.c + ${PCH_SKIP_SOURCE} browseui.rc ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui shellbars shellfind uuid wine) add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 mpr msvcrt kernel32 ntdll) -add_pch(browseui precomp.h SOURCE) +add_pch(browseui precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) if(NOT MSVC) diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt index f770a5052fb..042d0aa1842 100644 --- a/dll/win32/cabinet/CMakeLists.txt +++ b/dll/win32/cabinet/CMakeLists.txt @@ -12,17 +12,19 @@ spec2def(cabinet.dll cabinet.spec ADD_IMPORTLIB) list(APPEND SOURCE cabinet_main.c fci.c - fdi.c - precomp.h) + fdi.c) + +list(APPEND PCH_SKIP_SOURCE + stubs.c) add_library(cabinet MODULE ${SOURCE} - stubs.c + ${PCH_SKIP_SOURCE} cabinet.rc ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def) set_module_type(cabinet win32dll) target_link_libraries(cabinet wine zlib) add_importlibs(cabinet msvcrt kernel32 ntdll) -add_pch(cabinet precomp.h SOURCE) +add_pch(cabinet precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index b47f7646bee..d60f18a1696 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -54,12 +54,14 @@ list(APPEND SOURCE tooltips.c trackbar.c treeview.c - updown.c - precomp.h) + updown.c) + +list(APPEND PCH_SKIP_SOURCE + stubs.c) add_library(comctl32 MODULE ${SOURCE} - stubs.c + ${PCH_SKIP_SOURCE} rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def) @@ -67,9 +69,9 @@ set_module_type(comctl32 win32dll UNICODE) target_link_libraries(comctl32 uuid wine ${PSEH_LIB}) add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernel32 ntdll) -add_pch(comctl32 precomp.h SOURCE) +add_pch(comctl32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all) add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) \ No newline at end of file +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt index 5c2a93cb9cc..b9ccf7b85dc 100644 --- a/dll/win32/crypt32/CMakeLists.txt +++ b/dll/win32/crypt32/CMakeLists.txt @@ -40,18 +40,20 @@ list(APPEND SOURCE serialize.c sip.c store.c - str.c - precomp.h) + str.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c) add_library(crypt32 MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} crypt32.rc - ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) add_delay_importlibs(crypt32 cryptnet) add_importlibs(crypt32 bcrypt user32 advapi32 advapi32_vista msvcrt kernel32 ntdll) -add_pch(crypt32 precomp.h SOURCE) +add_pch(crypt32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt index 41cac2847a0..9a756219947 100644 --- a/dll/win32/fmifs/CMakeLists.txt +++ b/dll/win32/fmifs/CMakeLists.txt @@ -9,17 +9,19 @@ list(APPEND SOURCE format.c init.c media.c - query.c - precomp.h) + query.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c) add_library(fmifs MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} fmifs.rc - ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def) set_module_type(fmifs win32dll UNICODE ENTRYPOINT InitializeFmIfs 12) add_importlibs(fmifs kernel32 ntdll) -add_pch(fmifs precomp.h SOURCE) +add_pch(fmifs precomp.h "${PCH_SKIP_SOURCE}") add_dependencies(fmifs psdk) add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 11fe7ee2eed..a3ea0e30437 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -21,21 +21,23 @@ list(APPEND SOURCE pathiterator.c pen.c region.c - stringformat.c - precomp.h) + stringformat.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c) add_library(gdiplus MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} gdiplus.rc - ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def) set_module_type(gdiplus win32dll) target_link_libraries(gdiplus wine) add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) -add_pch(gdiplus precomp.h SOURCE) +add_pch(gdiplus precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) @@ -43,4 +45,3 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) - diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt index 103e58e97f5..32b6f023dc8 100644 --- a/dll/win32/hhctrl.ocx/CMakeLists.txt +++ b/dll/win32/hhctrl.ocx/CMakeLists.txt @@ -14,12 +14,14 @@ list(APPEND SOURCE index.c search.c stream.c - webbrowser.c - precomp.h) + webbrowser.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(hhctrl MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} hhctrl.rc ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) @@ -34,5 +36,5 @@ set_module_type(hhctrl win32ocx) target_link_libraries(hhctrl uuid wine) add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) add_dependencies(hhctrl stdole2 wineheaders) -add_pch(hhctrl precomp.h SOURCE) +add_pch(hhctrl precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET hhctrl DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt index 29ae5f99da6..86e5e1a11bb 100644 --- a/dll/win32/hlink/CMakeLists.txt +++ b/dll/win32/hlink/CMakeLists.txt @@ -7,18 +7,20 @@ list(APPEND SOURCE browse_ctx.c extserv.c hlink_main.c - link.c - precomp.h) + link.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c) add_library(hlink MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} hlink.rc - ${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/hlink.def) set_module_type(hlink win32dll) target_link_libraries(hlink uuid wine) add_delay_importlibs(hlink urlmon) add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll) -add_pch(hlink precomp.h SOURCE) +add_pch(hlink precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index d39f1b45bee..717ebf7b504 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -7,17 +7,19 @@ list(APPEND SOURCE access.c imagehlp_main.c integrity.c - modify.c - precomp.h) + modify.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_stubs.c) add_library(imagehlp MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} imagehlp.rc - ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def) set_module_type(imagehlp win32dll) target_link_libraries(imagehlp wine ${PSEH_LIB}) add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll) -add_pch(imagehlp precomp.h SOURCE) +add_pch(imagehlp precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt index 3e60b9922a7..90ff8513cdc 100644 --- a/dll/win32/inetcomm/CMakeLists.txt +++ b/dll/win32/inetcomm/CMakeLists.txt @@ -11,18 +11,20 @@ list(APPEND SOURCE mimeole.c pop3transport.c protocol.c - smtptransport.c - precomp.h) + smtptransport.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c) add_library(inetcomm MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} inetcomm.rc - ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def) set_module_type(inetcomm win32dll) target_link_libraries(inetcomm uuid wine) add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 propsys urlmon msvcrt kernel32 ntdll) -add_pch(inetcomm precomp.h SOURCE) +add_pch(inetcomm precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt index 1ee71e5ffb8..af11eeaffd1 100644 --- a/dll/win32/inseng/CMakeLists.txt +++ b/dll/win32/inseng/CMakeLists.txt @@ -9,14 +9,20 @@ spec2def(inseng.dll inseng.spec) list(APPEND SOURCE icif.c inf.c - inseng_main.c - precomp.h + inseng_main.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) + +add_library(inseng MODULE + ${SOURCE} + ${PCH_SKIP_SOURCE} + inseng.rc ${CMAKE_CURRENT_BINARY_DIR}/inseng_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/inseng.def) -add_library(inseng MODULE ${SOURCE} guid.c inseng.rc) set_module_type(inseng win32dll) target_link_libraries(inseng uuid wine) add_importlibs(inseng ole32 urlmon kernel32_vista msvcrt kernel32 ntdll) -add_pch(inseng precomp.h SOURCE) +add_pch(inseng precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET inseng DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt index 92a01fe9b32..eb2f50c1631 100644 --- a/dll/win32/itss/CMakeLists.txt +++ b/dll/win32/itss/CMakeLists.txt @@ -9,19 +9,21 @@ list(APPEND SOURCE itss.c moniker.c protocol.c - storage.c - precomp.h) + storage.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c) add_library(itss MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/itss.def) set_module_type(itss win32dll) target_link_libraries(itss uuid wine) add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll) -add_pch(itss precomp.h SOURCE) +add_pch(itss precomp.h "${PCH_SKIP_SOURCE}") add_dependencies(itss wineheaders) add_cd_file(TARGET itss DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index b6f5c42be10..39f50011c05 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -32,8 +32,11 @@ list(APPEND SOURCE object.c regexp.c string.c - vbarray.c - precomp.h) + vbarray.c) + +list(APPEND PCH_SKIP_SOURCE + cc_parser.tab.c + parser.tab.c) # cc_parser.tab.c/parser.tab.c have been generated with relative file paths... set_source_files_properties(cc_parser.tab.c parser.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") @@ -48,8 +51,7 @@ set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps add_library(jscript MODULE ${SOURCE} - cc_parser.tab.c - parser.tab.c + ${PCH_SKIP_SOURCE} rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) @@ -59,5 +61,5 @@ add_dependencies(jscript jscript_idlheader stdole2) set_module_type(jscript win32dll) target_link_libraries(jscript uuid wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) -add_pch(jscript precomp.h SOURCE) +add_pch(jscript precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt index 18da64dfec5..35ba1de4594 100644 --- a/dll/win32/mapi32/CMakeLists.txt +++ b/dll/win32/mapi32/CMakeLists.txt @@ -9,18 +9,20 @@ list(APPEND SOURCE prop.c sendmail.c stubs.c - util.c - precomp.h) + util.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c) add_library(mapi32 MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} version.rc - ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) set_module_type(mapi32 win32dll) target_link_libraries(mapi32 uuid wine) add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll) -add_pch(mapi32 precomp.h SOURCE) +add_pch(mapi32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index 8cba9456648..2671d7a79e3 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -13,18 +13,20 @@ list(APPEND SOURCE corruntimehost.c metadata.c metahost.c - mscoree_main.c - mscoree_private.h) + mscoree_main.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c) add_library(mscoree MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} mscoree.rc - ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def) set_module_type(mscoree win32dll) target_link_libraries(mscoree uuid wine) add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll) -add_pch(mscoree mscoree_private.h SOURCE) +add_pch(mscoree mscoree_private.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt index ca47e6c1d04..5f3fa9ece15 100644 --- a/dll/win32/msgina/CMakeLists.txt +++ b/dll/win32/msgina/CMakeLists.txt @@ -10,28 +10,27 @@ include_directories( spec2def(msgina.dll msgina.spec) -list(APPEND C_SOURCE +list(APPEND SOURCE gui.c lsa.c msgina.c shutdown.c stubs.c - tui.c - msgina.h) + tui.c) -list(APPEND CPP_SOURCE - dimmedwindow.cpp) +list(APPEND PCH_SKIP_SOURCE + dimmedwindow.cpp + ${CMAKE_CURRENT_BINARY_DIR}/msgina_stubs.c) add_library(msgina MODULE - ${C_SOURCE} - ${CPP_SOURCE} + ${SOURCE} + ${PCH_SKIP_SOURCE} msgina.rc - ${CMAKE_CURRENT_BINARY_DIR}/msgina_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msgina.def) set_module_type(msgina win32dll UNICODE) target_link_libraries(msgina wine uuid ${PSEH_LIB}) add_delay_importlibs(msgina secur32) add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) -add_pch(msgina msgina.h CPP_SOURCE) +add_pch(msgina msgina.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 05ad532c9fb..a225f25d64f 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -88,19 +88,21 @@ list(APPEND SOURCE task.c txtrange.c view.c - xmlhttprequest.c - mshtml_private.h) + xmlhttprequest.c) if(MSVC) add_asm_files(mshtml_asm msvc.S) endif() +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c) + add_library(mshtml MODULE ${SOURCE} ${mshtml_asm} - guid.c + ${PCH_SKIP_SOURCE} rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) list(APPEND mshtml_rc_deps @@ -114,5 +116,5 @@ target_link_libraries(mshtml uuid wine strmiids oldnames) add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_dependencies(mshtml mshtml_nsiface_header) -add_pch(mshtml mshtml_private.h SOURCE) +add_pch(mshtml mshtml_private.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET mshtml DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 10306ca814a..106f6817851 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -54,18 +54,20 @@ list(APPEND SOURCE tokenize.c update.c upgrade.c - where.c - precomp.h) + where.c) + +list(APPEND PCH_SKIP_SOURCE + cond.tab.c + sql.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c + ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c) # cond.tab.c/sql.tab.c have been generated with relative file paths... set_source_files_properties(cond.tab.c sql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") add_library(msi MODULE ${SOURCE} - cond.tab.c - sql.tab.c - ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c - ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c + ${PCH_SKIP_SOURCE} msi.rc ${CMAKE_CURRENT_BINARY_DIR}/msi.def) @@ -84,5 +86,5 @@ add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 kernel32 ntdll) -add_pch(msi precomp.h SOURCE) +add_pch(msi precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml3/CMakeLists.txt b/dll/win32/msxml3/CMakeLists.txt index 3cb5997af3b..b11bdf3f8ed 100644 --- a/dll/win32/msxml3/CMakeLists.txt +++ b/dll/win32/msxml3/CMakeLists.txt @@ -47,9 +47,13 @@ list(APPEND SOURCE xmldoc.c xmlelem.c xmlparser.c - xmlview.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c) + xmlview.c) + +list(APPEND PCH_SKIP_SOURCE + factory.c + uuid.c + xslpattern.tab.c + xslpattern.yy.c) # xslpattern.tab.c/xslpattern.yy.c have been generated with relative file paths... set_source_files_properties(xslpattern.tab.c xslpattern.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") @@ -64,11 +68,9 @@ set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_de add_library(msxml3 MODULE ${SOURCE} - xslpattern.tab.c - xslpattern.yy.c - factory.c - uuid.c + ${PCH_SKIP_SOURCE} version.rc + ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def) add_idl_headers(xmlparser_idlheader xmlparser.idl) @@ -76,5 +78,5 @@ set_module_type(msxml3 win32dll) target_link_libraries(msxml3 libxml2 iconv-static uuid wine zlib) add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb -add_pch(msxml3 precomp.h SOURCE) +add_pch(msxml3 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 046e372b6a4..bbc27a4b6e2 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -35,24 +35,26 @@ list(APPEND SOURCE user.c utils.c wksta.c - wksta_new.c - netapi32.h + wksta_new.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c) + +add_library(netapi32 MODULE + ${SOURCE} + ${PCH_SKIP_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/atsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/browser_c.c ${CMAKE_CURRENT_BINARY_DIR}/dssetup_c.c ${CMAKE_CURRENT_BINARY_DIR}/netdfs_c.c ${CMAKE_CURRENT_BINARY_DIR}/netlogon_c.c ${CMAKE_CURRENT_BINARY_DIR}/srvsvc_c.c - ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) - -add_library(netapi32 MODULE - ${SOURCE} - ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) set_module_type(netapi32 win32dll) target_link_libraries(netapi32 wine ${PSEH_LIB}) add_delay_importlibs(netapi32 samlib secur32) add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(netapi32 netapi32.h SOURCE) +add_pch(netapi32 netapi32.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt index 6ef97f4402b..61310a2b6ce 100644 --- a/dll/win32/ole32/CMakeLists.txt +++ b/dll/win32/ole32/CMakeLists.txt @@ -58,25 +58,27 @@ list(APPEND SOURCE stg_stream.c storage32.c stubmanager.c - usrmarshal.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c - ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c) + usrmarshal.c) if(MSVC AND (ARCH STREQUAL "i386")) list(APPEND SOURCE msvc-thiscall.c) endif() -add_library(ole32 MODULE - ${SOURCE} +list(APPEND PCH_SKIP_SOURCE guid.c - ole32res.rc ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_objidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_oleidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_unknwn_p.c ${CMAKE_CURRENT_BINARY_DIR}/ole32_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) + +add_library(ole32 MODULE + ${SOURCE} + ${PCH_SKIP_SOURCE} + ole32res.rc + ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c + ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c ${CMAKE_CURRENT_BINARY_DIR}/ole32.def) set_module_type(ole32 win32dll) @@ -84,5 +86,5 @@ target_link_libraries(ole32 wine uuid ${PSEH_LIB}) add_delay_importlibs(ole32 oleaut32) add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll) add_dependencies(ole32 ole32idl) -add_pch(ole32 precomp.h SOURCE) +add_pch(ole32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt index bea28fa0476..5d58a0be264 100644 --- a/dll/win32/oleacc/CMakeLists.txt +++ b/dll/win32/oleacc/CMakeLists.txt @@ -12,9 +12,12 @@ list(APPEND SOURCE client.c main.c propservice.c - window.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) + window.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + ${CMAKE_CURRENT_BINARY_DIR}/oleacc_classes_p.c + ${CMAKE_CURRENT_BINARY_DIR}/oleacc_stubs.c) add_idl_headers(oleacc_idlheader oleacc_classes.idl) add_typelib(oleacc_classes.idl) @@ -29,15 +32,14 @@ set_source_files_properties(oleacc.rc PROPERTIES OBJECT_DEPENDS "${oleacc_rc_dep add_library(oleacc MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} oleacc.rc - ${CMAKE_CURRENT_BINARY_DIR}/oleacc_classes_p.c - ${CMAKE_CURRENT_BINARY_DIR}/oleacc_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) add_dependencies(oleacc oleacc_idlheader stdole2) set_module_type(oleacc win32dll) target_link_libraries(oleacc uuid wine ${PSEH_LIB}) add_importlibs(oleacc oleaut32 ole32 user32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(oleacc precomp.h SOURCE) +add_pch(oleacc precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt index 6a1523077ba..44bdb0a9871 100644 --- a/dll/win32/oleaut32/CMakeLists.txt +++ b/dll/win32/oleaut32/CMakeLists.txt @@ -30,21 +30,23 @@ list(APPEND SOURCE usrmarshal.c varformat.c variant.c - vartype.c - precomp.h) + vartype.c) if(MSVC) add_asm_files(oleaut32_asm msvc.S) endif() +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_oaidl_p.c + ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c) + add_library(oleaut32 MODULE ${SOURCE} ${oleaut32_asm} + ${PCH_SKIP_SOURCE} oleaut32.rc - ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_oaidl_p.c - ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl) @@ -53,5 +55,5 @@ set_module_type(oleaut32 win32dll) target_link_libraries(oleaut32 wine wineldr uuid ${PSEH_LIB}) add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs) add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32_vista msvcrt kernel32 ntdll) -add_pch(oleaut32 precomp.h SOURCE) +add_pch(oleaut32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index a3d68266de8..c1f8de9f68f 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -39,21 +39,23 @@ list(APPEND SOURCE rpc_server.c rpc_transport.c unix_func.c - precomp.h ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c) if(MSVC AND NOT ARCH STREQUAL "arm") add_asm_files(rpcrt4_asm msvc.S) endif() -add_library(rpcrt4 MODULE - ${SOURCE} +list(APPEND PCH_SKIP_SOURCE ndr_typelib.c ${CMAKE_CURRENT_BINARY_DIR}/ndr_types_p.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c) + +add_library(rpcrt4 MODULE + ${SOURCE} ${rpcrt4_asm} + ${PCH_SKIP_SOURCE} rpcrt4.rc - ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def) set_module_type(rpcrt4 win32dll) @@ -61,5 +63,5 @@ target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32 oleaut32) add_importlibs(rpcrt4 advapi32 advapi32_vista kernel32_vista ws2_32 msvcrt kernel32 ntdll) add_dependencies(rpcrt4 ndr_types_header) -add_pch(rpcrt4 precomp.h SOURCE) +add_pch(rpcrt4 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt index 7dbc453faa8..ae3dd1785ff 100644 --- a/dll/win32/scrrun/CMakeLists.txt +++ b/dll/win32/scrrun/CMakeLists.txt @@ -8,9 +8,10 @@ add_typelib(scrrun.idl) list(APPEND SOURCE dictionary.c filesystem.c - scrrun.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c) + scrrun.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) list(APPEND scrrun_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/scrrun.rgs @@ -21,13 +22,14 @@ set_source_files_properties(scrrun.rc PROPERTIES OBJECT_DEPENDS "${scrrun_rc_dep add_library(scrrun MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} scrrun.rc + ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def) add_dependencies(scrrun scrrun_idlheader stdole2) set_module_type(scrrun win32dll) target_link_libraries(scrrun uuid wine) add_importlibs(scrrun oleaut32 version advapi32 msvcrt kernel32 ntdll) -add_pch(scrrun precomp.h SOURCE) +add_pch(scrrun precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET scrrun DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt index 964614012b3..cd9feba4033 100644 --- a/dll/win32/setupapi/CMakeLists.txt +++ b/dll/win32/setupapi/CMakeLists.txt @@ -29,19 +29,21 @@ list(APPEND SOURCE setupcab.c stringtable.c stubs.c - rpc.c - setupapi_private.h - ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c) + rpc.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c) add_library(setupapi MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c setupapi.rc - ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def) set_module_type(setupapi win32dll UNICODE) target_link_libraries(setupapi uuid wine ${PSEH_LIB}) add_delay_importlibs(setupapi comdlg32 shell32 winspool.drv wintrust) add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll) -add_pch(setupapi setupapi_private.h SOURCE) +add_pch(setupapi setupapi_private.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 1bd52656112..e0a84c9fe8e 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -86,15 +86,9 @@ list(APPEND SOURCE CShellDispatch.cpp CFolder.cpp CFolderItems.cpp - CFolderItemVerbs.cpp - precomp.h) + CFolderItemVerbs.cpp) -file(GLOB_RECURSE shell32_rc_deps res/*.*) -list(APPEND shell32_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb) -add_rc_deps(shell32.rc ${shell32_rc_deps}) - -add_library(shell32 MODULE - ${SOURCE} +list(APPEND PCH_SKIP_SOURCE wine/appbar.c wine/brsfolder.c wine/classes.c @@ -110,11 +104,18 @@ add_library(shell32 MODULE wine/shlmenu.c wine/shpolicy.c vista.c + ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c) + +file(GLOB_RECURSE shell32_rc_deps res/*.*) +list(APPEND shell32_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb) +add_rc_deps(shell32.rc ${shell32_rc_deps}) + +add_library(shell32 MODULE + ${SOURCE} + ${PCH_SKIP_SOURCE} shell32.rc - ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) - add_typelib(shell32_shldisp.idl) set_source_files_properties(shell32.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shell32_shldisp.tlb) @@ -123,5 +124,5 @@ target_link_libraries(shell32 shellmenu shelldesktop wine uuid recyclebin) add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool.drv winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs) add_importlibs(shell32 advapi32 gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb -add_pch(shell32 precomp.h SOURCE) +add_pch(shell32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index 78fe1d19bf8..472eceb2014 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -25,19 +25,21 @@ list(APPEND SOURCE stopwatch.c string.c thread.c - url.c - precomp.h) + url.c) + +list(APPEND PCH_SKIP_SOURCE + wsprintf.c + ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c) add_library(shlwapi MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} shlwapi.rc - wsprintf.c - ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) set_module_type(shlwapi win32dll) target_link_libraries(shlwapi uuid wine) add_delay_importlibs(shlwapi userenv oleaut32 ole32 comdlg32 mpr mlang urlmon shell32 winmm version) add_importlibs(shlwapi user32 gdi32 advapi32 wininet msvcrt kernel32 ntdll) -add_pch(shlwapi precomp.h SOURCE) +add_pch(shlwapi precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/sti/CMakeLists.txt b/dll/win32/sti/CMakeLists.txt index e751fda2af0..2b5f49b96f7 100644 --- a/dll/win32/sti/CMakeLists.txt +++ b/dll/win32/sti/CMakeLists.txt @@ -11,19 +11,21 @@ add_rpcproxy_files(sti_wia.idl) list(APPEND SOURCE sti.c - sti_main.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c) + sti_main.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(sti MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} sti.rc + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) set_module_type(sti win32dll) target_link_libraries(sti wine uuid ${PSEH_LIB}) add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll) -add_pch(sti precomp.h SOURCE) +add_pch(sti precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET sti DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt index 5df97444659..6ed421e4384 100644 --- a/dll/win32/sxs/CMakeLists.txt +++ b/dll/win32/sxs/CMakeLists.txt @@ -6,17 +6,19 @@ spec2def(sxs.dll sxs.spec ADD_IMPORTLIB) list(APPEND SOURCE cache.c name.c - sxs.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c) + sxs.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(sxs MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} + ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/sxs.def) set_module_type(sxs win32dll) target_link_libraries(sxs wine) add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll) -add_pch(sxs precomp.h SOURCE) +add_pch(sxs precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index 4021d1e1b6b..7608fd94362 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -41,20 +41,22 @@ list(APPEND SOURCE umstream.c uri.c urlmon_main.c - usrmarshal.c - precomp.h) + usrmarshal.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c + ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c + ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c) add_library(urlmon MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} urlmon.rc - ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c - ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c - ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) set_module_type(urlmon win32dll) target_link_libraries(urlmon uuid wine ${PSEH_LIB}) add_delay_importlibs(urlmon advpack) add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 kernel32_vista msvcrt kernel32 ntdll) -add_pch(urlmon precomp.h SOURCE) +add_pch(urlmon precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt index d30c2438a24..28b272697b5 100644 --- a/dll/win32/userenv/CMakeLists.txt +++ b/dll/win32/userenv/CMakeLists.txt @@ -11,17 +11,19 @@ list(APPEND SOURCE registry.c setup.c sid.c - userenv.c - precomp.h) + userenv.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/userenv_stubs.c) add_library(userenv MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} userenv.rc - ${CMAKE_CURRENT_BINARY_DIR}/userenv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/userenv.def) set_module_type(userenv win32dll) target_link_libraries(userenv uuid) add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll) -add_pch(userenv precomp.h SOURCE) +add_pch(userenv precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index 63b97198d87..82b70c2a030 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -13,8 +13,10 @@ list(APPEND SOURCE vbdisp.c vbregexp.c vbscript.c - vbscript_main.c - precomp.h) + vbscript_main.c) + +list(APPEND PCH_SKIP_SOURCE + parser.tab.c) # parser.tab.c has been generated with relative file paths... set_source_files_properties(parser.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") @@ -34,7 +36,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl) add_library(vbscript MODULE ${SOURCE} - parser.tab.c + ${PCH_SKIP_SOURCE} vbscript.rc ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def) @@ -42,5 +44,5 @@ set_module_type(vbscript win32dll) target_link_libraries(vbscript uuid wine) add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(vbscript vbscript_idlheader stdole2) -add_pch(vbscript precomp.h SOURCE) +add_pch(vbscript precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wbemdisp/CMakeLists.txt b/dll/win32/wbemdisp/CMakeLists.txt index 974446545d3..9ce0d0f1f9e 100644 --- a/dll/win32/wbemdisp/CMakeLists.txt +++ b/dll/win32/wbemdisp/CMakeLists.txt @@ -5,8 +5,10 @@ spec2def(wbemdisp.dll wbemdisp.spec) list(APPEND SOURCE locator.c - main.c - precomp.h) + main.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl) add_typelib(wbemdisp_tlb.idl) @@ -20,7 +22,7 @@ set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc add_library(wbemdisp MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} wbemdisp.rc ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def) @@ -28,5 +30,5 @@ set_module_type(wbemdisp win32dll) target_link_libraries(wbemdisp uuid wine) add_dependencies(wbemdisp stdole2 wbemdisp_idlheader) add_importlibs(wbemdisp oleaut32 ole32 msvcrt kernel32 ntdll) -add_pch(wbemdisp precomp.h SOURCE) +add_pch(wbemdisp precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all) diff --git a/dll/win32/wbemprox/CMakeLists.txt b/dll/win32/wbemprox/CMakeLists.txt index 5d477dfe45d..de69823069f 100644 --- a/dll/win32/wbemprox/CMakeLists.txt +++ b/dll/win32/wbemprox/CMakeLists.txt @@ -18,16 +18,18 @@ list(APPEND SOURCE service.c services.c table.c - wbemlocator.c - precomp.h) + wbemlocator.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + wql.tab.c) # wql.tab.c has been generated with relative file paths... set_source_files_properties(wql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") add_library(wbemprox MODULE ${SOURCE} - wql.tab.c - guid.c + ${PCH_SKIP_SOURCE} wbemprox.rc ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def) @@ -36,5 +38,5 @@ set_module_type(wbemprox win32dll) target_link_libraries(wbemprox uuid wine) add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 rpcrt4 setupapi msvcrt kernel32 ntdll) add_dependencies(wbemprox d3d_idl_headers) -add_pch(wbemprox precomp.h SOURCE) +add_pch(wbemprox precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all) diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index e17a657c213..ff726c88162 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -55,33 +55,32 @@ list(APPEND SOURCE stream.c tgaformat.c tiffformat.c - ungif.c - precomp.h) + ungif.c) if(MSVC) if(ARCH STREQUAL "i386") list(APPEND SOURCE msvc-thiscall.c) endif() set_source_files_properties(bitmap.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") - list(APPEND ADDITIONAL_SOURCE bitmap.c) + list(APPEND PCH_SKIP_SOURCE bitmap.c) else() list(APPEND SOURCE bitmap.c) endif() -list(APPEND ADDITIONAL_SOURCE +list(APPEND PCH_SKIP_SOURCE guid.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c) add_library(windowscodecs MODULE ${SOURCE} - ${ADDITIONAL_SOURCE}) + ${PCH_SKIP_SOURCE} + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) set_module_type(windowscodecs win32dll) target_link_libraries(windowscodecs wine uuid ${PSEH_LIB}) add_importlibs(windowscodecs ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 advapi32_vista propsys msvcrt kernel32 ntdll) -add_pch(windowscodecs precomp.h SOURCE) +add_pch(windowscodecs precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt index 3389140c1d2..ef7693f3c7a 100644 --- a/dll/win32/wininet/CMakeLists.txt +++ b/dll/win32/wininet/CMakeLists.txt @@ -21,18 +21,20 @@ list(APPEND SOURCE internet.c netconnection.c urlcache.c - utility.c - precomp.h) + utility.c) + +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c) add_library(wininet MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) set_module_type(wininet win32dll) target_link_libraries(wininet wine ${PSEH_LIB} zlib) add_delay_importlibs(wininet secur32 crypt32 cryptui) add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 normaliz kernel32_vista msvcrt kernel32 ntdll) -add_pch(wininet precomp.h SOURCE) +add_pch(wininet precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt index b0b0b21f594..4a94f6bc3c9 100644 --- a/dll/win32/wldap32/CMakeLists.txt +++ b/dll/win32/wldap32/CMakeLists.txt @@ -22,18 +22,20 @@ list(APPEND SOURCE parse.c rename.c search.c - value.c - precomp.h - ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c) + value.c) + +list(APPEND PCH_SKIP_SOURCE + ber.c) add_library(wldap32 MODULE ${SOURCE} - ber.c + ${PCH_SKIP_SOURCE} wldap32.rc + ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def) set_module_type(wldap32 win32dll) target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) -add_pch(wldap32 precomp.h SOURCE) +add_pch(wldap32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET wldap32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wshom.ocx/CMakeLists.txt b/dll/win32/wshom.ocx/CMakeLists.txt index 27c99b2fc12..c790331ac22 100644 --- a/dll/win32/wshom.ocx/CMakeLists.txt +++ b/dll/win32/wshom.ocx/CMakeLists.txt @@ -11,12 +11,14 @@ add_typelib(wshom.idl) list(APPEND SOURCE shell.c - wshom_main.c - precomp.h) + wshom_main.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(wshom MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} wshom.rc ${CMAKE_CURRENT_BINARY_DIR}/wshom.def) @@ -30,5 +32,5 @@ set_module_type(wshom win32ocx) target_link_libraries(wshom uuid wine) add_importlibs(wshom oleaut32 ole32 shell32 advapi32 advapi32_vista user32 msvcrt kernel32 ntdll) add_dependencies(wshom stdole2 wshom_idlheader) -add_pch(wshom precomp.h SOURCE) +add_pch(wshom precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET wshom DESTINATION reactos/system32 FOR all) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index 69d26a13a47..f7a3a19bf39 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -169,15 +169,17 @@ list(APPEND ACPICA_SOURCE acpica/utilities/utxface.c acpica/utilities/utxferror.c acpica/utilities/utxfinit.c - acpica/utilities/utxfmutex.c - acpica/include/acpi.h) + acpica/utilities/utxfmutex.c) -add_library(acpica - ${ACPICA_SOURCE} +list(APPEND ACPICA_PCH_SKIP_SOURCE acpica/utilities/utexcep.c acpica/utilities/utglobal.c) -add_pch(acpica acpica/include/acpi.h ACPICA_SOURCE) +add_library(acpica + ${ACPICA_SOURCE} + ${ACPICA_PCH_SKIP_SOURCE}) + +add_pch(acpica acpica/include/acpi.h "${ACPICA_PCH_SKIP_SOURCE}") set_target_properties(acpica PROPERTIES COMPILE_DEFINITIONS "ACPI_USE_LOCAL_CACHE;ACPI_USE_SYSTEM_INTTYPES") add_dependencies(acpica bugcodes xdk) @@ -194,8 +196,7 @@ list(APPEND ACPI_SOURCE pnp.c power.c buspdo.c - main.c - precomp.h) + main.c) add_library(acpi MODULE ${ACPI_SOURCE}) set_module_type(acpi kernelmodedriver) diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/bus/acpi/cmbatt/CMakeLists.txt index 63753425c81..e43ea204cfe 100644 --- a/drivers/bus/acpi/cmbatt/CMakeLists.txt +++ b/drivers/bus/acpi/cmbatt/CMakeLists.txt @@ -3,15 +3,17 @@ list(APPEND SOURCE cmbatt.c cmexec.c cmbpnp.c - cmbwmi.c - cmbatt.h) + cmbwmi.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(cmbatt MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} cmbatt.rc) set_module_type(cmbatt kernelmodedriver) add_importlibs(cmbatt ntoskrnl hal battc wmilib) -add_pch(cmbatt cmbatt.h SOURCE) +add_pch(cmbatt cmbatt.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/bus/acpi/compbatt/CMakeLists.txt index 65743fce00c..b2e43d76808 100644 --- a/drivers/bus/acpi/compbatt/CMakeLists.txt +++ b/drivers/bus/acpi/compbatt/CMakeLists.txt @@ -2,15 +2,17 @@ list(APPEND SOURCE compbatt.c compmisc.c - comppnp.c - compbatt.h) + comppnp.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(compbatt MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} compbatt.rc) set_module_type(compbatt kernelmodedriver) add_importlibs(compbatt ntoskrnl hal battc) -add_pch(compbatt compbatt.h SOURCE) +add_pch(compbatt compbatt.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index cdbcf5f8514..4a27ae9c084 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -36,17 +36,19 @@ list(APPEND SOURCE pdo.c power.c usage.c - utils.c - pci.h) + utils.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(pcix MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} pci.rc) set_module_type(pcix kernelmodedriver) target_link_libraries(pcix arbiter) add_importlibs(pcix ntoskrnl hal) -add_pch(pcix pci.h SOURCE) +add_pch(pcix pci.h "${PCH_SKIP_SOURCE}") add_dependencies(pcix pciclass) add_cd_file(TARGET pcix DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/hid/hidclass/CMakeLists.txt b/drivers/hid/hidclass/CMakeLists.txt index f81954eca00..8ee1e815468 100644 --- a/drivers/hid/hidclass/CMakeLists.txt +++ b/drivers/hid/hidclass/CMakeLists.txt @@ -4,16 +4,18 @@ spec2def(hidclass.sys hidclass.spec ADD_IMPORTLIB) list(APPEND SOURCE fdo.c hidclass.c - pdo.c - precomp.h) + pdo.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(hidclass MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} hidclass.rc ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) set_module_type(hidclass kernelmodedriver ENTRYPOINT 0) add_importlibs(hidclass ntoskrnl hidparse hal) -add_pch(hidclass precomp.h SOURCE) +add_pch(hidclass precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt index fc3169d4360..9daa772855f 100644 --- a/drivers/input/kbdclass/CMakeLists.txt +++ b/drivers/input/kbdclass/CMakeLists.txt @@ -1,16 +1,18 @@ list(APPEND SOURCE kbdclass.c - misc.c - kbdclass.h) + misc.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(kbdclass MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} kbdclass.rc) set_module_type(kbdclass kernelmodedriver) -add_pch(kbdclass kbdclass.h SOURCE) +add_pch(kbdclass kbdclass.h "${PCH_SKIP_SOURCE}") target_link_libraries(kbdclass ${PSEH_LIB}) add_importlibs(kbdclass ntoskrnl hal) add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index 9a060d1cae4..42b9f791c6c 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -1,17 +1,19 @@ list(APPEND SOURCE misc.c - mouclass.c - mouclass.h) + mouclass.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(mouclass MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} mouclass.rc) set_module_type(mouclass kernelmodedriver) target_link_libraries(mouclass ${PSEH_LIB}) add_importlibs(mouclass ntoskrnl hal) -add_pch(mouclass mouclass.h SOURCE) +add_pch(mouclass mouclass.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all) add_registry_inf(mouclass_reg.inf) diff --git a/drivers/serial/serenum/CMakeLists.txt b/drivers/serial/serenum/CMakeLists.txt index 4cef8e49ba2..925ad744f49 100644 --- a/drivers/serial/serenum/CMakeLists.txt +++ b/drivers/serial/serenum/CMakeLists.txt @@ -4,15 +4,17 @@ list(APPEND SOURCE fdo.c misc.c pdo.c - serenum.c - serenum.h) + serenum.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(serenum MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} serenum.rc) -add_pch(serenum serenum.h SOURCE) +add_pch(serenum serenum.h "${PCH_SKIP_SOURCE}") set_module_type(serenum kernelmodedriver) add_importlibs(serenum ntoskrnl hal) add_cd_file(TARGET serenum DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/serial/serial/CMakeLists.txt b/drivers/serial/serial/CMakeLists.txt index 257ad8469fe..49ad43419cc 100644 --- a/drivers/serial/serial/CMakeLists.txt +++ b/drivers/serial/serial/CMakeLists.txt @@ -11,15 +11,17 @@ list(APPEND SOURCE pnp.c power.c rw.c - serial.c - serial.h) + serial.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(serial MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} serial.rc) set_module_type(serial kernelmodedriver) add_importlibs(serial ntoskrnl hal) -add_pch(serial serial.h SOURCE) +add_pch(serial serial.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET serial DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/storage/class/classpnp/CMakeLists.txt b/drivers/storage/class/classpnp/CMakeLists.txt index d3399c72668..fa30edc9678 100644 --- a/drivers/storage/class/classpnp/CMakeLists.txt +++ b/drivers/storage/class/classpnp/CMakeLists.txt @@ -24,16 +24,18 @@ list(APPEND SOURCE power.c retry.c utils.c - xferpkt.c - classp.h) + xferpkt.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(classpnp MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} class.rc ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) -add_pch(classpnp classp.h SOURCE) +add_pch(classpnp classp.h "${PCH_SKIP_SOURCE}") target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) diff --git a/drivers/storage/port/storport/CMakeLists.txt b/drivers/storage/port/storport/CMakeLists.txt index 7931a526de9..67a35dc52b8 100644 --- a/drivers/storage/port/storport/CMakeLists.txt +++ b/drivers/storage/port/storport/CMakeLists.txt @@ -7,16 +7,18 @@ list(APPEND SOURCE misc.c pdo.c storport.c - stubs.c - precomp.h) + stubs.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(storport MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} storport.rc ${CMAKE_CURRENT_BINARY_DIR}/storport.def) -add_pch(storport precomp.h SOURCE) +add_pch(storport precomp.h "${PCH_SKIP_SOURCE}") set_module_type(storport kernelmodedriver) add_importlibs(storport ntoskrnl hal) add_cd_file(TARGET storport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/usb/usbccgp/CMakeLists.txt b/drivers/usb/usbccgp/CMakeLists.txt index 30e2089e957..2c9319f3416 100644 --- a/drivers/usb/usbccgp/CMakeLists.txt +++ b/drivers/usb/usbccgp/CMakeLists.txt @@ -11,16 +11,18 @@ list(APPEND SOURCE function.c misc.c pdo.c - usbccgp.c - usbccgp.h) + usbccgp.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(usbccgp MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} usbccgp.rc) target_link_libraries(usbccgp ${PSEH_LIB}) set_module_type(usbccgp kernelmodedriver) add_importlibs(usbccgp ntoskrnl hal usbd) -add_pch(usbccgp usbccgp.h SOURCE) +add_pch(usbccgp usbccgp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET usbccgp DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/usb/usbhub/CMakeLists.txt b/drivers/usb/usbhub/CMakeLists.txt index 35b109e19d5..7d007181d3d 100644 --- a/drivers/usb/usbhub/CMakeLists.txt +++ b/drivers/usb/usbhub/CMakeLists.txt @@ -7,16 +7,18 @@ list(APPEND SOURCE ioctl.c pnp.c power.c - usbhub.c - usbhub.h) + usbhub.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(usbhub MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal wmilib usbd) -add_pch(usbhub usbhub.h SOURCE) +add_pch(usbhub usbhub.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/usb/usbport/CMakeLists.txt b/drivers/usb/usbport/CMakeLists.txt index 4598381a191..8af14de04b5 100644 --- a/drivers/usb/usbport/CMakeLists.txt +++ b/drivers/usb/usbport/CMakeLists.txt @@ -15,16 +15,18 @@ list(APPEND SOURCE trfsplit.c urb.c usb2.c - usbport.c - usbport.h) + usbport.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(usbport MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} usbport.rc ${CMAKE_CURRENT_BINARY_DIR}/usbport.def) -add_pch(usbport usbport.h SOURCE) +add_pch(usbport usbport.h "${PCH_SKIP_SOURCE}") set_module_type(usbport kernelmodedriver) add_importlibs(usbport ntoskrnl hal) add_cd_file(TARGET usbport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt index 567ee54dd14..eaaee54a62f 100644 --- a/drivers/usb/usbstor/CMakeLists.txt +++ b/drivers/usb/usbstor/CMakeLists.txt @@ -11,16 +11,18 @@ list(APPEND SOURCE queue.c error.c scsi.c - usbstor.c - usbstor.h) + usbstor.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(usbstor MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) -add_pch(usbstor usbstor.h SOURCE) +add_pch(usbstor usbstor.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all) add_driver_inf(usbstor usbstor.inf) diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index 60742e4626b..294b48c9f8c 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -46,12 +46,14 @@ list(APPEND SOURCE service_group.cpp undoc.cpp unregister.cpp - version.cpp - private.hpp) + version.cpp) + +list(APPEND PCH_SKIP_SOURCE + guid.cpp) add_library(portcls MODULE ${SOURCE} - guid.cpp + ${PCH_SKIP_SOURCE} portcls.rc ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) @@ -61,6 +63,6 @@ endif() target_link_libraries(portcls libcntpr ${PSEH_LIB}) set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) -add_pch(portcls private.hpp SOURCE) +add_pch(portcls private.hpp "${PCH_SKIP_SOURCE}") add_importlibs(portcls ntoskrnl ks drmk hal) add_cd_file(TARGET portcls DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index 29202ba0933..ba6cd3f9c4c 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -12,12 +12,14 @@ list(APPEND SOURCE adapter.cpp common.cpp mintopo.cpp - minwave.cpp - precomp.h) + minwave.cpp) + +list(APPEND PCH_SKIP_SOURCE + guid.cpp) add_library(cmipci MODULE ${SOURCE} - guid.cpp + ${PCH_SKIP_SOURCE} cmipci.rc) target_link_libraries(cmipci stdunk libcntpr uuid) @@ -28,7 +30,7 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(cmipci PRIVATE -Wno-write-strings -Wno-switch) endif() -add_pch(cmipci precomp.h SOURCE) +add_pch(cmipci precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) if(ARCH STREQUAL "i386") diff --git a/modules/rosapps/applications/explorer-old/CMakeLists.txt b/modules/rosapps/applications/explorer-old/CMakeLists.txt index 2123f18549e..ca824c486f2 100644 --- a/modules/rosapps/applications/explorer-old/CMakeLists.txt +++ b/modules/rosapps/applications/explorer-old/CMakeLists.txt @@ -39,23 +39,24 @@ list(APPEND SOURCE utility/utility.cpp utility/xmlstorage.cpp utility/window.cpp - utility/shellbrowserimpl.cpp - precomp.h) # utility/shelltests.cpp + utility/shellbrowserimpl.cpp) # utility/shelltests.cpp + +list(APPEND PCH_SKIP_SOURCE + services/startup.c) if(ARCH STREQUAL "i386") - list(APPEND I386_SOURCE i386-stub-win32.c) + list(APPEND PCH_SKIP_SOURCE i386-stub-win32.c) endif() add_executable(explorer_old ${SOURCE} - ${I386_SOURCE} - services/startup.c + ${PCH_SKIP_SOURCE} explorer.rc) target_link_libraries(explorer_old comsupp wine uuid) set_module_type(explorer_old win32gui UNICODE) add_importlibs(explorer_old advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) -add_pch(explorer_old precomp.h SOURCE) +add_pch(explorer_old precomp.h "${PCH_SKIP_SOURCE}") add_dependencies(explorer_old psdk) add_cd_file(TARGET explorer_old DESTINATION reactos FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all) diff --git a/modules/rostests/apitests/advapi32/CMakeLists.txt b/modules/rostests/apitests/advapi32/CMakeLists.txt index 8d7e56084c1..c5bccc3b0d0 100644 --- a/modules/rostests/apitests/advapi32/CMakeLists.txt +++ b/modules/rostests/apitests/advapi32/CMakeLists.txt @@ -17,12 +17,17 @@ list(APPEND SOURCE ServiceArgs.c ServiceEnv.c ServiceNetwork.c - svchlp.c - precomp.h) + svchlp.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(advapi32_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(advapi32_apitest ${SOURCE} testlist.c) target_link_libraries(advapi32_apitest wine ${PSEH_LIB}) set_module_type(advapi32_apitest win32cui) add_importlibs(advapi32_apitest advapi32 iphlpapi ws2_32 msvcrt kernel32 ntdll) -add_pch(advapi32_apitest precomp.h SOURCE) +add_pch(advapi32_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET advapi32_apitest) diff --git a/modules/rostests/apitests/afd/CMakeLists.txt b/modules/rostests/apitests/afd/CMakeLists.txt index d4b30b254c8..834f8e050cd 100644 --- a/modules/rostests/apitests/afd/CMakeLists.txt +++ b/modules/rostests/apitests/afd/CMakeLists.txt @@ -5,12 +5,17 @@ include_directories( list(APPEND SOURCE AfdHelpers.c send.c - windowsize.c - precomp.h) + windowsize.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(afd_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(afd_apitest ${SOURCE} testlist.c) target_link_libraries(afd_apitest wine) set_module_type(afd_apitest win32cui) add_importlibs(afd_apitest ws2_32 msvcrt kernel32 ntdll) -add_pch(afd_apitest precomp.h SOURCE) +add_pch(afd_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET afd_apitest) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index b3e12092ece..c0c3781defd 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -19,16 +19,18 @@ list(APPEND SOURCE CRegKey.cpp CSimpleArray.cpp CSimpleMap.cpp - CString.cpp - precomp.h) + CString.cpp) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(atl_apitest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} atl_apitest.rc) target_link_libraries(atl_apitest wine uuid) set_module_type(atl_apitest win32cui) add_importlibs(atl_apitest rpcrt4 ole32 oleaut32 msimg32 gdi32 advapi32 user32 msvcrt kernel32 ntdll) -add_pch(atl_apitest precomp.h SOURCE) +add_pch(atl_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET atl_apitest) diff --git a/modules/rostests/apitests/cmd/CMakeLists.txt b/modules/rostests/apitests/cmd/CMakeLists.txt index 5eae6ccdee6..00202dde809 100644 --- a/modules/rostests/apitests/cmd/CMakeLists.txt +++ b/modules/rostests/apitests/cmd/CMakeLists.txt @@ -1,11 +1,10 @@ list(APPEND SOURCE cmd.c - precomp.h) + testlist.c) -add_executable(cmd_apitest ${SOURCE} testlist.c) +add_executable(cmd_apitest ${SOURCE}) target_link_libraries(cmd_apitest wine ${PSEH_LIB}) set_module_type(cmd_apitest win32cui) add_importlibs(cmd_apitest msvcrt kernel32) -add_pch(cmd_apitest precomp.h SOURCE) add_rostests_file(TARGET cmd_apitest) diff --git a/modules/rostests/apitests/com/CMakeLists.txt b/modules/rostests/apitests/com/CMakeLists.txt index 73f0000b2cd..865e71c3c16 100644 --- a/modules/rostests/apitests/com/CMakeLists.txt +++ b/modules/rostests/apitests/com/CMakeLists.txt @@ -3,19 +3,24 @@ add_definitions(-DWINE_NO_UNICODE_MACROS) list(APPEND SOURCE browseui.c + com_apitest.c ieframe.c netcfgx.c netshell.c ole32.c shdocvw.c shell32.c - zipfldr.c - com_apitest.c - com_apitest.h) + zipfldr.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(com_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(com_apitest ${SOURCE} testlist.c) target_link_libraries(com_apitest wine uuid) set_module_type(com_apitest win32cui) add_importlibs(com_apitest advapi32 ole32 shlwapi shell32 msvcrt kernel32 ntdll) -add_pch(com_apitest com_apitest.h SOURCE) +add_pch(com_apitest com_apitest.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET com_apitest) diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt b/modules/rostests/apitests/gdi32/CMakeLists.txt index caa05d9a116..432e7e719f0 100644 --- a/modules/rostests/apitests/gdi32/CMakeLists.txt +++ b/modules/rostests/apitests/gdi32/CMakeLists.txt @@ -75,12 +75,18 @@ list(APPEND SOURCE SetWindowExtEx.c SetWorldTransform.c TextTransform.c - init.c - precomp.h) + init.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(gdi32_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE} + resource.rc) -add_executable(gdi32_apitest ${SOURCE} testlist.c resource.rc) target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) -add_pch(gdi32_apitest precomp.h SOURCE) +add_pch(gdi32_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET gdi32_apitest) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 52fcde5ed6d..9e0ca36563a 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -35,16 +35,22 @@ list(APPEND SOURCE SystemFirmware.c TerminateProcess.c TunnelCache.c - WideCharToMultiByte.c - precomp.h) + WideCharToMultiByte.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(kernel32_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE} + kernel32_apitest.rc) -add_executable(kernel32_apitest ${SOURCE} testlist.c kernel32_apitest.rc) target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) add_delay_importlibs(kernel32_apitest advapi32 shlwapi) add_importlibs(kernel32_apitest msvcrt kernel32 ntdll) add_dependencies(kernel32_apitest FormatMessage) -add_pch(kernel32_apitest precomp.h SOURCE) +add_pch(kernel32_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET kernel32_apitest) list(APPEND MANIFEST_FILES diff --git a/modules/rostests/apitests/mountmgr/CMakeLists.txt b/modules/rostests/apitests/mountmgr/CMakeLists.txt index 73317c628b6..4c499c26a98 100644 --- a/modules/rostests/apitests/mountmgr/CMakeLists.txt +++ b/modules/rostests/apitests/mountmgr/CMakeLists.txt @@ -1,11 +1,17 @@ list(APPEND SOURCE - QueryPoints.c - precomp.h) + QueryPoints.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(mountmgr_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(mountmgr_apitest ${SOURCE} testlist.c) target_link_libraries(mountmgr_apitest wine ${PSEH_LIB}) set_module_type(mountmgr_apitest win32cui) add_importlibs(mountmgr_apitest msvcrt kernel32 ntdll) -add_pch(mountmgr_apitest precomp.h SOURCE) +# TODO: Enable this when we get more than one source file to justify its use +#add_pch(mountmgr_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET mountmgr_apitest) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index a8a314ae62f..c92fa973588 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -75,24 +75,28 @@ list(APPEND SOURCE RtlValidateUnicodeString.c StackOverflow.c SystemInfo.c - Timer.c - precomp.h) + Timer.c) if(ARCH STREQUAL "i386") add_asm_files(ntdll_apitest_asm i386/NtContinue.S) endif() +list(APPEND PCH_SKIP_SOURCE + testlist.c) + add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/load_notifications/load_notifications.dll) + add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm} + ${PCH_SKIP_SOURCE} testdata.rc - ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def - testlist.c) + ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def) + target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) -add_pch(ntdll_apitest precomp.h SOURCE) +add_pch(ntdll_apitest precomp.h "${PCH_SKIP_SOURCE}") if(NOT MSVC) set_source_files_properties(RtlGetFullPathName_UstrEx.c PROPERTIES COMPILE_FLAGS "-Wno-format") diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 9bff4a9c09a..9f8cee6a20d 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -34,19 +34,21 @@ list(APPEND SOURCE ShellState.cpp SHLimitInputEdit.cpp menu.cpp - shelltest.cpp - shelltest.h) + shelltest.cpp) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(shell32_apitest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} resource.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def) target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) -add_pch(shell32_apitest shelltest.h SOURCE) +add_pch(shell32_apitest shelltest.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET shell32_apitest) # shell-notify.exe diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 3d632d0924d..896023291c8 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -46,14 +46,20 @@ list(APPEND SOURCE SystemParametersInfo.c TrackMouseEvent.c WndProc.c - wsprintf.c - precomp.h) + wsprintf.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(user32_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE} + user32_apitest.rc) -add_executable(user32_apitest ${SOURCE} testlist.c user32_apitest.rc) target_link_libraries(user32_apitest wine ${PSEH_LIB}) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest advapi32 gdi32 user32 msvcrt kernel32 ntdll) -add_pch(user32_apitest precomp.h SOURCE) +add_pch(user32_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET user32_apitest) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/verclasstest1.manifest") diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 35cd83eea1f..22db4f5cb7a 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -65,11 +65,14 @@ list(APPEND SOURCE ntuser/NtUserUpdatePerUserSystemParameters.c #osver.c - win32nt.h) + ) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(win32knt_apitest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} w32knapi.rc) target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools) @@ -84,5 +87,5 @@ add_importlibs(win32knt_apitest ntdll) add_delay_importlibs(win32knt_apitest win32u) add_dependencies(win32knt_apitest xdk) -add_pch(win32knt_apitest win32nt.h SOURCE) +add_pch(win32knt_apitest win32nt.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET win32knt_apitest) diff --git a/modules/rostests/apitests/ws2_32/CMakeLists.txt b/modules/rostests/apitests/ws2_32/CMakeLists.txt index d9ad4135c4a..088d7c632db 100644 --- a/modules/rostests/apitests/ws2_32/CMakeLists.txt +++ b/modules/rostests/apitests/ws2_32/CMakeLists.txt @@ -17,12 +17,17 @@ list(APPEND SOURCE WSAAsync.c WSAIoctl.c WSARecv.c - WSAStartup.c - ws2_32.h) + WSAStartup.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(ws2_32_apitest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(ws2_32_apitest ${SOURCE} testlist.c) target_link_libraries(ws2_32_apitest wine ${PSEH_LIB}) set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest advapi32 iphlpapi ws2_32 msvcrt kernel32 ntdll) -add_pch(ws2_32_apitest ws2_32.h SOURCE) +add_pch(ws2_32_apitest ws2_32.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET ws2_32_apitest) diff --git a/modules/rostests/apitests/zipfldr/CMakeLists.txt b/modules/rostests/apitests/zipfldr/CMakeLists.txt index a53bbfd1bfd..63da6889d71 100644 --- a/modules/rostests/apitests/zipfldr/CMakeLists.txt +++ b/modules/rostests/apitests/zipfldr/CMakeLists.txt @@ -7,17 +7,18 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE EnumObjects.cpp EnumParentDir.cpp - IDataObject.cpp - precomp.h - resource.h) + IDataObject.cpp) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(zipfldr_apitest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} zipfldr_apitest.rc) target_link_libraries(zipfldr_apitest wine uuid) set_module_type(zipfldr_apitest win32cui) add_importlibs(zipfldr_apitest shlwapi ole32 shell32 user32 msvcrt kernel32 ntdll) -add_pch(zipfldr_apitest precomp.h SOURCE) +add_pch(zipfldr_apitest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET zipfldr_apitest) diff --git a/modules/rostests/winetests/advapi32/CMakeLists.txt b/modules/rostests/winetests/advapi32/CMakeLists.txt index 5df0f3bf3f1..34a3055167b 100644 --- a/modules/rostests/winetests/advapi32/CMakeLists.txt +++ b/modules/rostests/winetests/advapi32/CMakeLists.txt @@ -12,10 +12,14 @@ list(APPEND SOURCE lsa.c registry.c security.c - service.c - precomp.h) + service.c) -add_executable(advapi32_winetest ${SOURCE} testlist.c) +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(advapi32_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(advapi32_winetest PRIVATE "-Wno-format") @@ -23,5 +27,5 @@ endif() set_module_type(advapi32_winetest win32cui) add_importlibs(advapi32_winetest advapi32 ole32 user32 msvcrt kernel32 ntdll) -add_pch(advapi32_winetest precomp.h SOURCE) +add_pch(advapi32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET advapi32_winetest) diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index 42d37d7b02c..ddc4caf0dc9 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -30,14 +30,16 @@ list(APPEND SOURCE tooltips.c trackbar.c treeview.c - updown.c - precomp.h) + updown.c) -add_executable(comctl32_winetest - ${SOURCE} +list(APPEND PCH_SKIP_SOURCE button.c subclass.c - testlist.c + testlist.c) + +add_executable(comctl32_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE} rsrc.rc) if(USE_CLANG_CL OR (NOT MSVC)) @@ -51,5 +53,5 @@ if(MSVC) add_importlibs(comctl32_winetest ntdll) endif() -add_pch(comctl32_winetest precomp.h SOURCE) +add_pch(comctl32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET comctl32_winetest) diff --git a/modules/rostests/winetests/comdlg32/CMakeLists.txt b/modules/rostests/winetests/comdlg32/CMakeLists.txt index 11afc77f499..05862e1588c 100644 --- a/modules/rostests/winetests/comdlg32/CMakeLists.txt +++ b/modules/rostests/winetests/comdlg32/CMakeLists.txt @@ -6,16 +6,18 @@ list(APPEND SOURCE finddlg.c fontdlg.c itemdlg.c - printdlg.c - precomp.h) + printdlg.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(comdlg32_winetest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} rsrc.rc) target_link_libraries(comdlg32_winetest uuid) set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 ole32 shell32 msvcrt kernel32) -add_pch(comdlg32_winetest precomp.h SOURCE) +add_pch(comdlg32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET comdlg32_winetest) diff --git a/modules/rostests/winetests/crypt32/CMakeLists.txt b/modules/rostests/winetests/crypt32/CMakeLists.txt index 169694b28d8..28c8b1f9fbc 100644 --- a/modules/rostests/winetests/crypt32/CMakeLists.txt +++ b/modules/rostests/winetests/crypt32/CMakeLists.txt @@ -16,11 +16,16 @@ list(APPEND SOURCE protectdata.c sip.c store.c - str.c - precomp.h) + str.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(crypt32_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(crypt32_winetest ${SOURCE} testlist.c) set_module_type(crypt32_winetest win32cui) add_importlibs(crypt32_winetest crypt32 advapi32 user32 shlwapi shell32 msvcrt kernel32) -add_pch(crypt32_winetest precomp.h SOURCE) +add_pch(crypt32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET crypt32_winetest) diff --git a/modules/rostests/winetests/dinput/CMakeLists.txt b/modules/rostests/winetests/dinput/CMakeLists.txt index 58bec04925c..c87ab98318e 100644 --- a/modules/rostests/winetests/dinput/CMakeLists.txt +++ b/modules/rostests/winetests/dinput/CMakeLists.txt @@ -6,12 +6,17 @@ list(APPEND SOURCE dinput.c joystick.c keyboard.c - mouse.c - precomp.h) + mouse.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(dinput_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(dinput_winetest ${SOURCE} testlist.c) target_link_libraries(dinput_winetest dinput_data_formats) set_module_type(dinput_winetest win32cui) add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32) -add_pch(dinput_winetest precomp.h SOURCE) +add_pch(dinput_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET dinput_winetest) diff --git a/modules/rostests/winetests/dinput8/CMakeLists.txt b/modules/rostests/winetests/dinput8/CMakeLists.txt index f1a3ad52997..b28d0f5280b 100644 --- a/modules/rostests/winetests/dinput8/CMakeLists.txt +++ b/modules/rostests/winetests/dinput8/CMakeLists.txt @@ -1,9 +1,19 @@ add_definitions(-DUSE_WINE_TODOS ) -list(APPEND SOURCE device.c dinput.c precomp.h) -add_executable(dinput8_winetest ${SOURCE} testlist.c) + +list(APPEND SOURCE + device.c + dinput.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(dinput8_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) + target_link_libraries(dinput8_winetest dinput_data_formats) set_module_type(dinput8_winetest win32cui) add_importlibs(dinput8_winetest dinput8 ole32 user32 advapi32 msvcrt kernel32) -add_pch(dinput8_winetest precomp.h SOURCE) +add_pch(dinput8_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET dinput8_winetest) diff --git a/modules/rostests/winetests/dsound/CMakeLists.txt b/modules/rostests/winetests/dsound/CMakeLists.txt index 2edf6f2376b..d90487ac0e3 100644 --- a/modules/rostests/winetests/dsound/CMakeLists.txt +++ b/modules/rostests/winetests/dsound/CMakeLists.txt @@ -6,12 +6,17 @@ list(APPEND SOURCE dsound8.c dsound.c duplex.c - propset.c - dsound_test.h) + propset.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(dsound_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(dsound_winetest ${SOURCE} testlist.c) target_link_libraries(dsound_winetest uuid dxguid) set_module_type(dsound_winetest win32cui) add_importlibs(dsound_winetest ole32 user32 msvcrt kernel32) -add_pch(dsound_winetest dsound_test.h SOURCE) +add_pch(dsound_winetest dsound_test.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET dsound_winetest) diff --git a/modules/rostests/winetests/gdi32/CMakeLists.txt b/modules/rostests/winetests/gdi32/CMakeLists.txt index b9a497434d2..89317137c9f 100644 --- a/modules/rostests/winetests/gdi32/CMakeLists.txt +++ b/modules/rostests/winetests/gdi32/CMakeLists.txt @@ -15,12 +15,14 @@ list(APPEND SOURCE metafile.c palette.c path.c - pen.c - precomp.h) + pen.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(gdi32_winetest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} resource.rc) set_module_type(gdi32_winetest win32cui) @@ -30,5 +32,5 @@ if(MSVC) add_importlibs(gdi32_winetest ntdll) endif() -add_pch(gdi32_winetest precomp.h SOURCE) +add_pch(gdi32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET gdi32_winetest) diff --git a/modules/rostests/winetests/gdiplus/CMakeLists.txt b/modules/rostests/winetests/gdiplus/CMakeLists.txt index 151f56629fb..73a04034472 100644 --- a/modules/rostests/winetests/gdiplus/CMakeLists.txt +++ b/modules/rostests/winetests/gdiplus/CMakeLists.txt @@ -18,16 +18,18 @@ list(APPEND SOURCE pathiterator.c pen.c region.c - stringformat.c - precomp.h) + stringformat.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + testlist.c) add_executable(gdiplus_winetest ${SOURCE} - guid.c - testlist.c + ${PCH_SKIP_SOURCE} resource.rc) set_module_type(gdiplus_winetest win32cui) add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32) -add_pch(gdiplus_winetest precomp.h SOURCE) +add_pch(gdiplus_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET gdiplus_winetest) diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index 1194e45989b..f61fe3cd9fb 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -40,12 +40,14 @@ list(APPEND SOURCE toolhelp.c version.c virtual.c - volume.c - precomp.h) + volume.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(kernel32_winetest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} resource.rc) if(USE_CLANG_CL OR (NOT MSVC)) @@ -54,5 +56,5 @@ endif() set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) -add_pch(kernel32_winetest precomp.h SOURCE) +add_pch(kernel32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET kernel32_winetest) diff --git a/modules/rostests/winetests/mshtml/CMakeLists.txt b/modules/rostests/winetests/mshtml/CMakeLists.txt index f744975c2f7..3c4646c4d4f 100644 --- a/modules/rostests/winetests/mshtml/CMakeLists.txt +++ b/modules/rostests/winetests/mshtml/CMakeLists.txt @@ -13,13 +13,15 @@ list(APPEND SOURCE protocol.c script.c style.c - xmlhttprequest.c - precomp.h) + xmlhttprequest.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + testlist.c) add_executable(mshtml_winetest ${SOURCE} - guid.c - testlist.c + ${PCH_SKIP_SOURCE} rsrc.rc) list(APPEND mshtml_winetest_rc_deps @@ -37,5 +39,5 @@ target_link_libraries(mshtml_winetest uuid strmiids) set_module_type(mshtml_winetest win32cui) add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32) add_dependencies(mshtml_winetest test_tlb_header stdole2) -add_pch(mshtml_winetest precomp.h SOURCE) +add_pch(mshtml_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET mshtml_winetest) diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 57bb6f310a3..279ed0b5e08 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -29,8 +29,10 @@ list(APPEND SOURCE patch.c record.c source.c - suminfo.c - precomp.h) + suminfo.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) if(NOT ${CMAKE_VERSION} VERSION_LESS "3.9.0") # CMake 3.9 and higher requires to specify this dependency manually @@ -38,10 +40,14 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.9.0") set_property(SOURCE msi_winetest.rc PROPERTY OBJECT_DEPENDS custom.dll) endif() -add_executable(msi_winetest ${SOURCE} testlist.c msi_winetest.rc) +add_executable(msi_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE} + msi_winetest.rc) + target_link_libraries(msi_winetest uuid) set_module_type(msi_winetest win32cui) add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32) -add_pch(msi_winetest precomp.h SOURCE) +add_pch(msi_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET msi_winetest) add_dependencies(msi_winetest custom) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index 90866735d1b..05a4cc555d9 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -22,10 +22,14 @@ list(APPEND SOURCE scanf.c signal.c string.c - time.c - precomp.h) + time.c) -add_executable(msvcrt_winetest ${SOURCE} testlist.c) +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(msvcrt_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(msvcrt_winetest PRIVATE "-Wno-format") @@ -39,5 +43,5 @@ if(MSVC) add_importlibs(msvcrt_winetest ntdll) endif() -add_pch(msvcrt_winetest precomp.h SOURCE) +add_pch(msvcrt_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET msvcrt_winetest) diff --git a/modules/rostests/winetests/msxml3/CMakeLists.txt b/modules/rostests/winetests/msxml3/CMakeLists.txt index 84c0d46c5e0..d7b0154f32f 100644 --- a/modules/rostests/winetests/msxml3/CMakeLists.txt +++ b/modules/rostests/winetests/msxml3/CMakeLists.txt @@ -10,13 +10,15 @@ list(APPEND SOURCE schema.c xmldoc.c xmlparser.c - xmlview.c - precomp.h) + xmlview.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c + testlist.c) add_executable(msxml3_winetest ${SOURCE} - guid.c - testlist.c + ${PCH_SKIP_SOURCE} rsrc.rc) add_idl_headers(xmlparser_idlheader_test xmlparser.idl) @@ -28,5 +30,5 @@ if(MSVC) add_importlibs(msxml3_winetest ntdll) endif() -add_pch(msxml3_winetest precomp.h SOURCE) +add_pch(msxml3_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET msxml3_winetest) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index 2262afe975d..21b6b7bdc97 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -21,8 +21,7 @@ list(APPEND SOURCE rtlbitmap.c rtlstr.c string.c - time.c - precomp.h) + time.c) if(ARCH STREQUAL "i386") list(APPEND SOURCE @@ -30,7 +29,12 @@ if(ARCH STREQUAL "i386") generated.c) endif() -add_executable(ntdll_winetest ${SOURCE} testlist.c) +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(ntdll_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(ntdll_winetest PRIVATE "-Wno-format") @@ -38,5 +42,5 @@ endif() set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll) -add_pch(ntdll_winetest precomp.h SOURCE) +add_pch(ntdll_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET ntdll_winetest) diff --git a/modules/rostests/winetests/ole32/CMakeLists.txt b/modules/rostests/winetests/ole32/CMakeLists.txt index 0cb4ec33123..0b54eae962e 100644 --- a/modules/rostests/winetests/ole32/CMakeLists.txt +++ b/modules/rostests/winetests/ole32/CMakeLists.txt @@ -15,10 +15,15 @@ list(APPEND SOURCE propvariant.c stg_prop.c storage32.c - usrmarshal.c - precomp.h) + usrmarshal.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(ole32_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(ole32_winetest ${SOURCE} testlist.c) target_link_libraries(ole32_winetest uuid) set_module_type(ole32_winetest win32cui) add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32) @@ -27,5 +32,5 @@ if(MSVC) add_importlibs(ole32_winetest ntdll) endif() -add_pch(ole32_winetest precomp.h SOURCE) +add_pch(ole32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET ole32_winetest) diff --git a/modules/rostests/winetests/oleaut32/CMakeLists.txt b/modules/rostests/winetests/oleaut32/CMakeLists.txt index 8605c4189d7..9351c512735 100644 --- a/modules/rostests/winetests/oleaut32/CMakeLists.txt +++ b/modules/rostests/winetests/oleaut32/CMakeLists.txt @@ -23,8 +23,10 @@ list(APPEND SOURCE vartype.c ${CMAKE_CURRENT_BINARY_DIR}/test_reg_i.c ${CMAKE_CURRENT_BINARY_DIR}/test_tlb_i.c - ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c - precomp.h) + ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) set(tmarshal.rc_DEPS ${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb @@ -32,7 +34,12 @@ set(tmarshal.rc_DEPS ${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb) set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS "${tmarshal.rc_DEPS}") -add_executable(oleaut32_winetest ${SOURCE} testlist.c tmarshal.rc) + +add_executable(oleaut32_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE} + tmarshal.rc) + target_link_libraries(oleaut32_winetest uuid) set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32) @@ -42,5 +49,5 @@ if(MSVC) endif() add_dependencies(oleaut32_winetest stdole2 oleaut32_idlheaders) -add_pch(oleaut32_winetest precomp.h SOURCE) +add_pch(oleaut32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET oleaut32_winetest) diff --git a/modules/rostests/winetests/shell32/CMakeLists.txt b/modules/rostests/winetests/shell32/CMakeLists.txt index 429f1bf3323..16b70d40abe 100644 --- a/modules/rostests/winetests/shell32/CMakeLists.txt +++ b/modules/rostests/winetests/shell32/CMakeLists.txt @@ -26,12 +26,14 @@ list(APPEND SOURCE shlfolder.c shlview.c string.c - systray.c - precomp.h) + systray.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(shell32_winetest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} rsrc.rc) target_link_libraries(shell32_winetest uuid) @@ -42,5 +44,5 @@ if(MSVC) add_importlibs(shell32_winetest ntdll) endif() -add_pch(shell32_winetest precomp.h SOURCE) +add_pch(shell32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET shell32_winetest) diff --git a/modules/rostests/winetests/shlwapi/CMakeLists.txt b/modules/rostests/winetests/shlwapi/CMakeLists.txt index 276e202d6f1..7676251d4e7 100644 --- a/modules/rostests/winetests/shlwapi/CMakeLists.txt +++ b/modules/rostests/winetests/shlwapi/CMakeLists.txt @@ -14,10 +14,15 @@ list(APPEND SOURCE shreg.c string.c thread.c - url.c - precomp.h) + url.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) + +add_executable(shlwapi_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_executable(shlwapi_winetest ${SOURCE} testlist.c) target_link_libraries(shlwapi_winetest uuid) set_module_type(shlwapi_winetest win32cui) add_importlibs(shlwapi_winetest shlwapi shell32 mlang oleaut32 ole32 user32 advapi32 msvcrt kernel32) @@ -26,5 +31,5 @@ if(MSVC) add_importlibs(shlwapi_winetest ntdll) endif() -add_pch(shlwapi_winetest precomp.h SOURCE) +add_pch(shlwapi_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET shlwapi_winetest) diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index 4bd525338c4..331418d21a3 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -34,15 +34,17 @@ list(APPEND SOURCE uitools.c win.c winstation.c - wsprintf.c - precomp.h) + wsprintf.c) + +list(APPEND PCH_SKIP_SOURCE + testlist.c) add_executable(user32_winetest ${SOURCE} - testlist.c + ${PCH_SKIP_SOURCE} resource.rc) -add_pch(user32_winetest precomp.h SOURCE) +add_pch(user32_winetest precomp.h "${PCH_SKIP_SOURCE}") # some tests need to be run from an app compiled as GUI set_module_type(user32_winetest win32gui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32) diff --git a/modules/rostests/winetests/windowscodecs/CMakeLists.txt b/modules/rostests/winetests/windowscodecs/CMakeLists.txt index 6bae33b8912..418181b1b23 100644 --- a/modules/rostests/winetests/windowscodecs/CMakeLists.txt +++ b/modules/rostests/winetests/windowscodecs/CMakeLists.txt @@ -16,14 +16,16 @@ list(APPEND SOURCE pngformat.c propertybag.c stream.c - tiffformat.c - precomp.h) + tiffformat.c) -add_executable(windowscodecs_winetest - ${SOURCE} +list(APPEND PCH_SKIP_SOURCE guid.c testlist.c) +add_executable(windowscodecs_winetest + ${SOURCE} + ${PCH_SKIP_SOURCE}) + set_module_type(windowscodecs_winetest win32cui) add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 propsys user32 gdi32 shlwapi msvcrt kernel32) @@ -31,5 +33,5 @@ if(MSVC) add_importlibs(windowscodecs_winetest ntdll) endif() -add_pch(windowscodecs_winetest precomp.h SOURCE) +add_pch(windowscodecs_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET windowscodecs_winetest) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 9a003de5788..57a387ffa23 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -12,10 +12,13 @@ set(NTKRNLMP_ASM_SOURCE ${ASM_SOURCE}) spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE}) +list(APPEND PCH_SKIP_SOURCE + guid.c) + add_executable(ntoskrnl ${ntoskrnl_asm} ${NTOSKRNL_SOURCE} - guid.c + ${PCH_SKIP_SOURCE} ntoskrnl.rc ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) set_property(TARGET ntoskrnl PROPERTY ENABLE_EXPORTS TRUE) @@ -52,7 +55,7 @@ elseif(RUNTIME_CHECKS) endif() add_importlibs(ntoskrnl hal kdcom bootvid) -add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTOSKRNL_SOURCE) +add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${PCH_SKIP_SOURCE}") add_dependencies(ntoskrnl psdk bugcodes asm) add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) diff --git a/ntoskrnl/ntkrnlmp/CMakeLists.txt b/ntoskrnl/ntkrnlmp/CMakeLists.txt index 0c6e0a8edc3..7f8ff100556 100644 --- a/ntoskrnl/ntkrnlmp/CMakeLists.txt +++ b/ntoskrnl/ntkrnlmp/CMakeLists.txt @@ -10,10 +10,13 @@ endif() add_asm_files(ntkrnlmp_asm ${NTKRNLMP_ASM_SOURCE}) +list(APPEND NTKRNLMP_PCH_SKIP_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/guid.c) + add_executable(ntkrnlmp ${ntkrnlmp_asm} ${NTKRNLMP_SOURCE} - ${REACTOS_SOURCE_DIR}/ntoskrnl/guid.c + ${NTKRNLMP_PCH_SKIP_SOURCE} ${REACTOS_SOURCE_DIR}/ntoskrnl/ntoskrnl.rc ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def) set_property(TARGET ntkrnlmp PROPERTY ENABLE_EXPORTS TRUE) @@ -45,6 +48,6 @@ endif() target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) add_importlibs(ntkrnlmp hal kdcom bootvid) -add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTKRNLMP_SOURCE) +add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${NTKRNLMP_PCH_SKIP_SOURCE}") add_dependencies(ntkrnlmp psdk bugcodes asm) add_cd_file(TARGET ntkrnlmp DESTINATION reactos/system32 NO_CAB FOR all) diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 7cc68d8ac06..b2224bed4c7 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -41,7 +41,6 @@ else() endif() list(APPEND SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/io.c ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/data.c ${REACTOS_SOURCE_DIR}/ntoskrnl/cache/section/fault.c diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 51ec82d904e..a9216ee5576 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -974,3 +974,13 @@ function(add_rostests_file) endif() endif() endfunction() + +if(PCH) + macro(add_pch _target _pch _skip_list) + target_precompile_headers(${_target} PRIVATE ${_pch}) + set_source_files_properties(${_skip_list} PROPERTIES SKIP_PRECOMPILE_HEADERS ON) + endmacro() +else() + macro(add_pch _target _pch _skip_list) + endmacro() +endif() diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index fa04065b851..b48803c7529 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -419,41 +419,6 @@ endmacro() # PSEH lib, needed with mingw set(PSEH_LIB "pseh") -# Macros -if(PCH AND (NOT ENABLE_CCACHE) AND (NOT CMAKE_HOST_APPLE)) - add_compile_flags("-Winvalid-pch -Werror=invalid-pch") - macro(add_pch _target _pch _sources) - # When including x.h GCC looks for x.h.gch first - set(_pch_final_name "${_target}_pch.h") - set(_gch ${CMAKE_CURRENT_BINARY_DIR}/${_pch_final_name}.gch) - - if(IS_CPP) - set(_pch_language CXX) - else() - set(_pch_language C) - endif() - - # Build the precompiled header - # HEADER_FILE_ONLY FALSE: force compiling the header - # EXTERNAL_SOURCE TRUE: don't use the .gch file when linking - set_source_files_properties(${_pch} PROPERTIES - HEADER_FILE_ONLY FALSE - LANGUAGE ${_pch_language} - EXTERNAL_SOURCE TRUE - OBJECT_LOCATION ${_gch}) - - # Include the gch in the specified source files, skipping the pch file itself - list(REMOVE_ITEM ${_sources} ${_pch}) - foreach(_src ${${_sources}}) - set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_ccache_flag} -include ${CMAKE_CURRENT_BINARY_DIR}/${_pch_final_name}") - set_property(SOURCE ${_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch}) - endforeach() - endmacro() -else() - macro(add_pch _target _pch _sources) - endmacro() -endif() - function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_address) set(_object_file ${_binary_file}.o) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 4e4e0478d59..4bfa2f81952 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -233,63 +233,6 @@ set(CMAKE_RC_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE}) set(CMAKE_ASM_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) -if(PCH) - macro(add_pch _target _pch _sources) - - # Workaround for the MSVC toolchain (MSBUILD) /MP bug - set(_temp_gch ${CMAKE_CURRENT_BINARY_DIR}/${_target}.pch) - if(MSVC_IDE) - file(TO_NATIVE_PATH ${_temp_gch} _gch) - else() - set(_gch ${_temp_gch}) - endif() - - if(IS_CPP) - set(_pch_language CXX) - if(NOT USE_CLANG_CL) - set(_cl_lang_flag "/TP") - endif() - else() - set(_pch_language C) - set(_cl_lang_flag "/TC") - endif() - - if(MSVC_IDE) - set(_pch_path_name_flag "/Fp${_gch}") - endif() - - if(USE_CLANG_CL) - set(_pch_compile_flags "${_cl_lang_flag} /Yc${_pch} /FI${_pch} /Fp${_gch}") - else() - set(_pch_compile_flags "${_cl_lang_flag} /Yc /Fp${_gch}") - endif() - - # Build the precompiled header - # HEADER_FILE_ONLY FALSE: force compiling the header - set_source_files_properties(${_pch} PROPERTIES - HEADER_FILE_ONLY FALSE - LANGUAGE ${_pch_language} - COMPILE_FLAGS ${_pch_compile_flags} - OBJECT_OUTPUTS ${_gch}) - - # Prevent a race condition related to writing to the PDB files between the PCH and the excluded list of source files - get_target_property(_target_sources ${_target} SOURCES) - list(REMOVE_ITEM _target_sources ${_pch}) - foreach(_target_src ${_target_sources}) - set_property(SOURCE ${_target_src} APPEND PROPERTY OBJECT_DEPENDS ${_gch}) - endforeach() - - # Use the precompiled header with the specified source files, skipping the pch itself - list(REMOVE_ITEM ${_sources} ${_pch}) - foreach(_src ${${_sources}}) - set_property(SOURCE ${_src} APPEND_STRING PROPERTY COMPILE_FLAGS " /FI${_gch} /Yu${_gch} ${_pch_path_name_flag}") - endforeach() - endmacro() -else() - macro(add_pch _target _pch _sources) - endmacro() -endif() - function(set_entrypoint _module _entrypoint) if(${_entrypoint} STREQUAL "0") add_target_link_flags(${_module} "/NOENTRY") diff --git a/sdk/lib/3rdparty/libmpg123/CMakeLists.txt b/sdk/lib/3rdparty/libmpg123/CMakeLists.txt index 867e9286910..e14a3dfa2f3 100644 --- a/sdk/lib/3rdparty/libmpg123/CMakeLists.txt +++ b/sdk/lib/3rdparty/libmpg123/CMakeLists.txt @@ -39,9 +39,14 @@ list(APPEND SOURCE synth_8bit.c synth_real.c synth_s32.c - tabinit.c - precomp.h) + tabinit.c) + +list(APPEND PCH_SKIP_SOURCE + optimize.c) + +add_library(libmpg123 + ${SOURCE} + ${PCH_SKIP_SOURCE}) -add_library(libmpg123 ${SOURCE} optimize.c) add_dependencies(libmpg123 psdk) -add_pch(libmpg123 precomp.h SOURCE) +add_pch(libmpg123 precomp.h "${PCH_SKIP_SOURCE}") diff --git a/win32ss/drivers/font/ftfd/CMakeLists.txt b/win32ss/drivers/font/ftfd/CMakeLists.txt index 2a5c1959e1e..442dad57d69 100644 --- a/win32ss/drivers/font/ftfd/CMakeLists.txt +++ b/win32ss/drivers/font/ftfd/CMakeLists.txt @@ -6,18 +6,20 @@ list(APPEND SOURCE enable.c font.c glyph.c - rosglue.c - ftfd.h) + rosglue.c) + +list(APPEND PCH_SKIP_SOURCE + sprintf.c) add_library(ftfd MODULE ${SOURCE} - sprintf.c + ${PCH_SKIP_SOURCE} freetype.rc ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) set_module_type(ftfd kerneldll ENTRYPOINT FtfdEnableDriver 12) target_link_libraries(ftfd freetype libcntpr) -add_pch(ftfd ftfd.h SOURCE) +add_pch(ftfd ftfd.h "${PCH_SKIP_SOURCE}") add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cd_file(TARGET ftfd DESTINATION reactos/system32 FOR all) diff --git a/win32ss/drivers/videoprt/CMakeLists.txt b/win32ss/drivers/videoprt/CMakeLists.txt index be116547d59..6f652c9ccff 100644 --- a/win32ss/drivers/videoprt/CMakeLists.txt +++ b/win32ss/drivers/videoprt/CMakeLists.txt @@ -19,17 +19,19 @@ list(APPEND SOURCE spinlock.c stubs.c timer.c - videoprt.c - videoprt.h) + videoprt.c) + +list(APPEND PCH_SKIP_SOURCE + guid.c) add_library(videoprt MODULE ${SOURCE} - guid.c + ${PCH_SKIP_SOURCE} videoprt.rc ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def) set_module_type(videoprt kernelmodedriver) target_link_libraries(videoprt ${PSEH_LIB}) add_importlibs(videoprt ntoskrnl hal) -add_pch(videoprt videoprt.h SOURCE) +add_pch(videoprt videoprt.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET videoprt DESTINATION reactos/system32/drivers FOR all) diff --git a/win32ss/printing/base/spoolss/CMakeLists.txt b/win32ss/printing/base/spoolss/CMakeLists.txt index 47084f6d588..e6c02eab86d 100644 --- a/win32ss/printing/base/spoolss/CMakeLists.txt +++ b/win32ss/printing/base/spoolss/CMakeLists.txt @@ -9,20 +9,22 @@ list(APPEND SOURCE memory.c monitors.c ports.c - precomp.h printerdata.c printers.c printprocessors.c tools.c) +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c) + add_library(spoolss MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} spoolss.rc - ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def) set_module_type(spoolss win32dll UNICODE) target_link_libraries(spoolss wine) add_importlibs(spoolss advapi32 msvcrt kernel32 ntdll) -add_pch(spoolss precomp.h SOURCE) +add_pch(spoolss precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all) diff --git a/win32ss/printing/base/winspool/CMakeLists.txt b/win32ss/printing/base/winspool/CMakeLists.txt index 34c30263522..b557db8d0df 100644 --- a/win32ss/printing/base/winspool/CMakeLists.txt +++ b/win32ss/printing/base/winspool/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND SOURCE main.c monitors.c ports.c - precomp.h printerdata.c printerdrivers.c printers.c @@ -20,15 +19,18 @@ list(APPEND SOURCE utils.c ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c) +list(APPEND PCH_SKIP_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c) + add_library(winspool MODULE ${SOURCE} + ${PCH_SKIP_SOURCE} winspool.rc - ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll UNICODE) target_link_libraries(winspool wine ${PSEH_LIB}) add_importlibs(winspool advapi32 gdi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(winspool precomp.h SOURCE) +add_pch(winspool precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all)

4 years, 6 months

[reactos] 01/01: [HHPCOMP] Fix 2 MSVC C4101 warnings (#2392)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cd7b3a3df41e1d5fda72… commit 4cd7b3a3df41e1d5fda7296b53e62db44d03a9a4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 6 18:42:47 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 18:42:47 2020 +0200 [HHPCOMP] Fix 2 MSVC C4101 warnings (#2392) "...\chmc\chmc.c(671): warning C4101: 'code': unreferenced local variable" "...\chmc\chmc.c(671): warning C4101: 'len': unreferenced local variable" --- sdk/tools/hhpcomp/CMakeLists.txt | 3 --- sdk/tools/hhpcomp/chmc/chmc.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/tools/hhpcomp/CMakeLists.txt b/sdk/tools/hhpcomp/CMakeLists.txt index 50fd03c94ef..a3f7e9d749a 100644 --- a/sdk/tools/hhpcomp/CMakeLists.txt +++ b/sdk/tools/hhpcomp/CMakeLists.txt @@ -16,9 +16,6 @@ add_executable(hhpcomp ${SOURCE}) target_link_libraries(hhpcomp) if(MSVC) - # Disable warning "'x': unreferenced local variable" - target_compile_options(hhpcomp PRIVATE "/wd4101") - # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" target_compile_options(hhpcomp PRIVATE "/wd4244") endif() diff --git a/sdk/tools/hhpcomp/chmc/chmc.c b/sdk/tools/hhpcomp/chmc/chmc.c index f96ff11673e..9c0e0217d80 100644 --- a/sdk/tools/hhpcomp/chmc/chmc.c +++ b/sdk/tools/hhpcomp/chmc/chmc.c @@ -668,7 +668,9 @@ int chmc_system_done(struct chmcFile *chm) sysp = malloc(16384); if (sysp) { UInt32 val; +#ifndef __REACTOS__ UInt16 code, len; +#endif const char *entry_val; p = chmc_syscat_mem(sysp, &system->version, sizeof(system->version));

4 years, 6 months

[reactos] 01/01: [SHLWAPI] lang/*.rc : Enforce aa-BB filenames (#2816)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abe1dd31c4af013ab961b… commit abe1dd31c4af013ab961b116aa805a1bd9731a92 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 6 18:25:43 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 18:25:43 2020 +0200 [SHLWAPI] lang/*.rc : Enforce aa-BB filenames (#2816) --- dll/win32/shlwapi/lang/{shlwapi_Da.rc => da-DK.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_De.rc => de-DE.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_En.rc => en-US.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Es.rc => es-ES.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Fi.rc => fi-FI.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Fr.rc => fr-FR.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_He.rc => he-IL.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Hu.rc => hu-HU.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_It.rc => it-IT.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Ja.rc => ja-JP.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Ko.rc => ko-KR.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Lt.rc => lt-LT.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Nl.rc => nl-NL.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_No.rc => no-NO.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Pl.rc => pl-PL.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Pt.rc => pt-PT.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Ro.rc => ro-RO.rc} | 2 + dll/win32/shlwapi/lang/{shlwapi_Ru.rc => ru-RU.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Sk.rc => sk-SK.rc} | 3 +- dll/win32/shlwapi/lang/{shlwapi_Si.rc => sl-SI.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Sq.rc => sq-AL.rc} | 2 +- dll/win32/shlwapi/lang/{shlwapi_Sv.rc => sv-SE.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Tr.rc => tr-TR.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Uk.rc => uk-UA.rc} | 0 dll/win32/shlwapi/lang/{shlwapi_Zh.rc => zh-CN.rc} | 2 +- dll/win32/shlwapi/shlwapi.rc | 50 +++++++++++----------- 26 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dll/win32/shlwapi/lang/shlwapi_Da.rc b/dll/win32/shlwapi/lang/da-DK.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Da.rc rename to dll/win32/shlwapi/lang/da-DK.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_De.rc b/dll/win32/shlwapi/lang/de-DE.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_De.rc rename to dll/win32/shlwapi/lang/de-DE.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_En.rc b/dll/win32/shlwapi/lang/en-US.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_En.rc rename to dll/win32/shlwapi/lang/en-US.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Es.rc b/dll/win32/shlwapi/lang/es-ES.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Es.rc rename to dll/win32/shlwapi/lang/es-ES.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Fi.rc b/dll/win32/shlwapi/lang/fi-FI.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Fi.rc rename to dll/win32/shlwapi/lang/fi-FI.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Fr.rc b/dll/win32/shlwapi/lang/fr-FR.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Fr.rc rename to dll/win32/shlwapi/lang/fr-FR.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_He.rc b/dll/win32/shlwapi/lang/he-IL.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_He.rc rename to dll/win32/shlwapi/lang/he-IL.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Hu.rc b/dll/win32/shlwapi/lang/hu-HU.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Hu.rc rename to dll/win32/shlwapi/lang/hu-HU.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_It.rc b/dll/win32/shlwapi/lang/it-IT.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_It.rc rename to dll/win32/shlwapi/lang/it-IT.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Ja.rc b/dll/win32/shlwapi/lang/ja-JP.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Ja.rc rename to dll/win32/shlwapi/lang/ja-JP.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Ko.rc b/dll/win32/shlwapi/lang/ko-KR.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Ko.rc rename to dll/win32/shlwapi/lang/ko-KR.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Lt.rc b/dll/win32/shlwapi/lang/lt-LT.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Lt.rc rename to dll/win32/shlwapi/lang/lt-LT.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Nl.rc b/dll/win32/shlwapi/lang/nl-NL.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Nl.rc rename to dll/win32/shlwapi/lang/nl-NL.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_No.rc b/dll/win32/shlwapi/lang/no-NO.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_No.rc rename to dll/win32/shlwapi/lang/no-NO.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Pl.rc b/dll/win32/shlwapi/lang/pl-PL.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Pl.rc rename to dll/win32/shlwapi/lang/pl-PL.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Pt.rc b/dll/win32/shlwapi/lang/pt-PT.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Pt.rc rename to dll/win32/shlwapi/lang/pt-PT.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Ro.rc b/dll/win32/shlwapi/lang/ro-RO.rc similarity index 97% rename from dll/win32/shlwapi/lang/shlwapi_Ro.rc rename to dll/win32/shlwapi/lang/ro-RO.rc index 7772925c0f4..1c1ee5bd99d 100644 --- a/dll/win32/shlwapi/lang/shlwapi_Ro.rc +++ b/dll/win32/shlwapi/lang/ro-RO.rc @@ -1,4 +1,6 @@ /* + * Romanian resources for shlwapi + * * Copyright 2004 Jon Griffiths * Copyright 2008 Michael Stefaniuc * 2011 Ștefan Fulea diff --git a/dll/win32/shlwapi/lang/shlwapi_Ru.rc b/dll/win32/shlwapi/lang/ru-RU.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Ru.rc rename to dll/win32/shlwapi/lang/ru-RU.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Sk.rc b/dll/win32/shlwapi/lang/sk-SK.rc similarity index 97% rename from dll/win32/shlwapi/lang/shlwapi_Sk.rc rename to dll/win32/shlwapi/lang/sk-SK.rc index 5932ce78ab3..98c3162d4d7 100644 --- a/dll/win32/shlwapi/lang/shlwapi_Sk.rc +++ b/dll/win32/shlwapi/lang/sk-SK.rc @@ -1,4 +1,5 @@ -/* Slovak translation for shlwapi +/* + * Slovak resources for shlwapi * * Copyright 2004 Jon Griffiths * Copyright 2008 Mário Kačmár (Mario Kacmar) diff --git a/dll/win32/shlwapi/lang/shlwapi_Si.rc b/dll/win32/shlwapi/lang/sl-SI.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Si.rc rename to dll/win32/shlwapi/lang/sl-SI.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Sq.rc b/dll/win32/shlwapi/lang/sq-AL.rc similarity index 97% rename from dll/win32/shlwapi/lang/shlwapi_Sq.rc rename to dll/win32/shlwapi/lang/sq-AL.rc index ccce072b5ec..17769093457 100644 --- a/dll/win32/shlwapi/lang/shlwapi_Sq.rc +++ b/dll/win32/shlwapi/lang/sq-AL.rc @@ -1,5 +1,5 @@ /* - * English resources for shlwapi + * Albanian resources for shlwapi * * Copyright 2004 Jon Griffiths * diff --git a/dll/win32/shlwapi/lang/shlwapi_Sv.rc b/dll/win32/shlwapi/lang/sv-SE.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Sv.rc rename to dll/win32/shlwapi/lang/sv-SE.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Tr.rc b/dll/win32/shlwapi/lang/tr-TR.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Tr.rc rename to dll/win32/shlwapi/lang/tr-TR.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Uk.rc b/dll/win32/shlwapi/lang/uk-UA.rc similarity index 100% rename from dll/win32/shlwapi/lang/shlwapi_Uk.rc rename to dll/win32/shlwapi/lang/uk-UA.rc diff --git a/dll/win32/shlwapi/lang/shlwapi_Zh.rc b/dll/win32/shlwapi/lang/zh-CN.rc similarity index 97% rename from dll/win32/shlwapi/lang/shlwapi_Zh.rc rename to dll/win32/shlwapi/lang/zh-CN.rc index 537aba48a30..34891f30162 100644 --- a/dll/win32/shlwapi/lang/shlwapi_Zh.rc +++ b/dll/win32/shlwapi/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* - * shlwapi (Simplified and Traditional Chinese Resources) + * Simplified and Traditional Chinese resources for shlwapi * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * diff --git a/dll/win32/shlwapi/shlwapi.rc b/dll/win32/shlwapi/shlwapi.rc index aff87741aaa..c7dfe797523 100644 --- a/dll/win32/shlwapi/shlwapi.rc +++ b/dll/win32/shlwapi/shlwapi.rc @@ -30,77 +30,77 @@ #pragma code_page(65001) #ifdef LANGUAGE_DA_DK - #include "lang/shlwapi_Da.rc" + #include "lang/da-DK.rc" #endif #ifdef LANGUAGE_DE_DE - #include "lang/shlwapi_De.rc" + #include "lang/de-DE.rc" #endif #ifdef LANGUAGE_EN_US - #include "lang/shlwapi_En.rc" + #include "lang/en-US.rc" #endif #ifdef LANGUAGE_ES_ES - #include "lang/shlwapi_Es.rc" + #include "lang/es-ES.rc" #endif #ifdef LANGUAGE_FI_FI - #include "lang/shlwapi_Fi.rc" + #include "lang/fi-FI.rc" #endif #ifdef LANGUAGE_FR_FR - #include "lang/shlwapi_Fr.rc" + #include "lang/fr-FR.rc" #endif #ifdef LANGUAGE_HE_IL - #include "lang/shlwapi_He.rc" + #include "lang/he-IL.rc" #endif #ifdef LANGUAGE_HU_HU - #include "lang/shlwapi_Hu.rc" + #include "lang/hu-HU.rc" #endif #ifdef LANGUAGE_IT_IT - #include "lang/shlwapi_It.rc" + #include "lang/it-IT.rc" #endif #ifdef LANGUAGE_JA_JP - #include "lang/shlwapi_Ja.rc" + #include "lang/ja-JP.rc" #endif #ifdef LANGUAGE_KO_KR - #include "lang/shlwapi_Ko.rc" + #include "lang/ko-KR.rc" #endif #ifdef LANGUAGE_LT_LT - #include "lang/shlwapi_Lt.rc" + #include "lang/lt-LT.rc" #endif #ifdef LANGUAGE_NL_NL - #include "lang/shlwapi_Nl.rc" + #include "lang/nl-NL.rc" #endif #ifdef LANGUAGE_NO_NO - #include "lang/shlwapi_No.rc" + #include "lang/no-NO.rc" #endif #ifdef LANGUAGE_PL_PL - #include "lang/shlwapi_Pl.rc" + #include "lang/pl-PL.rc" #endif #ifdef LANGUAGE_PT_PT - #include "lang/shlwapi_Pt.rc" + #include "lang/pt-PT.rc" #endif #ifdef LANGUAGE_RO_RO - #include "lang/shlwapi_Ro.rc" + #include "lang/ro-RO.rc" #endif #ifdef LANGUAGE_RU_RU - #include "lang/shlwapi_Ru.rc" + #include "lang/ru-RU.rc" #endif #ifdef LANGUAGE_SK_SK - #include "lang/shlwapi_Sk.rc" + #include "lang/sk-SK.rc" #endif #ifdef LANGUAGE_SL_SI - #include "lang/shlwapi_Si.rc" + #include "lang/sl-SI.rc" #endif #ifdef LANGUAGE_SQ_AL - #include "lang/shlwapi_Sq.rc" + #include "lang/sq-AL.rc" #endif #ifdef LANGUAGE_SV_SE - #include "lang/shlwapi_Sv.rc" + #include "lang/sv-SE.rc" #endif #ifdef LANGUAGE_TR_TR - #include "lang/shlwapi_Tr.rc" + #include "lang/tr-TR.rc" #endif #ifdef LANGUAGE_UK_UA - #include "lang/shlwapi_Uk.rc" + #include "lang/uk-UA.rc" #endif #ifdef LANGUAGE_ZH_CN - #include "lang/shlwapi_Zh.rc" + #include "lang/zh-CN.rc" #endif

4 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020