Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [USER32] Fix GetWindowTextLength() blocking call using the same technique as in GetWindowText(). Fix indentation in GetWindowText().
by Hermès Bélusca-Maïto 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68430db4622d6920be154… commit 68430db4622d6920be15484108f0c75e43c6b86a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 17 23:45:40 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 17 23:47:16 2018 +0100 [USER32] Fix GetWindowTextLength() blocking call using the same technique as in GetWindowText(). Fix indentation in GetWindowText(). --- win32ss/user/user32/windows/window.c | 78 +++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 388ef25bb1..c95b8dfbcc 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1306,20 +1306,22 @@ GetWindowTextA(HWND hWnd, LPSTR lpString, int nMaxCount) lpString[0] = '\0'; - if (!TestWindowProcess( Wnd)) + if (!TestWindowProcess(Wnd)) { - _SEH2_TRY - { - Length = DefWindowProcA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Length = 0; - } - _SEH2_END; + _SEH2_TRY + { + Length = DefWindowProcA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Length = 0; + } + _SEH2_END; } else - Length = SendMessageA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + { + Length = SendMessageA(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + } //ERR("GWTA Len %d : %s\n",Length,lpString); return Length; } @@ -1330,7 +1332,20 @@ GetWindowTextA(HWND hWnd, LPSTR lpString, int nMaxCount) int WINAPI GetWindowTextLengthA(HWND hWnd) { - return(SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0)); + PWND Wnd; + + Wnd = ValidateHwnd(hWnd); + if (!Wnd) + return 0; + + if (!TestWindowProcess(Wnd)) + { + return DefWindowProcA(hWnd, WM_GETTEXTLENGTH, 0, 0); + } + else + { + return SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + } } /* @@ -1339,7 +1354,20 @@ GetWindowTextLengthA(HWND hWnd) int WINAPI GetWindowTextLengthW(HWND hWnd) { - return(SendMessageW(hWnd, WM_GETTEXTLENGTH, 0, 0)); + PWND Wnd; + + Wnd = ValidateHwnd(hWnd); + if (!Wnd) + return 0; + + if (!TestWindowProcess(Wnd)) + { + return DefWindowProcW(hWnd, WM_GETTEXTLENGTH, 0, 0); + } + else + { + return SendMessageW(hWnd, WM_GETTEXTLENGTH, 0, 0); + } } /* @@ -1360,20 +1388,22 @@ GetWindowTextW(HWND hWnd, LPWSTR lpString, int nMaxCount) lpString[0] = L'\0'; - if (!TestWindowProcess( Wnd)) + if (!TestWindowProcess(Wnd)) { - _SEH2_TRY - { - Length = DefWindowProcW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Length = 0; - } - _SEH2_END; + _SEH2_TRY + { + Length = DefWindowProcW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Length = 0; + } + _SEH2_END; } else - Length = SendMessageW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + { + Length = SendMessageW(hWnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString); + } //ERR("GWTW Len %d : %S\n",Length,lpString); return Length; }

1 0

01/01: Update German translation (#438)
by Robert Naumann 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69acbe905af9bdbf4cdb9… commit 69acbe905af9bdbf4cdb9fbac72a093d9ec3b6e6 Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Sat Mar 17 22:48:16 2018 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 17 22:48:16 2018 +0100 Update German translation (#438) * [BROWSEUI] Update German translation * [SHELL32] Update German translation * [COMCTL32] Update German translation * [COMDLG32] Update German Translation * [SETUPAPI] Update German translation * [EXPLORER] Update German translation --- base/shell/explorer/lang/de-DE.rc | 12 ++++++------ dll/win32/browseui/lang/de-DE.rc | 22 +++++++++++----------- dll/win32/comctl32/lang/comctl_De.rc | 10 +++++----- dll/win32/comdlg32/lang/cdlg_De.rc | 4 ++-- dll/win32/setupapi/lang/de-DE.rc | 18 +++++++++--------- dll/win32/shell32/lang/de-DE.rc | 30 +++++++++++++++--------------- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index a9adca299c..a52652d76e 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -77,7 +77,7 @@ BEGIN GROUPBOX "Benachrichtigungsfeld", IDC_STATIC, 6, 114, 240, 98 CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 AUTOCHECKBOX "&Uhr Anzeigen", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 - AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED + AUTOCHECKBOX "Sekunden Anzeigen", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED LTEXT "Das Benachrichtigungsfeld kann übersichtlich gestaltet werden, indem selten verwendete Symbole ausgeblendet werden.", IDC_STATIC, 13, 169, 223, 16 AUTOCHECKBOX "&Inaktive Symbole ausblenden", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 PUSHBUTTON "An&passen...", IDC_TASKBARPROP_ICONCUST, 188, 191, 50, 14 @@ -135,15 +135,15 @@ FONT 8, "MS Shell Dlg" IDD_FILENAME_WARNING DIALOGEX 0, 0, 272, 81, 0 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUPWINDOW | WS_DLGFRAME -CAPTION "File Name Warning" +CAPTION "Dateinamenwarnung" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 - PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 + DEFPUSHBUTTON "&Ignorieren", IDIGNORE, 215, 60, 50, 14 + PUSHBUTTON "&Umbenennen", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "&Beim Start nicht überprüfen", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Eine Datei namens %s auf Ihrem Computer, könnte die Funktion diverser Programme einschränken. Umbennen der Datei in %s würde das Problem lösen. Möchten Sie die Datei jetzt umbenennen?", IDC_STATIC, 34, 7, 224, 37 } IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index 164bf4ffa0..acbedfc676 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -107,22 +107,22 @@ END IDM_BAND_MENU MENUEX BEGIN - MENUITEM "Sho&w Title", IDM_BAND_TITLE - MENUITEM "&Close Toolbar", IDM_BAND_CLOSE + MENUITEM "Titel Anzeigen", IDM_BAND_TITLE + MENUITEM "Symbolleiste schließen", IDM_BAND_CLOSE END IDM_POPUPMENU MENUEX DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View", IDM_VIEW_MENU + POPUP "&Ansicht", IDM_VIEW_MENU BEGIN - MENUITEM "&Large Icons", IDM_LARGE_ICONS - MENUITEM "&Small Icons", IDM_SMALL_ICONS + MENUITEM "&Große Symbole", IDM_LARGE_ICONS + MENUITEM "&Kleine Symbole", IDM_SMALL_ICONS END - MENUITEM "&Open Folder", IDM_OPEN_FOLDER - MENUITEM "&Show Text", IDM_SHOW_TEXT - END + MENUITEM "&Ordner öffnen", IDM_OPEN_FOLDER + MENUITEM "&Text anzeigen", IDM_SHOW_TEXT + END END /* Dialogs */ @@ -314,7 +314,7 @@ END STRINGTABLE BEGIN - IDS_BROWSEFORNEWTOOLAR "Choose a folder" - IDS_TOOLBAR_ERR_TITLE "Toolbar" - IDS_TOOLBAR_ERR_TEXT "Cannot create toolbar." + IDS_BROWSEFORNEWTOOLAR "Ordner auswählen" + IDS_TOOLBAR_ERR_TITLE "Symbolleiste" + IDS_TOOLBAR_ERR_TEXT "Kann Symbolleiste nicht hinzufügen." END diff --git a/dll/win32/comctl32/lang/comctl_De.rc b/dll/win32/comctl32/lang/comctl_De.rc index 3d3d6f673b..ff4fc93e6a 100644 --- a/dll/win32/comctl32/lang/comctl_De.rc +++ b/dll/win32/comctl32/lang/comctl_De.rc @@ -44,12 +44,12 @@ STRINGTABLE STRINGTABLE { - IDS_BUTTON_YES "&Yes" - IDS_BUTTON_NO "&No" - IDS_BUTTON_RETRY "&Retry" + IDS_BUTTON_YES "&Ja" + IDS_BUTTON_NO "&Nein" + IDS_BUTTON_RETRY "&Wiederholen" IDS_BUTTON_OK "OK" - IDS_BUTTON_CANCEL "Cancel" - IDS_BUTTON_CLOSE "&Close" + IDS_BUTTON_CANCEL "Abbrechen" + IDS_BUTTON_CLOSE "&Schließen" } IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 diff --git a/dll/win32/comdlg32/lang/cdlg_De.rc b/dll/win32/comdlg32/lang/cdlg_De.rc index 3c556b5afc..034afbdb57 100644 --- a/dll/win32/comdlg32/lang/cdlg_De.rc +++ b/dll/win32/comdlg32/lang/cdlg_De.rc @@ -137,8 +137,8 @@ STRINGTABLE IDS_SAVE "Speichern" IDS_SAVE_AS "Speichern als" IDS_OPEN_FILE "Öffne Datei" - IDS_SELECT_FOLDER "Select Folder" - IDS_FONT_SIZE_INPUT "Font size has to be a number." + IDS_SELECT_FOLDER "Ordner auswählen" + IDS_FONT_SIZE_INPUT "Schriftgröße muss eine Zahl sein." } /* diff --git a/dll/win32/setupapi/lang/de-DE.rc b/dll/win32/setupapi/lang/de-DE.rc index 14b8a1310c..5f88829209 100644 --- a/dll/win32/setupapi/lang/de-DE.rc +++ b/dll/win32/setupapi/lang/de-DE.rc @@ -15,24 +15,24 @@ END IDPROMPTFORDISK DIALOG 0, 0, 260, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Files Needed" +CAPTION "Dateien benötigt" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Legen Sie den Herstellerdatenträger ein und\nwählen Sie das korrekte Laufwerk aus.", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Herstellerdateien kopieren von:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Durchsuchen...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END STRINGTABLE BEGIN - IDS_PROMPTDISK "The file '%1' on %2 is needed" - IDS_UNKNOWN "Unknown" - IDS_COPYFROM "Copy files from:" - IDS_INFO "Type the path where the file is located, and then click OK." + IDS_PROMPTDISK "Die Datei '%1' auf %2 wird benötigt" + IDS_UNKNOWN "Unbekannt" + IDS_COPYFROM "Dateien kopieren von:" + IDS_INFO "Geben Sie den Pfad der Datei an und klicken auf OK." END STRINGTABLE diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 30031c9195..92a1e62952 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -79,11 +79,11 @@ IDM_DRAGFILE MENU BEGIN POPUP "" BEGIN - MENUITEM "&Copy here", IDM_COPYHERE - MENUITEM "&Move here", IDM_MOVEHERE - MENUITEM "Create &shortcuts here", IDM_LINKHERE + MENUITEM "Hierher kopieren", IDM_COPYHERE + MENUITEM "Hierher verschieben", IDM_MOVEHERE + MENUITEM "Verknüpfung hier erstellen", IDM_LINKHERE MENUITEM SEPARATOR - MENUITEM "Cancel", 0 + MENUITEM "Abbrechen", 0 END END @@ -618,10 +618,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL CAPTION "Anderes Symbol" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + LTEXT "Datei nach Symbolen durchsuchen:", -1, 7, 7, 179, 10 PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 114, 14, ES_AUTOHSCROLL - LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LTEXT "Wählen Sie ein Symbol aus der folgenden Liste:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 135, 179, 50, 14 @@ -675,10 +675,10 @@ BEGIN IDS_ADMINISTRATIVETOOLS "Verwaltung" /* special folders descriptions */ - IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." - IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." - IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." - IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Verwalten von administrativen Einstellungen." + IDS_FOLDER_OPTIONS_DESCRIPTION "Anpassen der Ansicht von Dateien, Ordnern und Verwalten von Dateiendungen." + IDS_FONTS_DESCRIPTION "Hinzufügen, Ändern und Verwalten von Schriftarten." + IDS_PRINTERS_DESCRIPTION "Anzeigen und Hinzufügen von Drucker und Faxgeräten." /* context menus */ IDS_VIEW_LARGE "&Große Symbole" @@ -768,7 +768,7 @@ BEGIN IDS_DRIVE_FIXED "Lokaler Datenträger" IDS_DRIVE_CDROM "CD-Laufwerk" IDS_DRIVE_NETWORK "Netzlaufwerk" - IDS_DRIVE_FLOPPY "3.5 Floppy" + IDS_DRIVE_FLOPPY "3.5 Diskette" IDS_DRIVE_REMOVABLE "Wechseldatenträger" IDS_FS_UNKNOWN "Unbekannt" @@ -794,8 +794,8 @@ BEGIN IDS_CANTLOCKVOLUME "Sperren des Volumes nicht möglich (Fehlercode: %lu)." IDS_CANTDISMOUNTVOLUME "Ausbinden des Volumes nicht möglich (Fehlercode: %lu)." IDS_CANTEJECTMEDIA "Auswerfen des Mediums nicht möglich (Fehlercode: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Fehlercode: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTSHOWPROPERTIES "Anzeigen der Eigenschaften nicht möglich (Fehlercode: %lu)." + IDS_CANTDISCONNECT "Trennen nicht möglich (Fehlercode: %lu)." IDS_DIRECTORY "Dateiordner" IDS_BAT_FILE "ReactOS-Stapelverarbeitungsdatei" @@ -817,7 +817,7 @@ BEGIN IDS_SCR_FILE "Bildschirmschoner" IDS_SYS_FILE "Systemdatei" IDS_VXD_FILE "Virtueller Gerätetreiber" - IDS_ANY_FILE "%s-file" + IDS_ANY_FILE "%s-Datei" IDS_OPEN_VERB "Öffnen" IDS_EXPLORE_VERB "Durchsuchen" @@ -843,7 +843,7 @@ BEGIN /* As in 'INI File' or 'WAV File', fallback string for no-name extensions used in the _File type_ tab of the _Folder Options_ dialog */ - IDS_FILE_EXT_TYPE "%s File" + IDS_FILE_EXT_TYPE "%s-Datei" IDS_BYTES_FORMAT "Bytes" IDS_UNKNOWN_APP "Unbekannte Anwendung"

1 0

01/01: [NTPRINT_WINETEST] Remove a crashing test for a dll we don't have anymore.
by Mark Jansen 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0dff328003d02823992c9… commit 0dff328003d02823992c9375ca52456a236f4404 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Mar 17 21:22:42 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Mar 17 21:22:42 2018 +0100 [NTPRINT_WINETEST] Remove a crashing test for a dll we don't have anymore. --- modules/rostests/winetests/CMakeLists.txt | 1 - modules/rostests/winetests/ntprint/CMakeLists.txt | 5 - modules/rostests/winetests/ntprint/ntprint.c | 238 ---------------------- modules/rostests/winetests/ntprint/testlist.c | 12 -- 4 files changed, 256 deletions(-) diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index 01ab53e093..fff038fc27 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -63,7 +63,6 @@ add_subdirectory(netapi32) add_subdirectory(netcfgx) add_subdirectory(ntdll) add_subdirectory(ntdsapi) -add_subdirectory(ntprint) add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) diff --git a/modules/rostests/winetests/ntprint/CMakeLists.txt b/modules/rostests/winetests/ntprint/CMakeLists.txt deleted file mode 100644 index 3b6942d3a9..0000000000 --- a/modules/rostests/winetests/ntprint/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -add_executable(ntprint_winetest ntprint.c testlist.c) -set_module_type(ntprint_winetest win32cui) -add_importlibs(ntprint_winetest msvcrt kernel32) -add_rostests_file(TARGET ntprint_winetest) diff --git a/modules/rostests/winetests/ntprint/ntprint.c b/modules/rostests/winetests/ntprint/ntprint.c deleted file mode 100644 index 1710220def..0000000000 --- a/modules/rostests/winetests/ntprint/ntprint.c +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Unit test suite for the Spooler Setup API (Printing) - * - * Copyright 2007 Detlef Riekenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "wine/test.h" - - -/* ##### */ - -static HMODULE hdll; -static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(DWORD, const WCHAR *); -static VOID (WINAPI *pPSetupDestroyMonitorInfo)(HANDLE); -static BOOL (WINAPI *pPSetupEnumMonitor)(HANDLE, DWORD, LPWSTR, LPDWORD); - -/* ########################### */ - -static LPCSTR load_functions(void) -{ - LPCSTR ptr; - - ptr = "ntprint.dll"; - hdll = LoadLibraryA(ptr); - if (!hdll) return ptr; - - ptr = "PSetupCreateMonitorInfo"; - pPSetupCreateMonitorInfo = (VOID *) GetProcAddress(hdll, ptr); - if (!pPSetupCreateMonitorInfo) return ptr; - - ptr = "PSetupDestroyMonitorInfo"; - pPSetupDestroyMonitorInfo = (VOID *) GetProcAddress(hdll, ptr); - if (!pPSetupDestroyMonitorInfo) return ptr; - - ptr = "PSetupEnumMonitor"; - pPSetupEnumMonitor = (VOID *) GetProcAddress(hdll, ptr); - if (!pPSetupEnumMonitor) return ptr; - - return NULL; -} - -/* ########################### */ - -static void test_PSetupCreateMonitorInfo(VOID) -{ - HANDLE mi; - WCHAR buffer[1024] = {'\\','\\'}; - UINT len = sizeof(buffer) / sizeof(buffer[0]) - 2; - GetComputerNameW(buffer + 2, &len); - - SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(0, NULL); - if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The service 'Spooler' is required for many tests\n"); - return; - } - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); - if (mi) pPSetupDestroyMonitorInfo(mi); - - SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(0, buffer); - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); - if (mi) pPSetupDestroyMonitorInfo(mi); - - SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(0, buffer + 1); - todo_wine { - ok( mi == NULL, "got %p\n", mi ); - ok( GetLastError() == ERROR_INVALID_NAME, "got %d\n", GetLastError() ); - } - if (mi) pPSetupDestroyMonitorInfo(mi); -} - -/* ########################### */ - -static void test_PSetupDestroyMonitorInfo(VOID) -{ - HANDLE mi; - - - SetLastError(0xdeadbeef); - pPSetupDestroyMonitorInfo(NULL); - /* lasterror is returned */ - trace("returned with %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(0, NULL); - if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The service 'Spooler' is required for many tests\n"); - return; - } - ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); - - if (!mi) return; - - SetLastError(0xdeadbeef); - pPSetupDestroyMonitorInfo(mi); - /* lasterror is returned */ - trace("returned with %u\n", GetLastError()); - - /* Trying to destroy the handle twice crashes with native ntprint.dll */ - if (0) { - SetLastError(0xdeadbeef); - pPSetupDestroyMonitorInfo(mi); - trace(" with %u\n", GetLastError()); - } - -} - -/* ########################### */ - -static void test_PSetupEnumMonitor(VOID) -{ - HANDLE mi; - WCHAR buffer[MAX_PATH+2]; - DWORD minsize = 0; - DWORD size; - DWORD res; - DWORD index=0; - - SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(0, NULL); - if (!mi) { - skip("PSetupCreateMonitorInfo\n"); - return; - } - - minsize = 0; - SetLastError(0xdeadbeef); - res = pPSetupEnumMonitor(mi, 0, NULL, &minsize); - ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (minsize > 0), - "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER " - "and '> 0')\n", res, GetLastError(), minsize); - - - size = sizeof(buffer) / sizeof(buffer[0]); - if ((minsize + 1) > size) { - skip("overflow: %u\n", minsize); - pPSetupDestroyMonitorInfo(mi); - return; - } - - if (0) { - /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */ - SetLastError(0xdeadbeef); - size = sizeof(buffer) / sizeof(buffer[0]); - res = pPSetupEnumMonitor(NULL, 0, buffer, &size); - ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", - res, GetLastError()); - } - - if (0) { - /* XP: Crash, w2k: Success (how can that work?) */ - SetLastError(0xdeadbeef); - size = sizeof(buffer) / sizeof(buffer[0]); - res = pPSetupEnumMonitor(mi, 0, NULL, &size); - trace("got %u with %u and %u\n", res, GetLastError(), size); - } - - if (0) { - /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */ - SetLastError(0xdeadbeef); - res = pPSetupEnumMonitor(mi, 0, buffer, NULL); - ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), - "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", - res, GetLastError()); - } - - SetLastError(0xdeadbeef); - size = minsize - 1; - res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", - res, GetLastError(), size); - - - SetLastError(0xdeadbeef); - size = minsize; - res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( res, "got %u with %u and %u (expected '!= 0')\n", - res, GetLastError(), size); - - SetLastError(0xdeadbeef); - size = minsize + 1; - res = pPSetupEnumMonitor(mi, 0, buffer, &size); - ok( res, "got %u with %u and %u (expected '!= 0')\n", - res, GetLastError(), size); - - /* try max. 20 monitors */ - while (res && (index < 20)) { - SetLastError(0xdeadbeef); - buffer[0] = '\0'; - size = sizeof(buffer) / sizeof(buffer[0]); - res = pPSetupEnumMonitor(mi, index, buffer, &size); - ok( res || (GetLastError() == ERROR_NO_MORE_ITEMS), - "(%u) got %u with %u and %u (expected '!=0' or: '0' with " - "ERROR_NO_MORE_ITEMS)\n", index, res, GetLastError(), size); - - if (res) index++; - } - pPSetupDestroyMonitorInfo(mi); - -} - -/* ########################### */ - -START_TEST(ntprint) -{ - load_functions(); - - test_PSetupCreateMonitorInfo(); - test_PSetupDestroyMonitorInfo(); - test_PSetupEnumMonitor(); - -} diff --git a/modules/rostests/winetests/ntprint/testlist.c b/modules/rostests/winetests/ntprint/testlist.c deleted file mode 100644 index 1e11b97b46..0000000000 --- a/modules/rostests/winetests/ntprint/testlist.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Automatically generated file; DO NOT EDIT!! */ - -#define STANDALONE -#include "wine/test.h" - -extern void func_ntprint(void); - -const struct test winetest_testlist[] = -{ - { "ntprint", func_ntprint }, - { 0, 0 } -};

1 0

01/01: [NTDLL_APITEST] Fix/Extend ApiTest NtAllocateVirtualMemory (#207)
by Serge Gautherie 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f208124c9f83084a992e… commit 7f208124c9f83084a992ee09cd38a524ebaebdf6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Mar 17 17:30:01 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Mar 17 17:30:01 2018 +0100 [NTDLL_APITEST] Fix/Extend ApiTest NtAllocateVirtualMemory (#207) * Fix 1 failure on both WS03 and ReactOS. * Create CheckSomeDefaultAddresses(), with additional checks. * Update license header. * ROSTESTS-297 --- .../apitests/ntdll/NtAllocateVirtualMemory.c | 204 ++++++++++++++++++--- 1 file changed, 181 insertions(+), 23 deletions(-) diff --git a/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c b/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c index d1a73cc9a5..aae94052e6 100644 --- a/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c +++ b/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c @@ -1,8 +1,11 @@ /* - * PROJECT: ReactOS API Tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Stress Test for virtual memory allocation - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for NtAllocateVirtualMemory + * COPYRIGHT: Copyright 2011 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2013 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2015 J�r�me Gardou <jerome.gardou(a)reactos.org> + * Copyright 2018 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ #include "precomp.h" @@ -562,39 +565,194 @@ CheckAdjacentVADs() } -#define RUNS 32 - -START_TEST(NtAllocateVirtualMemory) +static +VOID +CheckSomeDefaultAddresses(VOID) { - PVOID Mem1, Mem2; - SIZE_T Size1, Size2; - ULONG i; NTSTATUS Status; + PVOID BaseAddress; + SIZE_T Size; - CheckAlignment(); - CheckAdjacentVADs(); + // NULL. + + /* Reserve memory dynamically, not at 0x00000000 */ + BaseAddress = NULL; + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + ok(BaseAddress != 0x00000000, "Unexpected BaseAddress = 0x00000000\n"); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + + // 0x00000000, 64k: Free. + + /* Reserve and commit memory at 0x00000000, after round down */ + BaseAddress = UlongToPtr(0x00000000 + 0x0FFF); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_ptr(BaseAddress, 0x00000000); + + // Double-check that it is not forbidden "in order to catch null pointer accesses". + StartSeh() + *(int*)UlongToPtr(0x00000000) = 1; + EndSeh(STATUS_SUCCESS) + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Reserve memory above 0x00000000 */ + BaseAddress = UlongToPtr(0x00000000 + 0x1000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* The following checks assume very default addresses, + * no address space layout randomization (ASLR). */ +#ifdef _WIN64 + ok(FALSE, "ToDo, 64-bit: Check/Adapt 32-bit results\n"); +#endif - /* Reserve memory below 0x10000 */ - Mem1 = UlongToPtr(0xf000); - Size1 = 0x1000; + // 0x00010000, 4k: Private Data. + // 0x00011000, 60k: Unusable. + + /* Reserve memory below 0x00010000 */ + BaseAddress = UlongToPtr(0x00010000 - 0x1000); + Size = 0x1000; Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &Mem1, + &BaseAddress, 0, - &Size1, + &Size, MEM_RESERVE, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_INVALID_PARAMETER_2); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); - /* Reserve memory at 0x10000 */ - Mem1 = UlongToPtr(0x10000); - Size1 = 0x1000; + /* Reserve memory at 0x00010000: + * Windows NT legacy default executable image base */ + BaseAddress = UlongToPtr(0x00010000); + Size = 0x1000; Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &Mem1, + &BaseAddress, 0, - &Size1, + &Size, MEM_RESERVE, PAGE_READWRITE); ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + if (NT_SUCCESS(Status)) + { // Unexpected, cleanup. + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + } + + // 0x00400000: Image base. + + /* Reserve memory below 0x00400000 */ + BaseAddress = UlongToPtr(0x00400000 - 0x1000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_READWRITE); + if (NT_SUCCESS(Status)) + { + trace("Below 0x00400000 is available, as on ReactOS and Windows S03\n"); + // 0x003F0000, 64k: Free. + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + } + else + { + trace("Below 0x00400000 is not available, as on Windows XP\n"); + // 0x003F0000, 4k: Shareable. + // 0x003F1000, 60k: Unusable. + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + } + + /* Reserve memory at 0x00400000: + * Windows NT legacy default DLL image base, + * (ReactOS and) Windows 95 new default executable image base */ + BaseAddress = UlongToPtr(0x00400000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + if (NT_SUCCESS(Status)) + { // Unexpected, cleanup. + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + } + + // 0x10000000: Free. + + /* Reserve memory below 0x10000000 */ + BaseAddress = UlongToPtr(0x10000000 - 0x1000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Reserve memory at 0x10000000: + * Windows new default non-OS DLL image base */ + BaseAddress = UlongToPtr(0x10000000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); + +#ifdef _WIN64 + skip("ToDo, 64-bit: Add 0x140000000/Exe and 0x180000000/DLL checks\n"); +#endif +} + +#define RUNS 32 + +START_TEST(NtAllocateVirtualMemory) +{ + PVOID Mem1, Mem2; + SIZE_T Size1, Size2; + ULONG i; + + CheckAlignment(); + CheckAdjacentVADs(); + CheckSomeDefaultAddresses(); Size1 = 32; Mem1 = Allocate(Size1);

1 0

01/01: [CONFIGURE] Add support for VS2017 Update 3.
by Thomas Faber 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ce87167cc3918f0174dc… commit 0ce87167cc3918f0174dcbc0ca2f13f5751b38e4 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 17 16:41:46 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 17 16:41:46 2018 +0100 [CONFIGURE] Add support for VS2017 Update 3. --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 4d550d5744..5253daa360 100755 --- a/configure.cmd +++ b/configure.cmd @@ -70,6 +70,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 + cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old or version detection failed. goto quit

1 0

01/01: [KMTESTS:CC] Truncate file cache on uninitialize to avoid leaking a reference. ROSTESTS-264 ROSTESTS-300
by Thomas Faber 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7ad37a16574a9af72e43… commit d7ad37a16574a9af72e43c0cd05bee53fffb468d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 17 16:04:28 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 17 16:39:23 2018 +0100 [KMTESTS:CC] Truncate file cache on uninitialize to avoid leaking a reference. ROSTESTS-264 ROSTESTS-300 --- modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c | 3 ++- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c index d0ba58c6ff..142e996548 100644 --- a/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c @@ -156,6 +156,7 @@ TestIrpHandler( _In_ PIRP Irp, _In_ PIO_STACK_LOCATION IoStack) { + LARGE_INTEGER Zero = RTL_CONSTANT_LARGE_INTEGER(0LL); NTSTATUS Status; PTEST_FCB Fcb; CACHE_UNINITIALIZE_EVENT CacheUninitEvent; @@ -307,7 +308,7 @@ TestIrpHandler( { ok_irql(PASSIVE_LEVEL); KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); - CcUninitializeCacheMap(IoStack->FileObject, NULL, &CacheUninitEvent); + CcUninitializeCacheMap(IoStack->FileObject, &Zero, &CacheUninitEvent); KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); Fcb = IoStack->FileObject->FsContext; ExFreePoolWithTag(Fcb, 'FwrI'); diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 8fd6f6bd89..b4e632ec32 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -198,6 +198,7 @@ CleanupTest( ULONG TestId, PDEVICE_OBJECT DeviceObject) { + LARGE_INTEGER Zero = RTL_CONSTANT_LARGE_INTEGER(0LL); CACHE_UNINITIALIZE_EVENT CacheUninitEvent; ok_eq_pointer(TestDeviceObject, DeviceObject); @@ -208,7 +209,7 @@ CleanupTest( if (CcIsFileCached(TestFileObject)) { KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); - CcUninitializeCacheMap(TestFileObject, NULL, &CacheUninitEvent); + CcUninitializeCacheMap(TestFileObject, &Zero, &CacheUninitEvent); KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); }

1 0

01/01: [MPRAPI] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c100ec6e7b30593b6eb8b… commit c100ec6e7b30593b6eb8b248575e4bc743451a38 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:26:22 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:26:22 2018 +0100 [MPRAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mprapi/mprapi.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dll/win32/mprapi/mprapi.c b/dll/win32/mprapi/mprapi.c index 5ff5dfc62a..715f1b8cad 100644 --- a/dll/win32/mprapi/mprapi.c +++ b/dll/win32/mprapi/mprapi.c @@ -16,14 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h> -#include <windef.h> -#include <winbase.h> -//#include "mprapi.h" -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "mprapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mprapi); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3bb27a2ce3..442dd6dd8f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -99,7 +99,7 @@ reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 reactos/dll/win32/mlang # Synced to WineStaging-3.3 reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3 reactos/dll/win32/mpr # Synced to WineStaging-3.3 -reactos/dll/win32/mprapi # Synced to WineStaging-2.9 +reactos/dll/win32/mprapi # Synced to WineStaging-3.3 reactos/dll/win32/msacm32 # Synced to WineStaging-2.16 reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9 reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9

1 0

01/01: [MPR_WINETEST] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0de65aae00b878d317621… commit 0de65aae00b878d317621e28eac2b21da678dd2e Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:25:29 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:25:29 2018 +0100 [MPR_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/mpr/mpr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/mpr/mpr.c b/modules/rostests/winetests/mpr/mpr.c index 330e66bf89..041afbf130 100644 --- a/modules/rostests/winetests/mpr/mpr.c +++ b/modules/rostests/winetests/mpr/mpr.c @@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void) info_size = sizeof(buffer); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); @@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine { if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL,

1 0

01/01: [MPR] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a914df648f281f65515e… commit 1a914df648f281f65515e1262fc624596b288b56 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:24:48 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:24:48 2018 +0100 [MPR] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mpr/auth.c | 10 +++++++++- dll/win32/mpr/mpr.rc | 2 -- dll/win32/mpr/mpr_main.c | 9 ++++++++- dll/win32/mpr/mprres.h | 4 +++- dll/win32/mpr/multinet.c | 10 +++++++++- dll/win32/mpr/netspi.h | 3 +++ dll/win32/mpr/nps.c | 15 ++++++++++++++- dll/win32/mpr/precomp.h | 5 ++--- dll/win32/mpr/pwcache.c | 11 +++++++++-- dll/win32/mpr/version.rc | 2 +- dll/win32/mpr/wnet.c | 24 +++++++++++++++++------- media/doc/README.WINE | 2 +- 12 files changed, 76 insertions(+), 21 deletions(-) diff --git a/dll/win32/mpr/auth.c b/dll/win32/mpr/auth.c index bf5c671f88..e2a28a3d83 100644 --- a/dll/win32/mpr/auth.c +++ b/dll/win32/mpr/auth.c @@ -18,7 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnetwk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + /***************************************************************** * WNetLogoffA [MPR.@] diff --git a/dll/win32/mpr/mpr.rc b/dll/win32/mpr/mpr.rc index d34b55657e..93f5cebda0 100644 --- a/dll/win32/mpr/mpr.rc +++ b/dll/win32/mpr/mpr.rc @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <winuser.h> - #include "mprres.h" #include "version.rc" diff --git a/dll/win32/mpr/mpr_main.c b/dll/win32/mpr/mpr_main.c index f6ca1021b2..d7535f504e 100644 --- a/dll/win32/mpr/mpr_main.c +++ b/dll/win32/mpr/mpr_main.c @@ -18,10 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "winnetwk.h" +#include "wine/debug.h" #include "wnetpriv.h" +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + /* * FIXME: The following routines should use a private heap ... */ diff --git a/dll/win32/mpr/mprres.h b/dll/win32/mpr/mprres.h index 83e95450a6..5c42e56547 100644 --- a/dll/win32/mpr/mprres.h +++ b/dll/win32/mpr/mprres.h @@ -15,10 +15,12 @@ * 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_MPRRES_H__ #define __WINE_MPRRES_H__ +#include <windef.h> +#include <winuser.h> + #define IDS_ENTIRENETWORK 1 #define IDD_PROXYDLG 0x400 diff --git a/dll/win32/mpr/multinet.c b/dll/win32/mpr/multinet.c index 326c5b14eb..f05cd214ef 100644 --- a/dll/win32/mpr/multinet.c +++ b/dll/win32/mpr/multinet.c @@ -18,7 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnetwk.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + /***************************************************************** * MultinetGetConnectionPerformanceA [MPR.@] diff --git a/dll/win32/mpr/netspi.h b/dll/win32/mpr/netspi.h index c6bb1ea521..0a82475931 100644 --- a/dll/win32/mpr/netspi.h +++ b/dll/win32/mpr/netspi.h @@ -24,6 +24,9 @@ #ifndef _NETSPI_H_ #define _NETSPI_H_ +#include "windef.h" +#include "winnetwk.h" + /* * Note: The Unicode variants of all these routines/structures * apparently don't exist, at least not in Win95 ... diff --git a/dll/win32/mpr/nps.c b/dll/win32/mpr/nps.c index bb1264635a..f8a143363f 100644 --- a/dll/win32/mpr/nps.c +++ b/dll/win32/mpr/nps.c @@ -19,9 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" #include "netspi.h" +#include "wine/debug.h" +#include "winerror.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + +#include "wine/unicode.h" + +#include "mprres.h" /*********************************************************************** * NPS_ProxyPasswordDialog diff --git a/dll/win32/mpr/precomp.h b/dll/win32/mpr/precomp.h index 6d5a884c54..84dd7aabf4 100644 --- a/dll/win32/mpr/precomp.h +++ b/dll/win32/mpr/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MPR_PCH_ #define _MPR_PCH_ @@ -16,6 +17,4 @@ #include "mprres.h" -WINE_DEFAULT_DEBUG_CHANNEL(mpr); - -#endif /* _MPR_PCH_ */ +#endif /* !_MPR_PCH_ */ diff --git a/dll/win32/mpr/pwcache.c b/dll/win32/mpr/pwcache.c index 6568b9d549..aa09522a5f 100644 --- a/dll/win32/mpr/pwcache.c +++ b/dll/win32/mpr/pwcache.c @@ -19,10 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - +#include <stdarg.h> #include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winnetwk.h" +#include "winreg.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); + static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\"; static inline BYTE hex( BYTE x ) diff --git a/dll/win32/mpr/version.rc b/dll/win32/mpr/version.rc index a2cc94aa98..c27f9c7888 100644 --- a/dll/win32/mpr/version.rc +++ b/dll/win32/mpr/version.rc @@ -25,4 +25,4 @@ #define WINE_PRODUCTVERSION 5,0,2195,6611 #define WINE_PRODUCTVERSION_STR "5.00.2195.6611" -#include <wine/wine_common_ver.rc> +#include "wine/wine_common_ver.rc" diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index fc701b6595..82c9302849 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -21,13 +21,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "precomp.h" - -#include <winioctl.h> -#include <npapi.h> +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winioctl.h" +#include "winnetwk.h" +#include "npapi.h" +#include "winreg.h" +#include "winuser.h" #define WINE_MOUNTMGR_EXTENSIONS -#include <ddk/mountmgr.h> -#include <wine/unicode.h> +#include "ddk/mountmgr.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "mprres.h" +#include "wnetpriv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpr); /* Data structures representing network service providers. Assumes only one * thread creates them, and that they are constant for the life of the process @@ -2577,7 +2587,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default: diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 869affc759..3bb27a2ce3 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -98,7 +98,7 @@ reactos/dll/win32/mciwave # Synced to WineStaging-3.3 reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 reactos/dll/win32/mlang # Synced to WineStaging-3.3 reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3 -reactos/dll/win32/mpr # Synced to Wine-3.0 +reactos/dll/win32/mpr # Synced to WineStaging-3.3 reactos/dll/win32/mprapi # Synced to WineStaging-2.9 reactos/dll/win32/msacm32 # Synced to WineStaging-2.16 reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9

1 0

01/01: [MMDEVAPI_WINETEST] Sync with Wine Staging 3.3. CORE-14434
by Amine Khaldi 17 Mar '18

17 Mar '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32eba1089227733c73a0d… commit 32eba1089227733c73a0d7cf9858b1b84408c937 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Mar 17 13:23:50 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Mar 17 13:23:50 2018 +0100 [MMDEVAPI_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/mmdevapi/capture.c | 17 +++++++---------- modules/rostests/winetests/mmdevapi/mmdevenum.c | 3 +++ modules/rostests/winetests/mmdevapi/render.c | 13 ++++++++++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/modules/rostests/winetests/mmdevapi/capture.c b/modules/rostests/winetests/mmdevapi/capture.c index 3cdfda1a37..0fa9f0cab8 100644 --- a/modules/rostests/winetests/mmdevapi/capture.c +++ b/modules/rostests/winetests/mmdevapi/capture.c @@ -308,20 +308,17 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr==S_OK ? (UINT)pos : -1, pad, flags, frames); if(hr == S_OK){ - /* The discontinuity is reported here, but is this an old or new packet? */ - todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { - /* FIXME: Some drivers fail */ - ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); + if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY){ /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); + sum = pos; + }else{ /* win10 */ + ok(pos == sum, "Position %u last %u frames %u\n", (UINT)pos, sum, frames); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next); - - if(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) - sum = pos; } hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); @@ -416,9 +413,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); ok(hr == S_OK, "Valid IAudioCaptureClient_GetBuffer returns %08x\n", hr); trace("Running position %d pad %u flags %x, amount of frames locked: %u\n", - hr==S_OK ? (UINT)pos : -1, pad, flags, frames); + SUCCEEDED(hr) ? (UINT)pos : -1, pad, flags, frames); - if(hr == S_OK){ + if(SUCCEEDED(hr)){ /* Some w7 machines signal DATA_DISCONTINUITY here following the * previous AUDCLNT_S_BUFFER_EMPTY, others not. What logic? */ ok(pos >= sum, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); diff --git a/modules/rostests/winetests/mmdevapi/mmdevenum.c b/modules/rostests/winetests/mmdevapi/mmdevenum.c index 12e2156125..23f5b82b1d 100644 --- a/modules/rostests/winetests/mmdevapi/mmdevenum.c +++ b/modules/rostests/winetests/mmdevapi/mmdevenum.c @@ -21,6 +21,9 @@ #define COBJMACROS #include "initguid.h" +#ifndef __REACTOS__ +#include "endpointvolume.h" +#endif #include "mmdeviceapi.h" #include "audioclient.h" #include "audiopolicy.h" diff --git a/modules/rostests/winetests/mmdevapi/render.c b/modules/rostests/winetests/mmdevapi/render.c index 8487fbbb92..b1c62f0ccf 100644 --- a/modules/rostests/winetests/mmdevapi/render.c +++ b/modules/rostests/winetests/mmdevapi/render.c @@ -29,13 +29,19 @@ #define COBJMACROS +#ifdef STANDALONE +#include "initguid.h" +#endif + #include "unknwn.h" #include "uuids.h" #include "mmdeviceapi.h" #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" -#include "initguid.h" +#ifdef __REACTOS__ +#include <initguid.h> +#endif #include "endpointvolume.h" static const unsigned int win_formats[][4] = { @@ -945,8 +951,9 @@ static void test_clock(int share) ok(gbsize == bufsize, "BufferSize %u at rate %u\n", gbsize, pwfx->nSamplesPerSec); else - ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); + todo_wine + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, + "BufferSize %u misfits fragment size %u at rate %u\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs