Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 14:06:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LOCALUI] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-12-23 00:57:33 +01:00
parent 90cb67a7f4
commit e32507b525
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
media/doc/README.WINE
View file

@ -224,7 +224,7 @@ dll/win32/xolehlp # Synced to WineStaging-3.21
dll/cpl/inetcpl # Synced to WineStaging-4.18 dll/cpl/inetcpl # Synced to WineStaging-4.18
win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (known there as /dll/win32/localui) win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-4.18 (known there as /dll/win32/localui)
ReactOS shares the following programs with Winehq. ReactOS shares the following programs with Winehq.

22
win32ss/printing/monitors/localmon/ui/localui.c
View file

@ -19,6 +19,9 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#ifdef __REACTOS__
#include <wchar.h>
#endif
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
@ -30,7 +33,6 @@
#include "ddk/winsplp.h" #include "ddk/winsplp.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "localui.h" #include "localui.h"
WINE_DEFAULT_DEBUG_CHANNEL(localui); WINE_DEFAULT_DEBUG_CHANNEL(localui);
@ -187,7 +189,7 @@ static void dlg_port_already_exists(HWND hWnd, LPCWSTR portname)
message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
if (message) { if (message) {
message[0] = '\0'; message[0] = '\0';
snprintfW(message, len, res_PortExistsW, portname); swprintf(message, res_PortExistsW, portname);
MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR);
HeapFree(GetProcessHeap(), 0, message); HeapFree(GetProcessHeap(), 0, message);
} }
@ -213,7 +215,7 @@ static void dlg_invalid_portname(HWND hWnd, LPCWSTR portname)
message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
if (message) { if (message) {
message[0] = '\0'; message[0] = '\0';
snprintfW(message, len, res_InvalidNameW, portname); swprintf(message, res_InvalidNameW, portname);
MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR);
HeapFree(GetProcessHeap(), 0, message); HeapFree(GetProcessHeap(), 0, message);
} }
@ -375,12 +377,12 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP
status = FALSE; status = FALSE;
res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE); res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE);
/* length is in WCHAR, including the '\0' */ /* length is in WCHAR, including the '\0' */
GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, sizeof(bufferW) / sizeof(bufferW[0])); GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, ARRAY_SIZE(bufferW));
TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status); TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status);
/* native localui.dll use the same limits */ /* native localui.dll use the same limits */
if ((res > 0) && (res < 1000000) && status) { if ((res > 0) && (res < 1000000) && status) {
sprintfW(bufferW, fmt_uW, res); swprintf(bufferW, fmt_uW, res);
res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW,
(PBYTE) bufferW, (PBYTE) bufferW,
(lstrlenW(bufferW) +1) * sizeof(WCHAR), (lstrlenW(bufferW) +1) * sizeof(WCHAR),
@ -416,13 +418,13 @@ static DWORD get_type_from_name(LPCWSTR name)
{ {
HANDLE hfile; HANDLE hfile;
if (!strncmpiW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) if (!_wcsnicmp(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1))
return PORT_IS_LPT; return PORT_IS_LPT;
if (!strncmpiW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) if (!_wcsnicmp(name, portname_COM, ARRAY_SIZE(portname_COM) -1))
return PORT_IS_COM; return PORT_IS_COM;
if (!strcmpiW(name, portname_FILE)) if (!wcsicmp(name, portname_FILE))
return PORT_IS_FILE; return PORT_IS_FILE;
if (name[0] == '/') if (name[0] == '/')
@ -431,10 +433,10 @@ static DWORD get_type_from_name(LPCWSTR name)
if (name[0] == '|') if (name[0] == '|')
return PORT_IS_PIPE; return PORT_IS_PIPE;
if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) if (!wcsncmp(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1))
return PORT_IS_CUPS; return PORT_IS_CUPS;
if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) if (!wcsncmp(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1))
return PORT_IS_LPR; return PORT_IS_LPR;
/* Must be a file or a directory. Does the file exist ? */ /* Must be a file or a directory. Does the file exist ? */