Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[hpoussin] 37894: Fix a race condition between umpnpmgr service and CMP_WaitNoPendingInstallEvents API.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Dec 6 06:54:24 2008 New Revision: 37894 URL: http://svn.reactos.org/svn/reactos?rev=37894&view=rev Log: Fix a race condition between umpnpmgr service and CMP_WaitNoPendingInstallEvents API. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Dec 6 06:54:24 2008 @@ -2221,11 +2221,6 @@ DPRINT("ServiceMain() called\n"); - hNoPendingInstalls = CreateEventW(NULL, - TRUE, - FALSE, - L"Global\\PnP_No_Pending_Install_Events"); - hThread = CreateThread(NULL, 0, PnpEventThread, @@ -2283,6 +2278,17 @@ return dwError; } + hNoPendingInstalls = CreateEventW(NULL, + TRUE, + FALSE, + L"Global\\PnP_No_Pending_Install_Events"); + if (hNoPendingInstalls == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not create the Event! (Error %lu)\n", dwError); + return dwError; + } + #ifdef HAVE_SLIST_ENTRY_IMPLEMENTED InitializeSListHead(&DeviceInstallListHead); #else

15 years, 9 months

[dchapyshev] 37893: - Add localui from Wine - Add baseaddress for localui - Add localui to bootcd

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Dec 6 06:09:14 2008 New Revision: 37893 URL: http://svn.reactos.org/svn/reactos?rev=37893&view=rev Log: - Add localui from Wine - Add baseaddress for localui - Add localui to bootcd Added: trunk/reactos/dll/win32/localui/ (with props) trunk/reactos/dll/win32/localui/localui.c (with props) trunk/reactos/dll/win32/localui/localui.h (with props) trunk/reactos/dll/win32/localui/localui.rbuild (with props) trunk/reactos/dll/win32/localui/localui.rc (with props) trunk/reactos/dll/win32/localui/localui.spec (with props) trunk/reactos/dll/win32/localui/ui_Da.rc (with props) trunk/reactos/dll/win32/localui/ui_De.rc (with props) trunk/reactos/dll/win32/localui/ui_En.rc (with props) trunk/reactos/dll/win32/localui/ui_Fr.rc (with props) trunk/reactos/dll/win32/localui/ui_Ko.rc (with props) trunk/reactos/dll/win32/localui/ui_Nl.rc (with props) trunk/reactos/dll/win32/localui/ui_No.rc (with props) trunk/reactos/dll/win32/localui/ui_Pl.rc (with props) trunk/reactos/dll/win32/localui/ui_Pt.rc (with props) trunk/reactos/dll/win32/localui/ui_Ro.rc (with props) trunk/reactos/dll/win32/localui/ui_Ru.rc (with props) trunk/reactos/dll/win32/localui/ui_Si.rc (with props) trunk/reactos/dll/win32/localui/ui_Sv.rc (with props) trunk/reactos/dll/win32/localui/ui_Zh.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=378… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -32,6 +32,7 @@ <property name="BASEADDRESS_QEDIT" value="0x611c0000" /> <property name="BASEADDRESS_MODEMUI" value="0x61650000" /> <property name="BASEADDRESS_MAPI32" value="0x62250000" /> + <property name="BASEADDRESS_LOCALUI" value="0x62f70000" /> <property name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> <property name="BASEADDRESS_TIMEDATE" value="0x64da0000" /> <property name="BASEADDRESS_SYSDM" value="0x64dd0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -269,6 +269,7 @@ dll\win32\iphlpapi\iphlpapi.dll 1 dll\win32\jscript\jscript.dll 1 dll\win32\kernel32\kernel32.dll 1 +dll\win32\localui\localui.dll 1 dll\win32\lsasrv\lsasrv.dll 1 dll\win32\lz32\lz32.dll 1 dll\win32\mapi32\mapi32.dll 1 Propchange: trunk/reactos/dll/win32/localui/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Dec 6 06:09:14 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/localui/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/localui/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/localui/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/localui/localui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.c (added) +++ trunk/reactos/dll/win32/localui/localui.c [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,698 @@ +/* + * Implementation of the Local Printmonitor User Interface + * + * 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> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "winuser.h" + +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "localui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(localui); + +/*****************************************************/ + +static HINSTANCE LOCALUI_hInstance; + +static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; +static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', + 'L','P','T','P','o','r','t', + 'C','o','m','m','a','n','d','O','K',0}; +static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; +static const WCHAR cmd_GetDefaultCommConfigW[] = {'G','e','t', + 'D','e','f','a','u','l','t', + 'C','o','m','m','C','o','n','f','i','g',0}; +static const WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', + 'T','r','a','n','s','m','i','s','s','i','o','n', + 'R','e','t','r','y','T','i','m','e','o','u','t',0}; +static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; +static const WCHAR cmd_SetDefaultCommConfigW[] = {'S','e','t', + 'D','e','f','a','u','l','t', + 'C','o','m','m','C','o','n','f','i','g',0}; + +static const WCHAR fmt_uW[] = {'%','u',0}; +static const WCHAR portname_LPT[] = {'L','P','T',0}; +static const WCHAR portname_COM[] = {'C','O','M',0}; +static const WCHAR portname_FILE[] = {'F','I','L','E',':',0}; +static const WCHAR portname_CUPS[] = {'C','U','P','S',':',0}; +static const WCHAR portname_LPR[] = {'L','P','R',':',0}; + +static const WCHAR XcvMonitorW[] = {',','X','c','v','M','o','n','i','t','o','r',' ',0}; +static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; + +/*****************************************************/ + +typedef struct tag_addportui_t { + LPWSTR portname; + HANDLE hXcv; +} addportui_t; + +typedef struct tag_lptconfig_t { + HANDLE hXcv; + DWORD value; +} lptconfig_t; + + +static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); + +/***************************************************** + * strdupWW [internal] + */ + +static LPWSTR strdupWW(LPCWSTR pPrefix, LPCWSTR pSuffix) +{ + LPWSTR ptr; + DWORD len; + + len = lstrlenW(pPrefix) + (pSuffix ? lstrlenW(pSuffix) : 0) + 1; + ptr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ptr) { + lstrcpyW(ptr, pPrefix); + if (pSuffix) lstrcatW(ptr, pSuffix); + } + return ptr; +} + +/***************************************************** + * dlg_configure_com [internal] + * + */ + +static BOOL dlg_configure_com(HANDLE hXcv, HWND hWnd, PCWSTR pPortName) +{ + COMMCONFIG cfg; + LPWSTR shortname; + DWORD status; + DWORD dummy; + DWORD len; + BOOL res; + + /* strip the colon (pPortName is never empty here) */ + len = lstrlenW(pPortName); + shortname = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (shortname) { + memcpy(shortname, pPortName, (len -1) * sizeof(WCHAR)); + shortname[len-1] = '\0'; + + /* get current settings */ + len = sizeof(cfg); + status = ERROR_SUCCESS; + res = XcvDataW( hXcv, cmd_GetDefaultCommConfigW, + (PBYTE) shortname, + (lstrlenW(shortname) +1) * sizeof(WCHAR), + (PBYTE) &cfg, len, &len, &status); + + if (res && (status == ERROR_SUCCESS)) { + /* display the Dialog */ + res = CommConfigDialogW(pPortName, hWnd, &cfg); + if (res) { + status = ERROR_SUCCESS; + /* set new settings */ + res = XcvDataW(hXcv, cmd_SetDefaultCommConfigW, + (PBYTE) &cfg, len, + (PBYTE) &dummy, 0, &len, &status); + } + } + HeapFree(GetProcessHeap(), 0, shortname); + return res; + } + return FALSE; +} + + +/***************************************************** + * dlg_configure_lpt [internal] + * + */ + +static BOOL dlg_configure_lpt(HANDLE hXcv, HWND hWnd) +{ + lptconfig_t data; + BOOL res; + + + data.hXcv = hXcv; + + res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(LPTCONFIG_DIALOG), hWnd, + dlgproc_lptconfig, (LPARAM) &data); + + TRACE("got %u with %u\n", res, GetLastError()); + + if (!res) SetLastError(ERROR_CANCELLED); + return res; +} + +/****************************************************************** + * dlg_port_already_exists [internal] + */ + +static void dlg_port_already_exists(HWND hWnd, LPCWSTR portname) +{ + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + WCHAR res_PortExistsW[IDS_PORTEXISTS_MAXLEN]; + LPWSTR message; + DWORD len; + + res_PortW[0] = '\0'; + res_PortExistsW[0] = '\0'; + LoadStringW(LOCALUI_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); + LoadStringW(LOCALUI_hInstance, IDS_PORTEXISTS, res_PortExistsW, IDS_PORTEXISTS_MAXLEN); + + len = lstrlenW(portname) + IDS_PORTEXISTS_MAXLEN + 1; + message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (message) { + message[0] = '\0'; + snprintfW(message, len, res_PortExistsW, portname); + MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); + HeapFree(GetProcessHeap(), 0, message); + } +} + +/****************************************************************** + * dlg_invalid_portname [internal] + */ + +static void dlg_invalid_portname(HWND hWnd, LPCWSTR portname) +{ + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + WCHAR res_InvalidNameW[IDS_INVALIDNAME_MAXLEN]; + LPWSTR message; + DWORD len; + + res_PortW[0] = '\0'; + res_InvalidNameW[0] = '\0'; + LoadStringW(LOCALUI_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); + LoadStringW(LOCALUI_hInstance, IDS_INVALIDNAME, res_InvalidNameW, IDS_INVALIDNAME_MAXLEN); + + len = lstrlenW(portname) + IDS_INVALIDNAME_MAXLEN; + message = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (message) { + message[0] = '\0'; + snprintfW(message, len, res_InvalidNameW, portname); + MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); + HeapFree(GetProcessHeap(), 0, message); + } +} + +/****************************************************************** + * display the Dialog "Nothing to configure" + * + */ + +static void dlg_nothingtoconfig(HWND hWnd) +{ + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + WCHAR res_nothingW[IDS_NOTHINGTOCONFIG_MAXLEN]; + + res_PortW[0] = '\0'; + res_nothingW[0] = '\0'; + LoadStringW(LOCALUI_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); + LoadStringW(LOCALUI_hInstance, IDS_NOTHINGTOCONFIG, res_nothingW, IDS_NOTHINGTOCONFIG_MAXLEN); + + MessageBoxW(hWnd, res_nothingW, res_PortW, MB_OK | MB_ICONINFORMATION); +} + +/****************************************************************** + * dlg_win32error [internal] + */ + +static void dlg_win32error(HWND hWnd, DWORD lasterror) +{ + WCHAR res_PortW[IDS_LOCALPORT_MAXLEN]; + LPWSTR message = NULL; + DWORD res; + + res_PortW[0] = '\0'; + LoadStringW(LOCALUI_hInstance, IDS_LOCALPORT, res_PortW, IDS_LOCALPORT_MAXLEN); + + + res = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, lasterror, 0, (LPWSTR) &message, 0, NULL); + + if (res > 0) { + MessageBoxW(hWnd, message, res_PortW, MB_OK | MB_ICONERROR); + LocalFree(message); + } +} + +/***************************************************************************** + * + */ + +static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + addportui_t * data; + DWORD status; + DWORD dummy; + DWORD len; + DWORD res; + + switch(msg) + { + case WM_INITDIALOG: + SetWindowLongPtrW(hwnd, DWLP_USER, lparam); + return TRUE; + + case WM_COMMAND: + if (wparam == MAKEWPARAM(IDOK, BN_CLICKED)) + { + data = (addportui_t *) GetWindowLongPtrW(hwnd, DWLP_USER); + /* length in WCHAR, without the '\0' */ + len = SendDlgItemMessageW(hwnd, ADDPORT_EDIT, WM_GETTEXTLENGTH, 0, 0); + data->portname = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + + if (!data->portname) { + EndDialog(hwnd, FALSE); + return TRUE; + } + /* length is in WCHAR, including the '\0' */ + GetDlgItemTextW(hwnd, ADDPORT_EDIT, data->portname, len + 1); + status = ERROR_SUCCESS; + res = XcvDataW( data->hXcv, cmd_PortIsValidW, (PBYTE) data->portname, + (lstrlenW(data->portname) + 1) * sizeof(WCHAR), + (PBYTE) &dummy, 0, &len, &status); + + TRACE("got %u with status %u\n", res, status); + if (res && (status == ERROR_SUCCESS)) { + /* The caller must free data->portname */ + EndDialog(hwnd, TRUE); + return TRUE; + } + + if (res && (status == ERROR_INVALID_NAME)) { + dlg_invalid_portname(hwnd, data->portname); + HeapFree(GetProcessHeap(), 0, data->portname); + data->portname = NULL; + return TRUE; + } + + dlg_win32error(hwnd, status); + HeapFree(GetProcessHeap(), 0, data->portname); + data->portname = NULL; + return TRUE; + } + + if (wparam == MAKEWPARAM(IDCANCEL, BN_CLICKED)) + { + EndDialog(hwnd, FALSE); + return TRUE; + } + return FALSE; + } + return FALSE; +} + +/***************************************************************************** + * dlgproc_lptconfig [internal] + * + * Our message-proc is simple, as the range-check is done only during the + * command "OK" and the dialog is set to the start-value at "out of range". + * + * Native localui.dll does the check during keyboard-input and set the dialog + * to the previous value. + * + */ + +static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + lptconfig_t * data; + WCHAR bufferW[16]; + DWORD status; + DWORD dummy; + DWORD len; + DWORD res; + + + switch(msg) + { + case WM_INITDIALOG: + SetWindowLongPtrW(hwnd, DWLP_USER, lparam); + data = (lptconfig_t *) lparam; + + /* Get current setting */ + data->value = 45; + status = ERROR_SUCCESS; + res = XcvDataW( data->hXcv, cmd_GetTransmissionRetryTimeoutW, + (PBYTE) &dummy, 0, + (PBYTE) &data->value, sizeof(data->value), &len, &status); + + TRACE("got %u with status %u\n", res, status); + + /* Set current setting as the initial value in the Dialog */ + SetDlgItemInt(hwnd, LPTCONFIG_EDIT, data->value, FALSE); + return TRUE; + + case WM_COMMAND: + if (wparam == MAKEWPARAM(IDOK, BN_CLICKED)) + { + data = (lptconfig_t *) GetWindowLongPtrW(hwnd, DWLP_USER); + + status = FALSE; + res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE); + /* length is in WCHAR, including the '\0' */ + GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, sizeof(bufferW) / sizeof(bufferW[0])); + TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status); + + /* native localui.dll use the same limits */ + if ((res > 0) && (res < 1000000) && status) { + sprintfW(bufferW, fmt_uW, res); + res = XcvDataW( data->hXcv, cmd_ConfigureLPTPortCommandOKW, + (PBYTE) bufferW, + (lstrlenW(bufferW) +1) * sizeof(WCHAR), + (PBYTE) &dummy, 0, &len, &status); + + TRACE("got %u with status %u\n", res, status); + EndDialog(hwnd, TRUE); + return TRUE; + } + + /* Set initial value and rerun the Dialog */ + SetDlgItemInt(hwnd, LPTCONFIG_EDIT, data->value, FALSE); + return TRUE; + } + + if (wparam == MAKEWPARAM(IDCANCEL, BN_CLICKED)) + { + EndDialog(hwnd, FALSE); + return TRUE; + } + return FALSE; + } + return FALSE; +} + + +/***************************************************** + * get_type_from_name (internal) + * + */ + +static DWORD get_type_from_name(LPCWSTR name) +{ + HANDLE hfile; + + if (!strncmpiW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) + return PORT_IS_LPT; + + if (!strncmpiW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) + return PORT_IS_COM; + + if (!strcmpiW(name, portname_FILE)) + return PORT_IS_FILE; + + if (name[0] == '/') + return PORT_IS_UNIXNAME; + + if (name[0] == '|') + return PORT_IS_PIPE; + + if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) + return PORT_IS_CUPS; + + if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) + return PORT_IS_LPR; + + /* Must be a file or a directory. Does the file exist ? */ + hfile = CreateFileW(name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + TRACE("%p for OPEN_EXISTING on %s\n", hfile, debugstr_w(name)); + if (hfile == INVALID_HANDLE_VALUE) { + /* Can we create the file? */ + hfile = CreateFileW(name, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + TRACE("%p for OPEN_ALWAYS\n", hfile); + } + if (hfile != INVALID_HANDLE_VALUE) { + CloseHandle(hfile); + return PORT_IS_FILENAME; + } + /* We can't use the name. use GetLastError() for the reason */ + return PORT_IS_UNKNOWN; +} + +/***************************************************** + * open_monitor_by_name [internal] + * + */ +static BOOL open_monitor_by_name(LPCWSTR pPrefix, LPCWSTR pPort, HANDLE * phandle) +{ + PRINTER_DEFAULTSW pd; + LPWSTR fullname; + BOOL res; + + * phandle = 0; + TRACE("(%s,%s)\n", debugstr_w(pPrefix),debugstr_w(pPort) ); + + fullname = strdupWW(pPrefix, pPort); + pd.pDatatype = NULL; + pd.pDevMode = NULL; + pd.DesiredAccess = SERVER_ACCESS_ADMINISTER; + + res = OpenPrinterW(fullname, phandle, &pd); + HeapFree(GetProcessHeap(), 0, fullname); + return res; +} + +/***************************************************** + * localui_AddPortUI [exported through MONITORUI] + * + * Display a Dialog to add a local Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box or NULL + * pMonitorName[I] Name of the Monitor, that should be used to add a Port or NULL + * ppPortName [O] PTR to PTR of a buffer, that receive the Name of the new Port or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * The caller must free the buffer (returned in ppPortName) with GlobalFree(). + * Native localui.dll failed with ERROR_INVALID_PARAMETER, when the user tried + * to add a Port, that start with "COM" or "LPT". + * + */ +static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorName, PWSTR *ppPortName) +{ + addportui_t data; + HANDLE hXcv; + LPWSTR ptr = NULL; + DWORD needed; + DWORD dummy; + DWORD status; + DWORD res = FALSE; + + TRACE( "(%s, %p, %s, %p) (*ppPortName: %p)\n", debugstr_w(pName), hWnd, + debugstr_w(pMonitorName), ppPortName, ppPortName ? *ppPortName : NULL); + + if (open_monitor_by_name(XcvMonitorW, pMonitorName, &hXcv)) { + + ZeroMemory(&data, sizeof(addportui_t)); + data.hXcv = hXcv; + res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(ADDPORT_DIALOG), hWnd, + dlgproc_addport, (LPARAM) &data); + + TRACE("got %u with %u for %s\n", res, GetLastError(), debugstr_w(data.portname)); + + if (ppPortName) *ppPortName = NULL; + + if (res) { + res = XcvDataW(hXcv, cmd_AddPortW, (PBYTE) data.portname, + (lstrlenW(data.portname)+1) * sizeof(WCHAR), + (PBYTE) &dummy, 0, &needed, &status); + + TRACE("got %u with status %u\n", res, status); + if (res && (status == ERROR_SUCCESS)) { + /* Native localui uses GlobalAlloc also. + The caller must GlobalFree the buffer */ + ptr = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR)); + if (ptr) { + lstrcpyW(ptr, data.portname); + if (ppPortName) *ppPortName = ptr; + } + } + + if (res && (status == ERROR_ALREADY_EXISTS)) { + dlg_port_already_exists(hWnd, data.portname); + /* Native localui also return "TRUE" from AddPortUI in this case */ + } + + HeapFree(GetProcessHeap(), 0, data.portname); + } + else + { + SetLastError(ERROR_CANCELLED); + } + ClosePrinter(hXcv); + } + + TRACE("=> %u with %u\n", res, GetLastError()); + return res; +} + + +/***************************************************** + * localui_ConfigurePortUI [exported through MONITORUI] + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box or NULL + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) +{ + HANDLE hXcv; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + + res = get_type_from_name(pPortName); + switch(res) + { + + case PORT_IS_COM: + res = dlg_configure_com(hXcv, hWnd, pPortName); + break; + + case PORT_IS_LPT: + res = dlg_configure_lpt(hXcv, hWnd); + break; + + default: + dlg_nothingtoconfig(hWnd); + SetLastError(ERROR_CANCELLED); + res = FALSE; + } + + ClosePrinter(hXcv); + return res; + } + return FALSE; + +} + +/***************************************************** + * localui_DeletePortUI [exported through MONITORUI] + * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Native localui does not allow to delete a COM / LPT - Port (ERROR_NOT_SUPPORTED) + * + */ +static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) +{ + HANDLE hXcv; + DWORD dummy; + DWORD needed; + DWORD status; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); + + if ((!pPortName) || (!pPortName[0])) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (open_monitor_by_name(XcvPortW, pPortName, &hXcv)) { + /* native localui tests here for LPT / COM - Ports and failed with + ERROR_NOT_SUPPORTED. */ + if (XcvDataW(hXcv, cmd_DeletePortW, (LPBYTE) pPortName, + (lstrlenW(pPortName)+1) * sizeof(WCHAR), (LPBYTE) &dummy, 0, &needed, &status)) { + + ClosePrinter(hXcv); + if (status != ERROR_SUCCESS) SetLastError(status); + return (status == ERROR_SUCCESS); + } + ClosePrinter(hXcv); + return FALSE; + } + SetLastError(ERROR_UNKNOWN_PORT); + return FALSE; +} + +/***************************************************** + * InitializePrintMonitorUI (LOCALUI.@) + * + * Initialize the User-Interface for the Local Ports + * + * RETURNS + * Success: Pointer to a MONITORUI Structure + * Failure: NULL + * + */ + +PMONITORUI WINAPI InitializePrintMonitorUI(void) +{ + static MONITORUI mymonitorui = + { + sizeof(MONITORUI), + localui_AddPortUI, + localui_ConfigurePortUI, + localui_DeletePortUI + }; + + TRACE("=> %p\n", &mymonitorui); + return &mymonitorui; +} + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + LOCALUI_hInstance = hinstDLL; + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/localui/localui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/localui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.h (added) +++ trunk/reactos/dll/win32/localui/localui.h [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,60 @@ +/* + * internal include file of the Local Printmonitor User Interface + * + * 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 + */ + +#ifndef __WINE_LOCALUI__ +#define __WINE_LOCALUI__ + + +/* ## Resource-ID ## */ +#define ADDPORT_DIALOG 100 +#define ADDPORT_EDIT 101 + +#define LPTCONFIG_DIALOG 200 +#define LPTCONFIG_GROUP 201 +#define LPTCONFIG_EDIT 202 + +#define IDS_LOCALPORT 300 +#define IDS_INVALIDNAME 301 +#define IDS_PORTEXISTS 302 +#define IDS_NOTHINGTOCONFIG 303 + +/* ## Reserved memorysize for the strings (in WCHAR) ## */ +#define IDS_LOCALPORT_MAXLEN 32 +#define IDS_INVALIDNAME_MAXLEN 48 +#define IDS_PORTEXISTS_MAXLEN 48 +#define IDS_NOTHINGTOCONFIG_MAXLEN 80 + +/* ## Type of Ports ## */ +/* windows types */ +#define PORT_IS_UNKNOWN 0 +#define PORT_IS_LPT 1 +#define PORT_IS_COM 2 +#define PORT_IS_FILE 3 +#define PORT_IS_FILENAME 4 + +/* wine extensions */ +#define PORT_IS_WINE 5 +#define PORT_IS_UNIXNAME 5 +#define PORT_IS_PIPE 6 +#define PORT_IS_CUPS 7 +#define PORT_IS_LPR 8 + + +#endif /* __WINE_LOCALUI__ */ Propchange: trunk/reactos/dll/win32/localui/localui.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/localui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rbuild (added) +++ trunk/reactos/dll/win32/localui/localui.rbuild [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="localui" type="win32dll" baseaddress="${BASEADDRESS_LOCALUI}" installbase="system32" installname="localui.dll" allowwarnings="true"> + <importlibrary definition="localui.spec" /> + <include base="localui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>localui.c</file> + <file>localui.rc</file> + <library>wine</library> + <library>winspool</library> + <library>user32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/localui/localui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/localui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.rc (added) +++ trunk/reactos/dll/win32/localui/localui.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Top level resource file for localui + * + * 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 "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" +#include "localui.h" + +#define WINE_FILENAME_STR "localui.dll" +#define WINE_FILEDESCRIPTION_STR "User Interface for the Local Monitor" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" + + +#include "ui_Da.rc" +#include "ui_De.rc" +#include "ui_En.rc" +#include "ui_Fr.rc" +#include "ui_Ko.rc" +#include "ui_Nl.rc" +#include "ui_No.rc" +#include "ui_Pl.rc" +#include "ui_Pt.rc" +#include "ui_Ro.rc" +#include "ui_Ru.rc" +#include "ui_Si.rc" +#include "ui_Sv.rc" +#include "ui_Zh.rc" Propchange: trunk/reactos/dll/win32/localui/localui.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/localui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/localui.… ============================================================================== --- trunk/reactos/dll/win32/localui/localui.spec (added) +++ trunk/reactos/dll/win32/localui/localui.spec [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,1 @@ +@ stdcall InitializePrintMonitorUI() Propchange: trunk/reactos/dll/win32/localui/localui.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Da.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Da.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Da.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Danish resources for localui + * + * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * 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 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Opret en lokal port" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Skriv navnet på den nye port:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Annuller", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Opsæt LPT port" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Timeout (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Transmission retry:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annuller", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "'%s' er ikke et gyldigt port navn" + IDS_PORTEXISTS "Porten %s findes allerede" + IDS_NOTHINGTOCONFIG "Denne port har ingen indstillinger" +} Propchange: trunk/reactos/dll/win32/localui/ui_Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_De.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_De.rc (added) +++ trunk/reactos/dll/win32/localui/ui_De.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * German resources for localui + * + * 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 + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Lokalen Anschluss hinzufügen" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Lokaler Anschuss, der hinzugefügt werden soll:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 188, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 188, 27, 50, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "LPT-Anschluss konfigurieren" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Zeitüberschreitung (Sekunden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "Ü&bertragung wiederholen:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Abbrechen", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokaler Anschluss" + IDS_INVALIDNAME "'%s' ist kein gültiger Anschlussname" + IDS_PORTEXISTS "Der Anschluss %s existiert bereits" + IDS_NOTHINGTOCONFIG "Dieser Anschluss hat keine Optionen zum Konfigurieren" +} Propchange: trunk/reactos/dll/win32/localui/ui_De.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_En.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_En.rc (added) +++ trunk/reactos/dll/win32/localui/ui_En.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * English resources for localui + * + * 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 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add a Local Port" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Enter the port name to add:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configure LPT Port" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Timeout (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Transmission Retry:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Local Port" + IDS_INVALIDNAME "'%s' is not a valid port name" + IDS_PORTEXISTS "Port %s already exists" + IDS_NOTHINGTOCONFIG "This port has no options to configure" +} Propchange: trunk/reactos/dll/win32/localui/ui_En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Fr.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Fr.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Fr.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,57 @@ +/* + * French resources for localui + * + * Copyright 2007 JonathanÂ Ernst + * + * 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 + */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ajouter un port local" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Saisisser le nom du port Ã ajouterÂ :", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configurer un port LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "DÃ©lai (en secondes)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Essais de retransmissionÂ :", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port local" + IDS_INVALIDNAME "Â«Â %sÂ Â» n'est pas un nom de port valide" + IDS_PORTEXISTS "Le port %s existe dÃ©jÃ " + IDS_NOTHINGTOCONFIG "Ce port n'a pas d'options de configuration" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/localui/ui_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ko.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,55 @@ +/* + * Korean resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2007 YunSong Hwang(È²À±¼º)(hys545(a)dreamwiz.com) + * + * 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 + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Áö¿ª Æ÷Æ® ´õÇÏ±â" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "´õÇÒ Æ÷Æ® ÀÌ¸§ ÀÔ·Â(&E):", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "È®ÀÎ", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "LPT Æ÷Æ® ¼³Á¤" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "½Ã°£ÃÊ°ú(ÃÊ)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "Àç Àü¼Û È½¼ö(&T):", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "È®ÀÎ", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Áö¿ª Æ÷Æ®" + IDS_INVALIDNAME "'%s'´Â ¿Ã¹Ù¸¥ Æ÷Æ® ÀÌ¸§ÀÌ ¾Æ´Õ´Ï´Ù" + IDS_PORTEXISTS "Æ÷Æ® %s´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù" + IDS_NOTHINGTOCONFIG "ÀÌ Æ÷Æ®´Â ¼³Á¤ÇÒ ¿É¼ÇÀÌ ¾ø½À´Ï´Ù" +} Propchange: trunk/reactos/dll/win32/localui/ui_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Nl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Nl.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Nl.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Dutch resources for localui + * + * Copyright 2008 Frans Kool + * + * 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 + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Voeg een Lokale Poort toe" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Voer de toe te voegen poort naam in:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Annuleren", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configureer LPT Poort" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Timeout (seconden)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Transmissie Herstart:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Annuleren", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokale Poort" + IDS_INVALIDNAME "'%s' is geen valide poort naam" + IDS_PORTEXISTS "Poort %s bestaat reeds" + IDS_NOTHINGTOCONFIG "Deze poort heeft geen opties om in te stellen" +} Propchange: trunk/reactos/dll/win32/localui/ui_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_No.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_No.rc (added) +++ trunk/reactos/dll/win32/localui/ui_No.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Norwegian Bokmål resources for localui + * + * Copyright 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * 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 + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Legg til en lokal port" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Skriv inn navn&et på den nye porten:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Oppsett av LPT-port" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tidsavbrudd (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "Prøv å sende på nyt&t:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "«%s» er ikke et gyldig portnavn" + IDS_PORTEXISTS "Porten %s finnes allerede" + IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" +} Propchange: trunk/reactos/dll/win32/localui/ui_No.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pl.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pl.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Pl.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,55 @@ +/* + * Polish resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2007 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj port lokalny" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa nowego portu:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Konfiguracja portu LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Czasy oczekiwania (sekundy)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponowienie transmisji:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "&OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port lokalny" + IDS_INVALIDNAME "'%s' nie jest poprawn¹ nazw¹ portu" + IDS_PORTEXISTS "Port %s ju¿ istnieje" + IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" +} Propchange: trunk/reactos/dll/win32/localui/ui_Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Pt.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Pt.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Pt.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Portuguese resources for localui + * + * Copyright 2008 Ricardo Filipe + * + * 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 + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Adicionar uma porta local" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Introduza o nome da porta a adicionar:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configurar porta LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tempo expirado (segundos)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Recomeço da transmissão:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Porta Local" + IDS_INVALIDNAME "'%s' não é um nome de porta válido" + IDS_PORTEXISTS "Porta %s já existe" + IDS_NOTHINGTOCONFIG "Esta porta não possui opções de configuração" +} Propchange: trunk/reactos/dll/win32/localui/ui_Pt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ro.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ro.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Ro.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,57 @@ +/* + * Copyright 2007 Detlef Riekenberg + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "AdaugÄ un port local" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nume port de adÄugat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "RenunÈÄ", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configurare port LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Temporizare (secunde)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "ReÃ®ncearcÄ &transmisia:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "RenunÈÄ", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port local" + IDS_INVALIDNAME "'%s' nu este un nume valid de port" + IDS_PORTEXISTS "Portul %s existsÄ deja" + IDS_NOTHINGTOCONFIG "Acest port nu are opÈiuni de configurat" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/localui/ui_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ru.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ru.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Ru.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Russian resources for localui + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîáàâèòü ëîêàëüíûé ïîðò" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ââåäèòå &íàçâàíèå ëîêàëüíîãî ïîðòà:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Îòìåíèòü", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óñòàíîâêè ïàðàëëåëüíîãî ïîðòà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Òàéì-àóò (ñåêóíä)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ïîïûòîê ïåðåñûëêè:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Îòìåíà", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Ëîêàëüíûé ïîðò" + IDS_INVALIDNAME "Íå ïðàâèëüíîå íàçâàíèå ïîðòà '%s'" + IDS_PORTEXISTS "Ïîðò '%s' óæå ñóùåñòâóåò" + IDS_NOTHINGTOCONFIG "Ýòîò ïîðò íå èìååò íàñòðîåê" +} Propchange: trunk/reactos/dll/win32/localui/ui_Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Si.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Si.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Si.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,58 @@ +/* + * Slovenian resources for localui + * + * Copyright 2008 Rok Mandeljc + * + * 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 + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj lokalna vrata" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ime vrat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "V redu", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "PrekliÄi", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Nastavitev LPT vrat" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äasovna omejitev (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponoven poskus prenosa:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "V redu", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "PrekliÄi", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokalna vrata" + IDS_INVALIDNAME "'%s' ni veljavno ime vrat" + IDS_PORTEXISTS "Vrata z imenom %s Å¾e obstajajo" + IDS_NOTHINGTOCONFIG "Ta vrata nimajo moÅ¾nosti nastavitve" +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/localui/ui_Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Sv.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Sv.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Sv.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,54 @@ +/* + * Swedish resources for localui + * + * Copyright 2007 Daniel Nylander + * + * 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 + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Lägg till en lokal port" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ange portnamnet att lägga till:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Konfigurera LPT-port" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tidsgräns (sekunder)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "Öve&rföringsförsök:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Avbryt", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_INVALIDNAME "'%s' är inte ett giltigt portnamn" + IDS_PORTEXISTS "Porten %s finns redan" + IDS_NOTHINGTOCONFIG "Denna port har inga alternativ att konfigurera" +} Propchange: trunk/reactos/dll/win32/localui/ui_Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Zh.rc (added) +++ trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -1,0 +1,94 @@ +/* + * localui (Simplified and Traditional Chinese Resources) + * + * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * + * 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 + */ + +/* Chinese text is encoded in UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "æ·»å æ¬å°ç«¯å£" +FONT 9, "MS Song" +BEGIN + LTEXT "æ·»å æ¬å°ç«¯å£åç§°(&E):", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "ç¡®å®", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "åæ¶", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "è®¾ç½®æå°ç«¯å£" +FONT 9, "MS Song" +BEGIN + GROUPBOX "è¶æ¶(ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "éè¯éè®¯(&T):", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "ç¡®å®", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "åæ¶", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "æ¬å°ç«¯å£" + IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç§°" + IDS_PORTEXISTS "ç«¯å£ %s å·²ç»åå¨" + IDS_NOTHINGTOCONFIG "è¿ä¸ªç«¯å£æ²¡æå¯è®¾ç½®éé¡¹" +} + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "æ·»å æ¬å°ç«¯å£" +FONT 8, "PMingLiu" +BEGIN + LTEXT "æ·»å æ¬å°ç«¯å£åç¨±(&E):", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "ç¢ºå®", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "åæ¶", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "è¨å®åå°ç«¯å£" +FONT 8, "PMingLiu" +BEGIN + GROUPBOX "è¶æ(ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "éè©¦éè¨(&T):", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "ç¢ºå®", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "åæ¶", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "æ¬å°ç«¯å£" + IDS_INVALIDNAME "'%s' ä¸æ¯ææçç«¯å£åç¨±" + IDS_PORTEXISTS "ç«¯å£ %s å·²ç¶åå¨" + IDS_NOTHINGTOCONFIG "éåç«¯å£æ²æå¯è¨å®é¸é " +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/localui/ui_Zh.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -136,6 +136,9 @@ <directory name="kernel32"> <xi:include href="kernel32/kernel32.rbuild" /> </directory> +<directory name="localui"> + <xi:include href="localui/localui.rbuild" /> +</directory> <directory name="lpk"> <xi:include href="lpk/lpk.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Dec 6 06:09:14 2008 @@ -56,6 +56,7 @@ reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/inetmib1 # Autosync reactos/dll/win32/iphlpapi # Out of sync +reactos/dll/win32/localui # Autosync reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/mlang # Autosync

15 years, 9 months

[dchapyshev] 37892: - Update headers - Add more stubs for winspool

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Dec 6 05:18:08 2008 New Revision: 37892 URL: http://svn.reactos.org/svn/reactos?rev=37892&view=rev Log: - Update headers - Add more stubs for winspool Added: trunk/reactos/include/ddk/winsplp.h (with props) Modified: trunk/reactos/dll/win32/winspool/stubs.c trunk/reactos/dll/win32/winspool/winspool.spec trunk/reactos/include/psdk/winspool.h Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Sat Dec 6 05:18:08 2008 @@ -1453,3 +1453,292 @@ return FALSE; } + + +/* + * @unimplemented + */ +BOOL +WINAPI +XcvDataW(HANDLE hXcv, + LPCWSTR pszDataName, + PBYTE pInputData, + DWORD cbInputData, + PBYTE pOutputData, + DWORD cbOutputData, + PDWORD pcbOutputNeeded, + PDWORD pdwStatus) +{ + OutputDebugStringW(L"winspool XcvDataW stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetDefaultPrinterA(LPCSTR pszPrinter) +{ + OutputDebugStringW(L"winspool SetDefaultPrinterA stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetDefaultPrinterW(LPCWSTR pszPrinter) +{ + OutputDebugStringW(L"winspool SetDefaultPrinterW stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +AddPortExA(LPSTR pName, + DWORD dwLevel, + LPBYTE pBuffer, + LPSTR pMonitorName) +{ + OutputDebugStringW(L"winspool AddPortExA stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +AddPortExW(LPWSTR pName, + DWORD dwLevel, + LPBYTE pBuffer, + LPWSTR pMonitorName) +{ + OutputDebugStringW(L"winspool AddPortExW stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +AddPrinterDriverExA(LPSTR pName, + DWORD dwLevel, + LPBYTE pDriverInfo, + DWORD dwFileCopyFlags) +{ + OutputDebugStringW(L"winspool AddPrinterDriverExA stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +AddPrinterDriverExW(LPWSTR pName, + DWORD dwLevel, + LPBYTE pDriverInfo, + DWORD dwFileCopyFlags) +{ + OutputDebugStringW(L"winspool AddPrinterDriverExW stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +DeletePrinterDataExA(HANDLE hPrinter, + LPCSTR pKeyName, + LPCSTR pValueName) +{ + OutputDebugStringW(L"winspool DeletePrinterDataExA stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +DeletePrinterDataExW(HANDLE hPrinter, + LPCWSTR pKeyName, + LPCWSTR pValueName) +{ + OutputDebugStringW(L"winspool DeletePrinterDataExW stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +DeletePrinterDriverExA(LPSTR pName, + LPSTR pEnvironment, + LPSTR pDriverName, + DWORD dwDeleteFlag, + DWORD dwVersionFlag) +{ + OutputDebugStringW(L"winspool DeletePrinterDriverExA stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +DeletePrinterDriverExW(LPWSTR pName, + LPWSTR pEnvironment, + LPWSTR pDriverName, + DWORD dwDeleteFlag, + DWORD dwVersionFlag) +{ + OutputDebugStringW(L"winspool DeletePrinterDriverExW stub called\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +EnumPrinterDataExA(HANDLE hPrinter, + LPCSTR pKeyName, + LPBYTE pEnumValues, + DWORD cbEnumValues, + LPDWORD pcbEnumValues, + LPDWORD pnEnumValues) +{ + OutputDebugStringW(L"winspool EnumPrinterDataExA stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +EnumPrinterDataExW(HANDLE hPrinter, + LPCWSTR pKeyName, + LPBYTE pEnumValues, + DWORD cbEnumValues, + LPDWORD pcbEnumValues, + LPDWORD pnEnumValues) +{ + OutputDebugStringW(L"winspool EnumPrinterDataExW stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +LONG +WINAPI +ExtDeviceMode(HWND hWnd, + HANDLE hInst, + LPDEVMODEA pDevModeOutput, + LPSTR pDeviceName, + LPSTR pPort, + LPDEVMODEA pDevModeInput, + LPSTR pProfile, + DWORD fMode) +{ + OutputDebugStringW(L"winspool ExtDeviceMode stub called\n"); + return -1; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +GetPrinterDataExA(HANDLE hPrinter, + LPCSTR pKeyName, + LPCSTR pValueName, + LPDWORD pType, + LPBYTE pData, + DWORD nSize, + LPDWORD pcbNeeded) +{ + OutputDebugStringW(L"winspool GetPrinterDataExA stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +GetPrinterDataExW(HANDLE hPrinter, + LPCWSTR pKeyName, + LPCWSTR pValueName, + LPDWORD pType, + LPBYTE pData, + DWORD nSize, + LPDWORD pcbNeeded) +{ + OutputDebugStringW(L"winspool GetPrinterDataExW stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +SetPrinterDataExA(HANDLE hPrinter, + LPCSTR pKeyName, + LPCSTR pValueName, + DWORD dwType, + LPBYTE pData, + DWORD cbData) +{ + OutputDebugStringW(L"winspool SetPrinterDataExA stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +DWORD +WINAPI +SetPrinterDataExW(HANDLE hPrinter, + LPCWSTR pKeyName, + LPCWSTR pValueName, + DWORD dwType, + LPBYTE pData, + DWORD cbData) +{ + OutputDebugStringW(L"winspool SetPrinterDataExW stub called\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SpoolerInit(VOID) +{ + OutputDebugStringW(L"winspool SpoolerInit stub called\n"); + return FALSE; +} Modified: trunk/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] Sat Dec 6 05:18:08 2008 @@ -1,3 +1,43 @@ +100 stub -noname EnumPrinterPropertySheets +101 stub -noname ClusterSplOpen +102 stub -noname ClusterSplClose +103 stub -noname ClusterSplIsAlive +104 stub PerfClose +105 stub PerfCollect +106 stub PerfOpen +201 stdcall GetDefaultPrinterA(ptr ptr) +202 stdcall SetDefaultPrinterA(str) +203 stdcall GetDefaultPrinterW(ptr ptr) +204 stdcall SetDefaultPrinterW(wstr) +205 stub -noname SplReadPrinter +206 stub -noname AddPerMachineConnectionA +207 stub -noname AddPerMachineConnectionW +208 stub -noname DeletePerMachineConnectionA +209 stub -noname DeletePerMachineConnectionW +210 stub -noname EnumPerMachineConnectionsA +211 stub -noname EnumPerMachineConnectionsW +212 stub -noname LoadPrinterDriver +213 stub -noname RefCntLoadDriver +214 stub -noname RefCntUnloadDriver +215 stub -noname ForceUnloadDriver +216 stub -noname PublishPrinterA +217 stub -noname PublishPrinterW +218 stub -noname CallCommonPropertySheetUI +219 stub -noname PrintUIQueueCreate +220 stub -noname PrintUIPrinterPropPages +221 stub -noname PrintUIDocumentDefaults +222 stub -noname SendRecvBidiData +223 stub -noname RouterFreeBidiResponseContainer +224 stub -noname ExternalConnectToLd64In32Server +226 stub -noname PrintUIWebPnpEntry +227 stub -noname PrintUIWebPnpPostEntry +228 stub -noname PrintUICreateInstance +229 stub -noname PrintUIDocumentPropertiesWrap +230 stub -noname PrintUIPrinterSetup +231 stub -noname PrintUIServerPropPages +232 stub -noname AddDriverCatalog + +@ stub ADVANCEDSETUPDIALOG @ stdcall AbortPrinter(long) @ stdcall AddFormA(long long ptr) @ stdcall AddFormW(long long ptr) @@ -6,11 +46,15 @@ @ stdcall AddMonitorA(str long ptr) @ stdcall AddMonitorW(wstr long ptr) @ stdcall AddPortA(str ptr str) +@ stdcall AddPortExA(str long ptr str) +@ stdcall AddPortExW(wstr long ptr wstr) @ stdcall AddPortW(wstr long wstr) @ stdcall AddPrinterA(str long ptr) @ stdcall AddPrinterConnectionA(str) @ stdcall AddPrinterConnectionW(wstr) @ stdcall AddPrinterDriverA(str long ptr) +@ stdcall AddPrinterDriverExA(str long ptr long) +@ stdcall AddPrinterDriverExW(wstr long ptr long) @ stdcall AddPrinterDriverW(wstr long ptr) @ stdcall AddPrinterW(wstr long ptr) @ stdcall AddPrintProcessorA(str str str str) @@ -19,10 +63,16 @@ @ stdcall AddPrintProvidorW(wstr long ptr) @ stdcall AdvancedDocumentPropertiesA(long long str ptr ptr) @ stdcall AdvancedDocumentPropertiesW(long long wstr ptr ptr) +@ stub AdvancedSetupDialog @ stdcall ClosePrinter(long) @ stdcall ConfigurePortA(str long str) @ stdcall ConfigurePortW(wstr long wstr) @ stdcall ConnectToPrinterDlg(long long) +@ stub ConvertAnsiDevModeToUnicodeDevMode +@ stub ConvertUnicodeDevModeToAnsiDevMode +@ stub CreatePrinterIC +@ stub DEVICECAPABILITIES +@ stub DEVICEMODE @ stdcall DeleteFormA(long str) @ stdcall DeleteFormW(long wstr) @ stdcall DeleteMonitorA(str str str) @@ -32,19 +82,28 @@ @ stdcall DeletePrinter(long) @ stdcall DeletePrinterConnectionA(str) @ stdcall DeletePrinterConnectionW(wstr) +@ stdcall DeletePrinterDataExA(long str str) +@ stdcall DeletePrinterDataExW(long wstr wstr) @ stdcall DeletePrinterDataA(ptr str) @ stdcall DeletePrinterDataW(ptr wstr) @ stdcall DeletePrinterDriverA(str str str) +@ stdcall DeletePrinterDriverExA(str str str long long) +@ stdcall DeletePrinterDriverExW(wstr wstr wstr long long) @ stdcall DeletePrinterDriverW(wstr wstr wstr) +@ stub DeletePrinterIC +@ stub DevQueryPrint @ stdcall DeletePrintProcessorA(str str str) @ stdcall DeletePrintProcessorW(wstr wstr wstr) @ stdcall DeletePrintProvidorA(str str str) @ stdcall DeletePrintProvidorW(wstr wstr wstr) @ stdcall DeviceCapabilitiesA(str str long ptr ptr) @ stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) +@ stub DeviceMode +@ stub DocumentEvent @ stdcall DllMain(ptr long ptr) @ stdcall DocumentPropertiesA(long long ptr ptr ptr long) @ stdcall DocumentPropertiesW(long long ptr ptr ptr long) +@ stub EXTDEVICEMODE @ stdcall EndDocPrinter(long) @ stdcall EndPagePrinter(long) @ stdcall EnumFormsA(long long ptr long ptr ptr) @@ -56,11 +115,14 @@ @ stdcall EnumPortsA(str long ptr ptr ptr ptr) @ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) @ stdcall EnumPrinterDataA(long long ptr long ptr ptr ptr long ptr) +@ stdcall EnumPrinterDataExA(long str ptr long ptr ptr) +@ stdcall EnumPrinterDataExW(long wstr ptr long ptr ptr) @ stdcall EnumPrinterDataW(long long ptr long ptr ptr ptr long ptr) @ stdcall EnumPrinterDriversA(str str long ptr long ptr ptr) @ stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) @ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) @ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stdcall ExtDeviceMode(long long ptr str str ptr str long) @ stdcall EnumPrintProcessorDatatypesA(str str long ptr long ptr ptr) @ stdcall EnumPrintProcessorDatatypesW(wstr wstr long ptr long ptr ptr) @ stdcall EnumPrintProcessorsA(str str long ptr long ptr ptr) @@ -69,14 +131,14 @@ @ stdcall FindFirstPrinterChangeNotification(long long long ptr) @ stdcall FindNextPrinterChangeNotification(long ptr ptr ptr) @ stdcall FreePrinterNotifyInfo(ptr) -201 stdcall GetDefaultPrinterA(ptr ptr) -203 stdcall GetDefaultPrinterW(ptr ptr) @ stdcall GetFormA(long str long ptr long ptr) @ stdcall GetFormW(long wstr long ptr long ptr) @ stdcall GetJobA(long long long ptr long ptr) @ stdcall GetJobW(long long long ptr long ptr) @ stdcall GetPrinterA(long long ptr long ptr) @ stdcall GetPrinterDataA(long str ptr ptr long ptr) +@ stdcall GetPrinterDataExA(long str str ptr ptr long ptr) +@ stdcall GetPrinterDataExW(long wstr wstr ptr ptr long ptr) @ stdcall GetPrinterDataW(long wstr ptr ptr long ptr) @ stdcall GetPrinterDriverA(long str long ptr long ptr) @ stdcall GetPrinterDriverDirectoryA(str str long ptr long ptr) @@ -87,6 +149,7 @@ @ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stub PlayGdiScriptOnPrinterIC @ stdcall PrinterMessageBoxA(ptr long ptr str str long) @ stdcall PrinterMessageBoxW(ptr long ptr wstr wstr long) @ stdcall PrinterProperties(long long) @@ -94,16 +157,23 @@ @ stdcall ResetPrinterA(long ptr) @ stdcall ResetPrinterW(long ptr) @ stdcall ScheduleJob(long long) +@ stub SetAllocFailCount @ stdcall SetFormA(long str long ptr) @ stdcall SetFormW(long wstr long ptr) @ stdcall SetJobA(long long long ptr long) @ stdcall SetJobW(long long long ptr long) @ stdcall SetPrinterA(long long ptr long) @ stdcall SetPrinterDataA(long str long ptr long) +@ stdcall SetPrinterDataExA(long str str long ptr long) +@ stdcall SetPrinterDataExW(long wstr wstr long ptr long) @ stdcall SetPrinterDataW(long wstr long ptr long) @ stdcall SetPrinterW(long long ptr long) +@ stub SpoolerDevQueryPrintW +@ stdcall SpoolerInit() +@ stub SpoolerPrinterEvent @ stdcall StartDocPrinterA(long long ptr) @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) @ stdcall WaitForPrinterChange(ptr long) @ stdcall WritePrinter(long ptr long ptr) +@ stdcall XcvDataW(long wstr ptr long ptr long ptr ptr) Added: trunk/reactos/include/ddk/winsplp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winsplp.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/winsplp.h (added) +++ trunk/reactos/include/ddk/winsplp.h [iso-8859-1] Sat Dec 6 05:18:08 2008 @@ -1,0 +1,428 @@ +/* + * Definitions for print provider, monitor, processor and spooler + * + * Copyright 2005 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 + * + * + * "providor" is not a spelling error in this file. It's the real name. + * + */ + +#ifndef _WINSPLP_ +#define _WINSPLP_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* DEFINES */ + +#define PRINTER_NOTIFY_STATUS_ENDPOINT 1 +#define PRINTER_NOTIFY_STATUS_POLL 2 +#define PRINTER_NOTIFY_STATUS_INFO 4 + + +#define ROUTER_UNKNOWN 0 +#define ROUTER_SUCCESS 1 +#define ROUTER_STOP_ROUTING 2 + +/* + * WARNING: Many Functions are declared as "BOOL", but return ROUTER_* + */ + + +/* TYPES */ + +typedef struct _MONITOR { + BOOL (WINAPI *pfnEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); + BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); + BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, + PHANDLE pHandle, struct _MONITOR *pMonitor); + BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, + DWORD JobId, DWORD Level, LPBYTE pDocInfo); + BOOL (WINAPI *pfnWritePort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, + LPDWORD pcbWritten); + BOOL (WINAPI *pfnReadPort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuffer, + LPDWORD pcbRead); + BOOL (WINAPI *pfnEndDocPort)(HANDLE hPort); + BOOL (WINAPI *pfnClosePort)(HANDLE hPort); + BOOL (WINAPI *pfnAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); + BOOL (WINAPI *pfnAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, + LPWSTR lpMonitorName); + BOOL (WINAPI *pfnConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *pfnDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *pfnGetPrinterDataFromPort)(HANDLE hPort, DWORD ControlID, + LPWSTR pValueName, LPWSTR lpInBuffer, DWORD cbInBuffer, + LPWSTR lpOutBuffer, DWORD cbOutBuffer, LPDWORD lpcbReturned); + BOOL (WINAPI *pfnSetPortTimeOuts)(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, + DWORD reserved); + BOOL (WINAPI *pfnXcvOpenPort)(LPCWSTR pszObject, ACCESS_MASK GrantedAccess, PHANDLE phXcv); + DWORD (WINAPI *pfnXcvDataPort)(HANDLE hXcv, LPCWSTR pszDataName, + PBYTE pInputData, DWORD cbInputData, + PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded); + BOOL (WINAPI *pfnXcvClosePort)(HANDLE hXcv); +} MONITOR, *LPMONITOR; + +typedef struct _MONITOR2 { + DWORD cbSize; + BOOL (WINAPI *pfnEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); + BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); + BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, + PHANDLE pHandle, struct _MONITOR2 *pMonitor2); + BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, + DWORD JobId, DWORD Level, LPBYTE pDocInfo); + BOOL (WINAPI *pfnWritePort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, + LPDWORD pcbWritten); + BOOL (WINAPI *pfnReadPort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuffer, + LPDWORD pcbRead); + BOOL (WINAPI *pfnEndDocPort)(HANDLE hPort); + BOOL (WINAPI *pfnClosePort)(HANDLE hPort); + BOOL (WINAPI *pfnAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); + BOOL (WINAPI *pfnAddPortEx)(LPWSTR pName, DWORD Level, LPBYTE lpBuffer, + LPWSTR lpMonitorName); + BOOL (WINAPI *pfnConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *pfnDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *pfnGetPrinterDataFromPort)(HANDLE hPort, DWORD ControlID, + LPWSTR pValueName, LPWSTR lpInBuffer, DWORD cbInBuffer, + LPWSTR lpOutBuffer, DWORD cbOutBuffer, LPDWORD lpcbReturned); + BOOL (WINAPI *pfnSetPortTimeOuts)(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, + DWORD reserved); + BOOL (WINAPI *pfnXcvOpenPort)(HANDLE hMonitor, LPCWSTR pszObject, + ACCESS_MASK GrantedAccess, PHANDLE phXcv); + DWORD (WINAPI *pfnXcvDataPort)(HANDLE hXcv, LPCWSTR pszDataName, + PBYTE pInputData, DWORD cbInputData, + PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded); + BOOL (WINAPI *pfnXcvClosePort)(HANDLE hXcv); + /* Additions from MONITOR to MONITOR2 */ + VOID (WINAPI *pfnShutdown)(HANDLE hMonitor); + DWORD (WINAPI *pfnSendRecvBidiDataFromPort)(HANDLE hPort, DWORD dwAccessBit, + LPCWSTR pAction, PBIDI_REQUEST_CONTAINER pReqData, + PBIDI_RESPONSE_CONTAINER *ppResData); +} MONITOR2, *LPMONITOR2, *PMONITOR2; + +typedef struct _MONITOREX { + DWORD dwMonitorSize; + MONITOR Monitor; +} MONITOREX, *LPMONITOREX; + +typedef struct _MONITORREG { + DWORD cbSize; + LONG (WINAPI *fpCreateKey)(HANDLE hcKey, LPCWSTR pszSubKey, DWORD dwOptions, + REGSAM samDesired, PSECURITY_ATTRIBUTES pSecurityAttributes, + PHANDLE phckResult, PDWORD pdwDisposition, HANDLE hSpooler); + LONG (WINAPI *fpOpenKey)(HANDLE hcKey, LPCWSTR pszSubKey, REGSAM samDesired, + PHANDLE phkResult, HANDLE hSpooler); + LONG (WINAPI *fpCloseKey)(HANDLE hcKey, HANDLE hSpooler); + LONG (WINAPI *fpDeleteKey)(HANDLE hcKey, LPCWSTR pszSubKey, HANDLE hSpooler); + LONG (WINAPI *fpEnumKey)(HANDLE hcKey, DWORD dwIndex, LPWSTR pszName, + PDWORD pcchName, PFILETIME pftLastWriteTime, HANDLE hSpooler); + LONG (WINAPI *fpQueryInfoKey)(HANDLE hcKey, PDWORD pcSubKeys, PDWORD pcbKey, + PDWORD pcValues, PDWORD pcbValue, PDWORD pcbData, + PDWORD pcbSecurityDescriptor, PFILETIME pftLastWriteTime, + HANDLE hSpooler); + LONG (WINAPI *fpSetValue)(HANDLE hcKey, LPCWSTR pszValue, DWORD dwType, + const BYTE* pData, DWORD cbData, HANDLE hSpooler); + LONG (WINAPI *fpDeleteValue)(HANDLE hcKey, LPCWSTR pszValue, HANDLE hSpooler); + LONG (WINAPI *fpEnumValue)(HANDLE hcKey, DWORD dwIndex, LPWSTR pszValue, + PDWORD pcbValue, PDWORD pType, PBYTE pData, PDWORD pcbData, + HANDLE hSpooler); + LONG (WINAPI *fpQueryValue)(HANDLE hcKey, LPCWSTR pszValue, PDWORD pType, + PBYTE pData, PDWORD pcbData, HANDLE hSpooler); +} MONITORREG, *PMONITORREG; + +typedef struct _MONITORINIT { + DWORD cbSize; + HANDLE hSpooler; + HANDLE hckRegistryRoot; + PMONITORREG pMonitorReg; + BOOL bLocal; +} MONITORINIT, *PMONITORINIT; + +typedef struct _MONITORUI { + DWORD dwMonitorUISize; + BOOL (WINAPI *pfnAddPortUI)(PCWSTR pszServer, HWND hWnd, + PCWSTR pszPortNameIn, PWSTR *ppszPortNameOut); + BOOL (WINAPI *pfnConfigurePortUI)(PCWSTR pName, HWND hWnd, PCWSTR pPortName); + BOOL (WINAPI *pfnDeletePortUI)(PCWSTR pszServer, HWND hWnd, PCWSTR pszPortName); +}MONITORUI, *PMONITORUI; + +typedef struct _PRINTER_NOTIFY_INIT { + DWORD Size; + DWORD Reserved; + DWORD PollTime; +} PRINTER_NOTIFY_INIT, *LPPRINTER_NOTIFY_INIT, *PPRINTER_NOTIFY_INIT; + +typedef struct _PRINTPROCESSOROPENDATA { + PDEVMODEW pDevMode; + LPWSTR pDatatype; + LPWSTR pParameters; + LPWSTR pDocumentName; + DWORD JobId; + LPWSTR pOutputFile; + LPWSTR pPrinterName; +} PRINTPROCESSOROPENDATA, *LPPRINTPROCESSOROPENDATA, *PPRINTPROCESSOROPENDATA; + + +/* + * WARNING: Many Functions are declared as "BOOL", but return ROUTER_* + */ + +typedef struct _PRINTPROVIDOR { + BOOL (WINAPI *fpOpenPrinter)(LPWSTR lpPrinterName, HANDLE *phPrinter, + LPPRINTER_DEFAULTSW pDefault); + BOOL (WINAPI *fpSetJob)(HANDLE hPrinter, DWORD JobID, DWORD Level, + LPBYTE pJob, DWORD Command); + BOOL (WINAPI *fpGetJob)(HANDLE hPrinter, DWORD JobID, DWORD Level, + LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded); + BOOL (WINAPI *fpEnumJobs)(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, + DWORD Level, LPBYTE pJob, DWORD cbBuf, LPDWORD pcbNeeded, + LPDWORD pcReturned); + HANDLE (WINAPI *fpAddPrinter)(LPWSTR pName, DWORD Level, LPBYTE pPrinter); + BOOL (WINAPI *fpDeletePrinter)(HANDLE hPrinter); + BOOL (WINAPI *fpSetPrinter)(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, + DWORD Command); + BOOL (WINAPI *fpGetPrinter)(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, + DWORD cbBuf, LPDWORD pcbNeeded); + BOOL (WINAPI *fpEnumPrinters)(DWORD dwType, LPWSTR lpszName, DWORD dwLevel, + LPBYTE lpbPrinters, DWORD cbBuf, LPDWORD lpdwNeeded, + LPDWORD lpdwReturned); + BOOL (WINAPI *fpAddPrinterDriver)(LPWSTR pName, DWORD Level, + LPBYTE pDriverInfo); + BOOL (WINAPI *fpEnumPrinterDrivers)(LPWSTR pName, LPWSTR pEnvironment, + DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcbReturned); + BOOL (WINAPI *fpGetPrinterDriver)(HANDLE hPrinter, LPWSTR pEnvironment, + DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, + LPDWORD pcbNeeded); + BOOL (WINAPI *fpGetPrinterDriverDirectory)(LPWSTR pName, LPWSTR pEnvironment, + DWORD Level, LPBYTE pDriverDirectory, DWORD cbBuf, + LPDWORD pcbNeeded); + BOOL (WINAPI *fpDeletePrinterDriver)(LPWSTR pName, LPWSTR pEnvironment, + LPWSTR pDriverName); + BOOL (WINAPI *fpAddPrintProcessor)(LPWSTR pName, LPWSTR pEnvironment, + LPWSTR pPathName, LPWSTR pPrintProcessorName); + BOOL (WINAPI *fpEnumPrintProcessors)(LPWSTR pName, LPWSTR pEnvironment, + DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, + LPDWORD pcbNeeded, LPDWORD pcbReturned); + BOOL (WINAPI *fpGetPrintProcessorDirectory)(LPWSTR pName, LPWSTR pEnvironment, + DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, + LPDWORD pcbNeeded); + BOOL (WINAPI *fpDeletePrintProcessor)(LPWSTR pName, LPWSTR pEnvironment, + LPWSTR pPrintProcessorName); + BOOL (WINAPI *fpEnumPrintProcessorDatatypes)(LPWSTR pName, + LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcbReturned); + DWORD (WINAPI *fpStartDocPrinter)(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo); + BOOL (WINAPI *fpStartPagePrinter)(HANDLE hPrinter); + BOOL (WINAPI *fpWritePrinter)(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, + LPDWORD pcWritten); + BOOL (WINAPI *fpEndPagePrinter)(HANDLE hPrinter); + BOOL (WINAPI *fpAbortPrinter)(HANDLE hPrinter); + BOOL (WINAPI *fpReadPrinter)(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, + LPDWORD pNoBytesRead); + BOOL (WINAPI *fpEndDocPrinter)(HANDLE hPrinter); + BOOL (WINAPI *fpAddJob)(HANDLE hPrinter, DWORD Level, LPBYTE pData, + DWORD cbBuf, LPDWORD pcbNeeded); + BOOL (WINAPI *fpScheduleJob)(HANDLE hPrinter, DWORD JobID); + DWORD (WINAPI *fpGetPrinterData)(HANDLE hPrinter, LPWSTR pValueName, + LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded); + DWORD (WINAPI *fpSetPrinterData)(HANDLE hPrinter, LPWSTR pValueName, + DWORD Type, LPBYTE pData, DWORD cbData); + DWORD (WINAPI *fpWaitForPrinterChange)(HANDLE hPrinter, DWORD Flags); + BOOL (WINAPI *fpClosePrinter)(HANDLE phPrinter); + BOOL (WINAPI *fpAddForm)(HANDLE hPrinter, DWORD Level, LPBYTE pForm); + BOOL (WINAPI *fpDeleteForm)(HANDLE hPrinter, LPWSTR pFormName); + BOOL (WINAPI *fpGetForm)(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, + LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded); + BOOL (WINAPI *fpSetForm)(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, + LPBYTE pForm); + BOOL (WINAPI *fpEnumForms)(HANDLE hPrinter, DWORD Level, LPBYTE pForm, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); + BOOL (WINAPI *fpEnumMonitors)(LPWSTR pName, DWORD Level, LPBYTE pMonitors, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); + BOOL (WINAPI *fpEnumPorts)(LPWSTR pName, DWORD Level, LPBYTE pPorts, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); + BOOL (WINAPI *fpAddPort)(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName); + BOOL (WINAPI *fpConfigurePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + BOOL (WINAPI *fpDeletePort)(LPWSTR pName, HWND hWnd, LPWSTR pPortName); + HANDLE (WINAPI *fpCreatePrinterIC)(HANDLE hPrinter, LPDEVMODEW pDevMode); + BOOL (WINAPI *fpPlayGdiScriptOnPrinterIC)(HANDLE hPrinterIC, LPBYTE pIn, + DWORD cIn, LPBYTE pOut, DWORD cOut, DWORD ul); + BOOL (WINAPI *fpDeletePrinterIC)(HANDLE hPrinterIC); + BOOL (WINAPI *fpAddPrinterConnection)(LPWSTR pName); + BOOL (WINAPI *fpDeletePrinterConnection)(LPWSTR pName); + DWORD (WINAPI *fpPrinterMessageBox)(HANDLE hPrinter, DWORD Error, HWND hWnd, + LPWSTR pText, LPWSTR pCaption, DWORD dwType); + BOOL (WINAPI *fpAddMonitor)(LPWSTR pName, DWORD Level, LPBYTE pMonitors); + BOOL (WINAPI *fpDeleteMonitor)(LPWSTR pName, LPWSTR pEnvironment, + LPWSTR pMonitorName); + BOOL (WINAPI *fpResetPrinter)(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault); + BOOL (WINAPI *fpGetPrinterDriverEx)(HANDLE hPrinter, LPWSTR pEnvironment, + DWORD Level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, + DWORD dwClientMajorVersion, DWORD dwClientMinorVersion, + PDWORD pdwServerMajorVersion, PDWORD pdwServerMinorVersion); + HANDLE (WINAPI *fpFindFirstPrinterChangeNotification)(HANDLE hPrinter, + DWORD fdwFlags, DWORD fdwOptions, LPVOID pPrinterNotifyOptions); + BOOL (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE hChange); + BOOL (WINAPI *fpAddPortEx)(HANDLE hMonitor, LPWSTR pName, DWORD Level, + LPBYTE lpBuffer, LPWSTR lpMonitorName); + BOOL (WINAPI *fpShutDown)(LPVOID pvReserved); + BOOL (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE hPrinter, + DWORD Reserved, PVOID pvReserved, PVOID pPrinterNotifyInfo); + BOOL (WINAPI *fpOpenPrinterEx)(LPWSTR pPrinterName, LPHANDLE phPrinter, + LPPRINTER_DEFAULTSW pDefault, LPBYTE pClientInfo, DWORD Level); + HANDLE (WINAPI *fpAddPrinterEx)(LPWSTR pName, DWORD Level, LPBYTE pPrinter, + LPBYTE pClientInfo, DWORD ClientInfoLevel); + BOOL (WINAPI *fpSetPort)(LPWSTR pName, LPWSTR pPortName, DWORD dwLevel, + LPBYTE pPortInfo); + DWORD (WINAPI *fpEnumPrinterData)( HANDLE hPrinter, DWORD dwIndex, + LPWSTR pValueName, DWORD cbValueName, LPDWORD pcbValueName, + LPDWORD pType, LPBYTE pData, DWORD cbData, LPDWORD pcbData); + DWORD (WINAPI *fpDeletePrinterData)(HANDLE hPrinter, LPWSTR pValueName); + DWORD (WINAPI *fpClusterSplOpen)(LPCWSTR pszServer, LPCWSTR pszResource, + PHANDLE phSpooler, LPCWSTR pszName, LPCWSTR pszAddress); + DWORD (WINAPI *fpClusterSplClose)(HANDLE hSpooler); + DWORD (WINAPI *fpClusterSplIsAlive)(HANDLE hSpooler); + DWORD (WINAPI *fpSetPrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, + LPCWSTR pValueName, DWORD Type, LPBYTE pData, DWORD cbData); + DWORD (WINAPI *fpGetPrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, + LPCWSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, + LPDWORD pcbNeeded); + DWORD (WINAPI *fpEnumPrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, + LPBYTE pEnumValues, DWORD cbEnumValues, LPDWORD pcbEnumValues, + LPDWORD pnEnumValues); + DWORD (WINAPI *fpEnumPrinterKey)(HANDLE hPrinter, LPCWSTR pKeyName, + LPWSTR pSubkey, DWORD cbSubkey, LPDWORD pcbSubkey); + DWORD (WINAPI *fpDeletePrinterDataEx)(HANDLE hPrinter, LPCWSTR pKeyName, + LPCWSTR pValueName); + DWORD (WINAPI *fpDeletePrinterKey)(HANDLE hPrinter, LPCWSTR pKeyName); + BOOL (WINAPI *fpSeekPrinter)(HANDLE hPrinter, LARGE_INTEGER liDistanceToMove, + PLARGE_INTEGER pliNewPointer, DWORD dwMoveMethod, BOOL bWrite); + BOOL (WINAPI *fpDeletePrinterDriverEx)(LPWSTR pName, LPWSTR pEnvironment, + LPWSTR pDriverName, DWORD dwDeleteFlag, DWORD dwVersionNum); + BOOL (WINAPI *fpAddPerMachineConnection)(LPCWSTR pServer, + LPCWSTR pPrinterName, LPCWSTR pPrintServer, LPCWSTR pProvider); + BOOL (WINAPI *fpDeletePerMachineConnection)(LPCWSTR pServer, + LPCWSTR pPrinterName); + BOOL (WINAPI *fpEnumPerMachineConnections)(LPCWSTR pServer, + LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, + LPDWORD pcReturned); + BOOL (WINAPI *fpXcvData)(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, + DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, + PDWORD pcbOutputNeeded, PDWORD pdwStatus); + BOOL (WINAPI *fpAddPrinterDriverEx)(LPWSTR pName, DWORD Level, + LPBYTE pDriverInfo, DWORD dwFileCopyFlags); + BOOL (WINAPI *fpSplReadPrinter)(HANDLE hPrinter, LPBYTE *pBuf, DWORD cbBuf); + BOOL (WINAPI *fpDriverUnloadComplete)(LPWSTR pDriverFile); + BOOL (WINAPI *fpGetSpoolFileInfo)(HANDLE hPrinter, LPWSTR *pSpoolDir, + LPHANDLE phFile, HANDLE hSpoolerProcess, HANDLE hAppProcess); + BOOL (WINAPI *fpCommitSpoolData)(HANDLE hPrinter, DWORD cbCommit); + BOOL (WINAPI *fpCloseSpoolFileHandle)(HANDLE hPrinter); + BOOL (WINAPI *fpFlushPrinter)(HANDLE hPrinter, LPBYTE pBuf, DWORD cbBuf, + LPDWORD pcWritten, DWORD cSleep); + DWORD (WINAPI *fpSendRecvBidiData)(HANDLE hPort, LPCWSTR pAction, + LPBIDI_REQUEST_CONTAINER pReqData, + LPBIDI_RESPONSE_CONTAINER *ppResData); + BOOL (WINAPI *fpAddDriverCatalog)(HANDLE hPrinter, DWORD dwLevel, + VOID *pvDriverInfCatInfo, DWORD dwCatalogCopyFlags); +} PRINTPROVIDOR, *LPPRINTPROVIDOR; + +typedef struct _SPLCLIENT_INFO_1 { + DWORD dwSize; + LPWSTR pMachineName; + LPWSTR pUserName; + DWORD dwBuildNum; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + WORD wProcessorArchitecture; +} SPLCLIENT_INFO_1, *LPSPLCLIENT_INFO_1, *PSPLCLIENT_INFO_1; + +/* DECLARATIONS */ + +HANDLE WINAPI CreatePrinterIC(HANDLE hPrinter, LPDEVMODEW pDevMode); +BOOL WINAPI PlayGdiScriptOnPrinterIC(HANDLE hPrinterIC, LPBYTE pIn, + DWORD cIn, LPBYTE pOut, DWORD cOut, DWORD ul); +BOOL WINAPI DeletePrinterIC(HANDLE hPrinterIC); +BOOL WINAPI DevQueryPrint(HANDLE hPrinter, LPDEVMODEW pDevMode, DWORD *pResID); + +/* Security and Access */ +HANDLE WINAPI RevertToPrinterSelf(VOID); +BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken); +BOOL WINAPI OpenPrinterToken(PHANDLE phToken); +BOOL WINAPI SetPrinterToken(HANDLE hToken); +BOOL WINAPI ClosePrinterToken(HANDLE hToken); + +/* Notification */ +BOOL WINAPI ReplyPrinterChangeNotification(HANDLE hNotify, DWORD fdwFlags, + PDWORD pdwResult, PVOID pPrinterNotifyInfo); +BOOL WINAPI PartialReplyPrinterChangeNotification(HANDLE hNotify, + PPRINTER_NOTIFY_INFO_DATA pInfoDataSrc); +PPRINTER_NOTIFY_INFO RouterAllocPrinterNotifyInfo(DWORD cPrinterNotifyInfoData); +BOOL WINAPI RouterFreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO pInfo); +BOOL WINAPI AppendPrinterNotifyInfoData(PPRINTER_NOTIFY_INFO pInfoDest, + PPRINTER_NOTIFY_INFO_DATA pInfoDataSrc, DWORD fdwFlags); +DWORD WINAPI CallRouterFindFirstPrinterChangeNotification(HANDLE hPrinter, + DWORD fdwFlags, DWORD fdwOptions, HANDLE hNotify, PVOID pvReserved); + +/* Port monitor / Language monitor / Print monitor */ +LPMONITOR2 WINAPI InitializePrintMonitor2(PMONITORINIT pMonitorInit, + PHANDLE phMonitor); +PMONITORUI WINAPI InitializePrintMonitorUI(VOID); +LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR pRegistryRoot); +BOOL WINAPI InitializeMonitorEx(LPWSTR pRegistryRoot, LPMONITOR pMonitor); +BOOL WINAPI InitializeMonitor(LPWSTR pRegistryRoot); + +BOOL WINAPI OpenPort(LPWSTR pName, PHANDLE pHandle); +BOOL WINAPI WritePort(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, + LPDWORD pcbWritten); +BOOL WINAPI ReadPort(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuffer, + LPDWORD pcbRead); +BOOL WINAPI ClosePort(HANDLE hPort); + +/* Print processor */ +HANDLE WINAPI OpenPrintProcessor(LPWSTR pPrinterName, + PPRINTPROCESSOROPENDATA pPrintProcessorOpenData); +BOOL WINAPI PrintDocumentOnPrintProcessor(HANDLE hPrintProcessor, + LPWSTR pDocumentName); +BOOL WINAPI ClosePrintProcessor(HANDLE hPrintProcessor); +BOOL WINAPI ControlPrintProcessor(HANDLE hPrintProcessor, DWORD Command); +BOOL WINAPI InstallPrintProcessor(HWND hWnd); + +/* Print provider */ +BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, + DWORD cbPrintProvidor, LPWSTR pFullRegistryPath); +BOOL WINAPI ProvidorFindFirstPrinterChangeNotification(HANDLE hPrinter, + DWORD fdwFlags, DWORD fdwOptions, HANDLE hNotify, + PVOID pvReserved0, PVOID pvReserved1); +BOOL WINAPI ProvidorFindClosePrinterChangeNotification(HANDLE hPrinter); + +/* Spooler */ +BOOL WINAPI SpoolerFindFirstPrinterChangeNotification(HANDLE hPrinter, + DWORD fdwFlags, DWORD fdwOptions, PHANDLE phEvent, + PVOID pPrinterNotifyOptions, PVOID pvReserved); +BOOL WINAPI SpoolerFindNextPrinterChangeNotification(HANDLE hPrinter, + LPDWORD pfdwChange, PVOID pvReserved0, PVOID ppPrinterNotifyInfo); +VOID WINAPI SpoolerFreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO pInfo); +BOOL WINAPI SpoolerFindClosePrinterChangeNotification(HANDLE hPrinter); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _WINSPLP_ */ Propchange: trunk/reactos/include/ddk/winsplp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Sat Dec 6 05:18:08 2008 @@ -715,6 +715,50 @@ LPWSTR pOrder; } PROVIDOR_INFO_2W, *LPPROVIDOR_INFO_2W; +typedef struct _BINARY_CONTAINER { + DWORD cbBuf; + LPBYTE pData; +} BINARY_CONTAINER, *PBINARY_CONTAINER; + +typedef struct _BIDI_DATA { + DWORD dwBidiType; + union + { + BOOL bData; + INT iData; + LPWSTR sData; + FLOAT fData; + BINARY_CONTAINER biData; + } u; +} BIDI_DATA, *LPBIDI_DATA, *PBIDI_DATA; + +typedef struct _BIDI_REQUEST_DATA { + DWORD dwReqNumber; + LPWSTR pSchema; + BIDI_DATA data; +} BIDI_REQUEST_DATA, *LPBIDI_REQUEST_DATA, *PBIDI_REQUEST_DATA; + +typedef struct _BIDI_REQUEST_CONTAINER { + DWORD Version; + DWORD Flags; + DWORD Count; + BIDI_REQUEST_DATA aData[1]; +} BIDI_REQUEST_CONTAINER, *LPBIDI_REQUEST_CONTAINER, *PBIDI_REQUEST_CONTAINER; + +typedef struct _BIDI_RESPONSE_DATA { + DWORD dwResult; + DWORD dwReqNumber; + LPWSTR pSchema; + BIDI_DATA data; +} BIDI_RESPONSE_DATA, *LPBIDI_RESPONSE_DATA, *PBIDI_RESPONSE_DATA; + +typedef struct _BIDI_RESPONSE_CONTAINER { + DWORD Version; + DWORD Flags; + DWORD Count; + BIDI_RESPONSE_DATA aData[1]; +} BIDI_RESPONSE_CONTAINER, *LPBIDI_RESPONSE_CONTAINER, *PBIDI_RESPONSE_CONTAINER; + BOOL WINAPI AbortPrinter(HANDLE); BOOL WINAPI AddFormA(HANDLE,DWORD,PBYTE); BOOL WINAPI AddFormW(HANDLE,DWORD,PBYTE); @@ -823,6 +867,7 @@ BOOL WINAPI StartPagePrinter(HANDLE); DWORD WINAPI WaitForPrinterChange(HANDLE,DWORD); BOOL WINAPI WritePrinter(HANDLE,PVOID,DWORD,PDWORD); +BOOL WINAPI XcvDataW(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); #ifdef UNICODE typedef JOB_INFO_1W JOB_INFO_1,*PJOB_INFO_1,*LPJOB_INFO_1;

15 years, 9 months

[ekohl] 37891: Replace call to ExtractIconExW (shell32.dll) by a call to PrivateExtractIconExw (user32.dll) and remove shell32.dll from the list of linked libraries because shell32.dll requires a valid user account upon initialization. Please remember: Don't use high-level DLLs in low-level components (dll or exe)!!!!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 6 05:13:50 2008 New Revision: 37891 URL: http://svn.reactos.org/svn/reactos?rev=37891&view=rev Log: Replace call to ExtractIconExW (shell32.dll) by a call to PrivateExtractIconExw (user32.dll) and remove shell32.dll from the list of linked libraries because shell32.dll requires a valid user account upon initialization. Please remember: Don't use high-level DLLs in low-level components (dll or exe)!!!! Modified: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] Sat Dec 6 05:13:50 2008 @@ -26,6 +26,9 @@ static HWND hAppWindowDlg = NULL; static HHOOK hhk = NULL; +UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); + + BOOL CALLBACK EnumWindowEnumProc( @@ -55,7 +58,7 @@ if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) { szFileName[MAX_PATH-1] = L'\0'; - ExtractIconExW(szFileName, 0, &hIcon, NULL, 1); + PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1); } } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Sat Dec 6 05:13:50 2008 @@ -13,9 +13,8 @@ <library>user32</library> <library>gdi32</library> <library>advapi32</library> - <library>win32ksys</library> + <library>win32ksys</library> <library>psapi</library> - <library>shell32</library> <pch>w32csr.h</pch> <file>alias.c</file> <file>conio.c</file>

15 years, 9 months

[fireball] 37890: - Add reserved reparse tags definitions.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Dec 6 05:05:21 2008 New Revision: 37890 URL: http://svn.reactos.org/svn/reactos?rev=37890&view=rev Log: - Add reserved reparse tags definitions. Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Dec 6 05:05:21 2008 @@ -1009,6 +1009,14 @@ #define IO_REPARSE_TAG_IIS_CACHE (0xA0000010L) #define IO_REPARSE_TAG_DFSR (0x80000012L) +// +// Reserved reparse tags +// +#define IO_REPARSE_TAG_RESERVED_ZERO (0) +#define IO_REPARSE_TAG_RESERVED_ONE (1) +#define IO_REPARSE_TAG_RESERVED_RANGE IO_REPARSE_TAG_RESERVED_ONE + + #define REPARSE_DATA_BUFFER_HEADER_SIZE FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer) typedef struct _FILE_ACCESS_INFORMATION {

15 years, 9 months

[tkreuzer] 37889: merge rbuild changes 37811-37861 from trunk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 6 04:48:26 2008 New Revision: 37889 URL: http://svn.reactos.org/svn/reactos?rev=37889&view=rev Log: merge rbuild changes 37811-37861 from trunk Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Dec 6 04:48:26 2008 @@ -1434,6 +1434,9 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); + // FIXME! workaround until rsym can extract line numbers from DWARF + fprintf ( fMakefile, + "\t$(Q)${objcopy} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile, @@ -2015,16 +2018,6 @@ linkerflags ); } - if ( IsStaticLibrary ( module ) && module.isStartupLib ) - { - fprintf ( fMakefile, - "%s += -Wno-main\n\n", - cflagsMacro.c_str () ); - fprintf ( fMakefile, - "%s += -Wno-main\n\n", - cxxflagsMacro.c_str () ); - } - fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] Sat Dec 6 04:48:26 2008 @@ -745,13 +745,17 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = project.LookupProperty( name->value ); - if ( !property ) - { - // Property not found - throw InvalidOperationException ( __FILE__, - __LINE__, - "Test on unknown property '%s' at %s", - name->value.c_str (), e.location.c_str () ); + const string *PropertyValue; + const string EmptyString; + + if (property) + { + PropertyValue = &property->value; + } + else + { + // Property does not exist, treat it as being empty + PropertyValue = &EmptyString; } const XMLAttribute* value; @@ -759,7 +763,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( property->value == value->value ); + bool equality = ( *PropertyValue == value->value ); if ( equality == negate ) { // Failed, skip this element Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Sat Dec 6 04:48:26 2008 @@ -399,13 +399,17 @@ name = e.GetAttribute ( "property", true ); assert( name ); const Property *property = LookupProperty( name->value ); - if ( !property ) - { - // Property not found - throw InvalidOperationException ( __FILE__, - __LINE__, - "Test on unknown property '%s' at %s", - name->value.c_str (), e.location.c_str () ); + const string *PropertyValue; + const string EmptyString; + + if (property) + { + PropertyValue = &property->value; + } + else + { + // Property does not exist, treat it as being empty + PropertyValue = &EmptyString; } const XMLAttribute* value; @@ -413,7 +417,7 @@ assert( value ); bool negate = ( e.name == "ifnot" ); - bool equality = ( property->value == value->value ); + bool equality = ( *PropertyValue == value->value ); if ( equality == negate ) { // Failed, skip this element

15 years, 9 months

[dchapyshev] 37888: .def -> .spec

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Dec 6 04:28:06 2008 New Revision: 37888 URL: http://svn.reactos.org/svn/reactos?rev=37888&view=rev Log: .def -> .spec Added: trunk/reactos/dll/win32/winspool/winspool.spec (with props) Removed: trunk/reactos/dll/win32/winspool/winspool.def Modified: trunk/reactos/dll/win32/winspool/winspool.rbuild Removed: trunk/reactos/dll/win32/winspool/winspool.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.def (removed) @@ -1,116 +1,0 @@ -; $Id$ -; -; winspool.drv - Printer spooler - -LIBRARY winspool.drv - -EXPORTS -AbortPrinter@4 -AddFormA@12 -AddFormW@12 -AddJobA@20 -AddJobW@20 -AddMonitorA@12 -AddMonitorW@12 -AddPortA@12 -AddPortW@12 -AddPrinterA@12 -AddPrinterConnectionA@4 -AddPrinterConnectionW@4 -AddPrinterDriverA@12 -AddPrinterDriverW@12 -AddPrinterW@12 -AddPrintProcessorA@16 -AddPrintProcessorW@16 -AddPrintProvidorA@12 -AddPrintProvidorW@12 -AdvancedDocumentPropertiesA@20 -AdvancedDocumentPropertiesW@20 -ClosePrinter@4 -ConfigurePortA@12 -ConfigurePortW@12 -ConnectToPrinterDlg@8 -DeleteFormA@8 -DeleteFormW@8 -DeleteMonitorA@12 -DeleteMonitorW@12 -DeletePortA@12 -DeletePortW@12 -DeletePrinter@4 -DeletePrinterConnectionA@4 -DeletePrinterConnectionW@4 -DeletePrinterDataA@8 -DeletePrinterDataW@8 -DeletePrinterDriverA@12 -DeletePrinterDriverW@12 -DeletePrintProcessorA@12 -DeletePrintProcessorW@12 -DeletePrintProvidorA@12 -DeletePrintProvidorW@12 -DeviceCapabilitiesA@20 -DeviceCapabilitiesW@20 -DllMain@12 -DocumentPropertiesA@24 -DocumentPropertiesW@24 -EndDocPrinter@4 -EndPagePrinter@4 -EnumFormsA@24 -EnumFormsW@24 -EnumJobsA@32 -EnumJobsW@32 -EnumMonitorsA@24 -EnumMonitorsW@24 -EnumPortsA@24 -EnumPortsW@24 -EnumPrinterDataA@36 -EnumPrinterDataW@36 -EnumPrinterDriversA@28 -EnumPrinterDriversW@28 -EnumPrintersA@28 -EnumPrintersW@28 -EnumPrintProcessorDatatypesA@28 -EnumPrintProcessorDatatypesW@28 -EnumPrintProcessorsA@28 -EnumPrintProcessorsW@28 -FindClosePrinterChangeNotification@4 -FindFirstPrinterChangeNotification@16 -FindNextPrinterChangeNotification@16 -FreePrinterNotifyInfo@4 -GetDefaultPrinterA@8 @201 -GetDefaultPrinterW@8 @203 -GetFormA@24 -GetFormW@24 -GetJobA@24 -GetJobW@24 -GetPrinterA@20 -GetPrinterDataA@24 -GetPrinterDataW@24 -GetPrinterDriverA@24 -GetPrinterDriverDirectoryA@24 -GetPrinterDriverDirectoryW@24 -GetPrinterDriverW@24 -GetPrinterW@20 -GetPrintProcessorDirectoryA@24 -GetPrintProcessorDirectoryW@24 -OpenPrinterA@12 -OpenPrinterW@12 -PrinterMessageBoxA@24 -PrinterMessageBoxW@24 -PrinterProperties@8 -ReadPrinter@16 -ResetPrinterA@8 -ResetPrinterW@8 -ScheduleJob@8 -SetFormA@16 -SetFormW@16 -SetJobA@20 -SetJobW@20 -SetPrinterA@16 -SetPrinterDataA@20 -SetPrinterDataW@20 -SetPrinterW@16 -StartDocPrinterA@12 -StartDocPrinterW@12 -StartPagePrinter@4 -WaitForPrinterChange@8 -WritePrinter@16 Modified: trunk/reactos/dll/win32/winspool/winspool.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.rbuild [iso-8859-1] Sat Dec 6 04:28:06 2008 @@ -1,5 +1,5 @@ <module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true" unicode="yes"> - <importlibrary definition="winspool.def" /> + <importlibrary definition="winspool.spec" /> <include base="winspool">.</include> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> Added: trunk/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.spec (added) +++ trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] Sat Dec 6 04:28:06 2008 @@ -1,0 +1,109 @@ +@ stdcall AbortPrinter(long) +@ stdcall AddFormA(long long ptr) +@ stdcall AddFormW(long long ptr) +@ stdcall AddJobA(long long ptr long ptr) +@ stdcall AddJobW(long long ptr long ptr) +@ stdcall AddMonitorA(str long ptr) +@ stdcall AddMonitorW(wstr long ptr) +@ stdcall AddPortA(str ptr str) +@ stdcall AddPortW(wstr long wstr) +@ stdcall AddPrinterA(str long ptr) +@ stdcall AddPrinterConnectionA(str) +@ stdcall AddPrinterConnectionW(wstr) +@ stdcall AddPrinterDriverA(str long ptr) +@ stdcall AddPrinterDriverW(wstr long ptr) +@ stdcall AddPrinterW(wstr long ptr) +@ stdcall AddPrintProcessorA(str str str str) +@ stdcall AddPrintProcessorW(wstr wstr wstr wstr) +@ stdcall AddPrintProvidorA(str long ptr) +@ stdcall AddPrintProvidorW(wstr long ptr) +@ stdcall AdvancedDocumentPropertiesA(long long str ptr ptr) +@ stdcall AdvancedDocumentPropertiesW(long long wstr ptr ptr) +@ stdcall ClosePrinter(long) +@ stdcall ConfigurePortA(str long str) +@ stdcall ConfigurePortW(wstr long wstr) +@ stdcall ConnectToPrinterDlg(long long) +@ stdcall DeleteFormA(long str) +@ stdcall DeleteFormW(long wstr) +@ stdcall DeleteMonitorA(str str str) +@ stdcall DeleteMonitorW(wstr wstr wstr) +@ stdcall DeletePortA(str long str) +@ stdcall DeletePortW(wstr long wstr) +@ stdcall DeletePrinter(long) +@ stdcall DeletePrinterConnectionA(str) +@ stdcall DeletePrinterConnectionW(wstr) +@ stdcall DeletePrinterDataA(ptr str) +@ stdcall DeletePrinterDataW(ptr wstr) +@ stdcall DeletePrinterDriverA(str str str) +@ stdcall DeletePrinterDriverW(wstr wstr wstr) +@ stdcall DeletePrintProcessorA(str str str) +@ stdcall DeletePrintProcessorW(wstr wstr wstr) +@ stdcall DeletePrintProvidorA(str str str) +@ stdcall DeletePrintProvidorW(wstr wstr wstr) +@ stdcall DeviceCapabilitiesA(str str long ptr ptr) +@ stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) +@ stdcall DllMain(ptr long ptr) +@ stdcall DocumentPropertiesA(long long ptr ptr ptr long) +@ stdcall DocumentPropertiesW(long long ptr ptr ptr long) +@ stdcall EndDocPrinter(long) +@ stdcall EndPagePrinter(long) +@ stdcall EnumFormsA(long long ptr long ptr ptr) +@ stdcall EnumFormsW(long long ptr long ptr ptr) +@ stdcall EnumJobsA(long long long long ptr long ptr ptr) +@ stdcall EnumJobsW(long long long long ptr long ptr ptr) +@ stdcall EnumMonitorsA(str long ptr long long long) +@ stdcall EnumMonitorsW(wstr long ptr long long long) +@ stdcall EnumPortsA(str long ptr ptr ptr ptr) +@ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) +@ stdcall EnumPrinterDataA(long long ptr long ptr ptr ptr long ptr) +@ stdcall EnumPrinterDataW(long long ptr long ptr ptr ptr long ptr) +@ stdcall EnumPrinterDriversA(str str long ptr long ptr ptr) +@ stdcall EnumPrinterDriversW(wstr wstr long ptr long ptr ptr) +@ stdcall EnumPrintersA(long ptr long ptr long ptr ptr) +@ stdcall EnumPrintersW(long ptr long ptr long ptr ptr) +@ stdcall EnumPrintProcessorDatatypesA(str str long ptr long ptr ptr) +@ stdcall EnumPrintProcessorDatatypesW(wstr wstr long ptr long ptr ptr) +@ stdcall EnumPrintProcessorsA(str str long ptr long ptr ptr) +@ stdcall EnumPrintProcessorsW(wstr wstr long ptr long ptr ptr) +@ stdcall FindClosePrinterChangeNotification(long) +@ stdcall FindFirstPrinterChangeNotification(long long long ptr) +@ stdcall FindNextPrinterChangeNotification(long ptr ptr ptr) +@ stdcall FreePrinterNotifyInfo(ptr) +201 stdcall GetDefaultPrinterA(ptr ptr) +203 stdcall GetDefaultPrinterW(ptr ptr) +@ stdcall GetFormA(long str long ptr long ptr) +@ stdcall GetFormW(long wstr long ptr long ptr) +@ stdcall GetJobA(long long long ptr long ptr) +@ stdcall GetJobW(long long long ptr long ptr) +@ stdcall GetPrinterA(long long ptr long ptr) +@ stdcall GetPrinterDataA(long str ptr ptr long ptr) +@ stdcall GetPrinterDataW(long wstr ptr ptr long ptr) +@ stdcall GetPrinterDriverA(long str long ptr long ptr) +@ stdcall GetPrinterDriverDirectoryA(str str long ptr long ptr) +@ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) +@ stdcall GetPrinterDriverW(long str long ptr long ptr) +@ stdcall GetPrinterW(long long ptr long ptr) +@ stdcall GetPrintProcessorDirectoryA(str str long ptr long ptr) +@ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) +@ stdcall OpenPrinterA(str ptr ptr) +@ stdcall OpenPrinterW(wstr ptr ptr) +@ stdcall PrinterMessageBoxA(ptr long ptr str str long) +@ stdcall PrinterMessageBoxW(ptr long ptr wstr wstr long) +@ stdcall PrinterProperties(long long) +@ stdcall ReadPrinter(long ptr long ptr) +@ stdcall ResetPrinterA(long ptr) +@ stdcall ResetPrinterW(long ptr) +@ stdcall ScheduleJob(long long) +@ stdcall SetFormA(long str long ptr) +@ stdcall SetFormW(long wstr long ptr) +@ stdcall SetJobA(long long long ptr long) +@ stdcall SetJobW(long long long ptr long) +@ stdcall SetPrinterA(long long ptr long) +@ stdcall SetPrinterDataA(long str long ptr long) +@ stdcall SetPrinterDataW(long wstr long ptr long) +@ stdcall SetPrinterW(long long ptr long) +@ stdcall StartDocPrinterA(long long ptr) +@ stdcall StartDocPrinterW(long long ptr) +@ stdcall StartPagePrinter(long) +@ stdcall WaitForPrinterChange(ptr long) +@ stdcall WritePrinter(long ptr long ptr) Propchange: trunk/reactos/dll/win32/winspool/winspool.spec ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 9 months

[tkreuzer] 37887: merge 37780 from trunk fix it so on x64 builds we use dwarf2 debugging format.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 6 04:17:19 2008 New Revision: 37887 URL: http://svn.reactos.org/svn/reactos?rev=37887&view=rev Log: merge 37780 from trunk fix it so on x64 builds we use dwarf2 debugging format. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Dec 6 04:17:19 2008 @@ -31,6 +31,12 @@ #define CLEAN_FILE(f) clean_files.push_back ( (f).name.length () > 0 ? backend->GetFullName ( f ) : backend->GetFullPath ( f ) ); #define IsStaticLibrary( module ) ( ( module.type == StaticLibrary ) || ( module.type == HostStaticLibrary ) ) + +#if (ARCH == amd64) +#define DEBUG_FORMAT " -gdwarf-2" +#else +#define DEBUG_FORMAT " -gstabs+" +#endif MingwBackend* MingwModuleHandler::backend = NULL; @@ -1655,11 +1661,12 @@ backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, - "\t%s -o %s %s %s -g %s\n\n", + "\t%s -o %s %s %s %s %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), + DEBUG_FORMAT, backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; } @@ -1894,7 +1901,7 @@ } else globalCflags += " -Wall -Wpointer-arith"; - globalCflags += " -g"; + globalCflags += DEBUG_FORMAT; if ( backend->usePipe ) globalCflags += " -pipe"; if ( !module.allowWarnings ) @@ -1947,7 +1954,7 @@ fprintf ( fMakefile, - "%s_LFLAGS := $(PROJECT_LFLAGS) -g $(%s_LFLAGS)\n", + "%s_LFLAGS := $(PROJECT_LFLAGS) $(%s_LFLAGS)\n", module.name.c_str (), module.name.c_str () ); } @@ -3027,7 +3034,7 @@ backend->GetFullName ( junk_cpy ).c_str (), backend->GetFullName ( junk_tmp ).c_str () ); - fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -g -o %s\n", + fprintf ( fMakefile, "\t${ld} $(%s_LINKFORMAT) %s %s -o %s\n", module.buildtype.c_str (), linkDepsMacro.c_str (), backend->GetFullName ( junk_tmp ).c_str (), @@ -3567,10 +3574,11 @@ fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); - fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s -g -o %s\n", + fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s %s -o %s\n", module.buildtype.c_str(), objectsMacro.c_str(), libsMacro.c_str(), + DEBUG_FORMAT, targetMacro.c_str () ); delete target_file;

15 years, 9 months

[tkreuzer] 37886: merge rbuild changes 37747, 37778 from trunk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 6 03:52:19 2008 New Revision: 37886 URL: http://svn.reactos.org/svn/reactos?rev=37886&view=rev Log: merge rbuild changes 37747,37778 from trunk Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Dec 6 03:52:19 2008 @@ -826,7 +826,7 @@ buffer[i] = '\0'; pclose ( fp ); - char separators[] = " "; + char separators[] = " ()"; char *token; char *prevtoken = NULL; Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] Sat Dec 6 03:52:19 2008 @@ -390,7 +390,7 @@ s = s + sprintf ( s, "}\n" ); s = s + sprintf ( s, "\n" ); s = s + sprintf ( s, "int\n" ); - s = s + sprintf ( s, "STDCALL\n" ); + s = s + sprintf ( s, "WINAPI\n" ); s = s + sprintf ( s, "WinMain(HINSTANCE hInstance,\n" ); s = s + sprintf ( s, " HINSTANCE hPrevInstance,\n" ); s = s + sprintf ( s, " LPSTR lpszCmdParam,\n" );

15 years, 9 months

[dchapyshev] 37885: - Sync mlang with Wine 1.1.10

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Dec 6 03:39:38 2008 New Revision: 37885 URL: http://svn.reactos.org/svn/reactos?rev=37885&view=rev Log: - Sync mlang with Wine 1.1.10 Modified: trunk/reactos/dll/win32/mlang/mlang.c Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Sat Dec 6 03:39:38 2008 @@ -503,7 +503,7 @@ static UINT DetectJapaneseCode(LPCSTR input, DWORD count) { UINT code = 0; - int i = 0; + DWORD i = 0; unsigned char c1,c2; while ((code == 0 || code == 51932) && i < count) @@ -615,7 +615,7 @@ static UINT ConvertJIS2SJIS(LPCSTR input, DWORD count, LPSTR output) { - int i = 0; + DWORD i = 0; int j = 0; unsigned char p2,p; int shifted = FALSE; @@ -683,7 +683,7 @@ static UINT ConvertSJIS2JIS(LPCSTR input, DWORD count, LPSTR output) { - int i = 0; + DWORD i = 0; int j = 0; unsigned char p2,p; int shifted = FALSE; @@ -999,7 +999,6 @@ if (pDstStr) { - size = min(size, destsz); size = ConvertJapaneseUnicodeToJIS(pSrcStr, *pcSrcSize, pDstStr, destsz); if (!size) @@ -1016,7 +1015,6 @@ if (pDstStr) { - size = min(size, destsz); size = WideCharToMultiByte(dwEncoding, 0, pSrcStr, *pcSrcSize, pDstStr, destsz, NULL, NULL); if (!size) @@ -1343,7 +1341,7 @@ */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - int i; + unsigned int i; IClassFactoryImpl *factory; TRACE("%s %s %p\n",debugstr_guid(rclsid), debugstr_guid(iid), ppv); @@ -1395,12 +1393,12 @@ DWORD total_cp, total_scripts; } MLang_impl; -static ULONG WINAPI MLang_AddRef( MLang_impl* This) +static ULONG MLang_AddRef( MLang_impl* This) { return InterlockedIncrement(&This->ref); } -static ULONG WINAPI MLang_Release( MLang_impl* This ) +static ULONG MLang_Release( MLang_impl* This ) { ULONG ref = InterlockedDecrement(&This->ref); @@ -1415,7 +1413,7 @@ return ref; } -static HRESULT WINAPI MLang_QueryInterface( +static HRESULT MLang_QueryInterface( MLang_impl* This, REFIID riid, void** ppvObject) @@ -1855,8 +1853,27 @@ WCHAR chSrc, DWORD* pdwCodePages) { - FIXME("\n"); - return E_NOTIMPL; + int i; + CHAR buf; + BOOL used_dc; + DWORD codePages; + + *pdwCodePages = 0; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, + &chSrc, 1, &buf, 1, NULL, &used_dc); + + /* If default char is not used, current codepage include the given symbol */ + if (!used_dc) + { + IMLangFontLink_CodePageToCodePages(iface, + mlang_data[i].family_codepage, &codePages); + *pdwCodePages |= codePages; + } + } + return S_OK; } static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( @@ -2093,8 +2110,8 @@ BSTR Charset, PMIMECSETINFO pCharsetInfo) { - FIXME("\n"); - return E_NOTIMPL; + ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); + return IMultiLanguage3_GetCharsetInfo((IMultiLanguage3*)&This->vtbl_IMultiLanguage3, Charset, pCharsetInfo); } static HRESULT WINAPI fnIMultiLanguage_IsConvertible( @@ -2772,8 +2789,42 @@ IStream* pstmIn, IStream* pstmOut) { - FIXME("\n"); - return E_NOTIMPL; + char *src, *dst = NULL; + INT srclen, dstlen; + STATSTG stat; + HRESULT hr; + + TRACE("%p %0x8 %s %u %u %p %p\n", + pdwMode, dwFlag, debugstr_w(lpFallBack), dwSrcEncoding, dwDstEncoding, pstmIn, pstmOut); + + FIXME("dwFlag and lpFallBack not handled\n"); + + hr = IStream_Stat(pstmIn, &stat, STATFLAG_NONAME); + if (FAILED(hr)) return hr; + + if (stat.cbSize.QuadPart > MAXLONG) return E_INVALIDARG; + if (!(src = HeapAlloc(GetProcessHeap(), 0, stat.cbSize.QuadPart))) return E_OUTOFMEMORY; + + hr = IStream_Read(pstmIn, src, stat.cbSize.QuadPart, (ULONG *)&srclen); + if (FAILED(hr)) goto exit; + + hr = ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, src, &srclen, NULL, &dstlen); + if (FAILED(hr)) goto exit; + + if (!(dst = HeapAlloc(GetProcessHeap(), 0, dstlen))) + { + hr = E_OUTOFMEMORY; + goto exit; + } + hr = ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, src, &srclen, dst, &dstlen); + if (FAILED(hr)) goto exit; + + hr = IStream_Write(pstmOut, dst, dstlen, NULL); + +exit: + HeapFree(GetProcessHeap(), 0, src); + HeapFree(GetProcessHeap(), 0, dst); + return hr; } /* @@ -3049,7 +3100,9 @@ DWORD *pdwCodePages, long *pcchCodePages) { FIXME("(%p)->%s %li %x %p %p\n",This, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); - return E_NOTIMPL; + *pdwCodePages = 0; + *pcchCodePages = 1; + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This,

15 years, 9 months

← Newer
1
...
58
59
60
61
62
63
64
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008