Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.14][SHELL32] Ignore unused flag SEE_MASK_UNICODE (#5033) & de-DE update

Browse source 
by porting back:

0.4.15-dev-5676-g 5c22ce3742 [SHELL32] Ignore unused flag SEE_MASK_UNICODE (#5033)
to mute logspam of the kind
fixme:(dll/win32/shell32/shlexec.cpp:1934) flags ignored: 0x00004000
e.g. when starting Rapps.
---------------
0.4.15-dev-2957-g c30b1fe893 de-DE.rc Update regarding IDC_BROWSE_FOR_FOLDER_NEW_FOLDER,
and pick other small tweaks in that file from master
---------------
Then delete an unused #ifndef __REACTOS__ block within brsfolder.c and strip all EOL-whitespace in that file.
This part is done as the file is part of a backport into even older branches. It is a partial pick of:
0.4.15-dev-3642-g 83be315abf
brsfolder.c will be 100% in sync between releases/0.4.7 - releases/0.4.14 afterwards.
This commit is contained in:
Joachim Henze 2023-02-14 20:43:07 +01:00
parent 1e4c5509f5
commit 05fccd02ce
3 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/shell32/lang/de-DE.rc
View file

@ -110,7 +110,7 @@ BEGIN
LTEXT "Ordner:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12
CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105
EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Neuen Ordner erstellen", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Neuen &Ordner erstellen", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 85, 14, WS_GROUP | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Abbrechen", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP
END
@ -919,7 +919,7 @@ BEGIN
IDS_EDIT_VERB "Bearbeiten"
IDS_FIND_VERB "Finden"
IDS_PRINT_VERB "Drucken"
IDS_CMD_VERB "Command Prompt hier"
IDS_CMD_VERB "Cmd hier"
IDS_FILE_FOLDER "%u Dateien, %u Ordner"
IDS_PRINTERS "Drucker"

3
dll/win32/shell32/shlexec.cpp
View file

@ -596,7 +596,6 @@ static LPWSTR SHELL_BuildEnvW( const WCHAR *path )
return new_env;
}
/***********************************************************************
* SHELL_TryAppPathW [Internal]
*
@ -1769,7 +1768,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
static const DWORD unsupportedFlags =
SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY |
SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT |
SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR;
SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR;
WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024];
WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd;

7
dll/win32/shell32/wine/brsfolder.c
View file

@ -1246,13 +1246,6 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
return FALSE;
}
#ifndef __REACTOS__
static const WCHAR swBrowseTemplateName[] = {
'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
static const WCHAR swNewBrowseTemplateName[] = {
'S','H','N','E','W','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0};
#endif
/*************************************************************************
* SHBrowseForFolderA [SHELL32.@]
* SHBrowseForFolder [SHELL32.@]