wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 099bb87feb6e09571520b0da30b76898c66dfc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099bb87feb6e09571520b0da3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 17 23:19:45 2007 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/dwarf.c | 18 +++++++++--------- dlls/dbghelp/minidump.c | 4 ++-- dlls/dbghelp/module.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1219522..45fe854 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -342,7 +342,7 @@ static const char* dwarf2_debug_di(const dwarf2_debug_info_t* di) } static dwarf2_abbrev_entry_t* -dwarf2_abbrev_table_find_entry(struct sparse_array* abbrev_table, +dwarf2_abbrev_table_find_entry(const struct sparse_array* abbrev_table, unsigned long entry_code) { assert( NULL != abbrev_table ); @@ -782,7 +782,7 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, + const dwarf2_debug_info_t* di, unsigned long dw, struct location* loc, const struct location* frame) @@ -1095,7 +1095,7 @@ static struct symt* dwarf2_parse_reference_type(dwarf2_parse_context_t* ctx, } static void dwarf2_parse_udt_member(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, + const dwarf2_debug_info_t* di, struct symt_udt* parent) { struct symt* elt_type; @@ -1197,7 +1197,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, } static void dwarf2_parse_enumerator(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, + const dwarf2_debug_info_t* di, struct symt_enum* parent) { struct attribute name; @@ -1372,7 +1372,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, } static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, - dwarf2_debug_info_t* di) + const dwarf2_debug_info_t* di) { struct attribute name; struct attribute low_pc; @@ -1392,11 +1392,11 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, - dwarf2_debug_info_t* di); + const dwarf2_debug_info_t* di); static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, - dwarf2_debug_info_t* di) + const dwarf2_debug_info_t* di) { struct symt_block* block; struct attribute low_pc; @@ -1447,7 +1447,7 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, struct symt_block* parent_block, - dwarf2_debug_info_t* di) + const dwarf2_debug_info_t* di) { struct symt_block* block; struct attribute low_pc; @@ -1743,7 +1743,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, } static void dwarf2_set_line_number(struct module* module, unsigned long address, - struct vector* v, unsigned file, unsigned line) + const struct vector* v, unsigned file, unsigned line) { struct symt_function* func; struct symt_ht* symt; diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7c3ec6f..e2b034f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -112,7 +112,7 @@ static BOOL fetch_process_info(struct dump_context* dc) return FALSE; } -static void fetch_thread_stack(struct dump_context* dc, void* teb_addr, +static void fetch_thread_stack(struct dump_context* dc, const void* teb_addr, const CONTEXT* ctx, MINIDUMP_MEMORY_DESCRIPTOR* mmd) { NT_TIB tib; @@ -327,7 +327,7 @@ static void add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, * * Writes a chunk of data at a given position in the minidump */ -static void writeat(struct dump_context* dc, RVA rva, void* data, unsigned size) +static void writeat(struct dump_context* dc, RVA rva, const void* data, unsigned size) { DWORD written; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 5b8718d..21c8830 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -368,7 +368,7 @@ struct module* module_find_by_addr(const struct process* pcs, unsigned long addr * checks whether the ELF container, for a (supposed) PE builtin is * already loaded */ -static BOOL module_is_elf_container_loaded(struct process* pcs, +static BOOL module_is_elf_container_loaded(const struct process* pcs, const WCHAR* ImageName, DWORD base) { size_t len;

1 0

Detlef Riekenberg : localui: Implement DeletePortUI.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: cecaf91d62809a8c7c68e988b7d066387feddc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecaf91d62809a8c7c68e988b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 17 23:21:00 2007 +0200 localui: Implement DeletePortUI. --- dlls/localui/Makefile.in | 2 +- dlls/localui/localui.c | 76 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index f002e23..2250333 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = localui.dll -IMPORTS = kernel32 +IMPORTS = winspool kernel32 C_SRCS = \ localui.c diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index ae512e0..2153bcc 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -36,6 +36,50 @@ WINE_DEFAULT_DEBUG_CHANNEL(localui); static HINSTANCE LOCALUI_hInstance; +static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; +static const WCHAR XcvPortW[] = {',','X','c','v','P','o','r','t',' ',0}; + +/***************************************************** + * strdupWW [internal] + */ + +static LPWSTR strdupWW(LPCWSTR pPrefix, LPCWSTR pSuffix) +{ + LPWSTR ptr; + DWORD len; + + len = lstrlenW(pPrefix) + lstrlenW(pSuffix) + 1; + ptr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ptr) { + lstrcpyW(ptr, pPrefix); + lstrcatW(ptr, pSuffix); + } + return ptr; +} + +/***************************************************** + * 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] * @@ -94,11 +138,39 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort * 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) { - FIXME("(%s, %p, %s) stub\n", debugstr_w(pName), hWnd, debugstr_w(pPortName)); - return TRUE; + 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; } /*****************************************************

1 0

Detlef Riekenberg : localspl: Implement XcvData_AddPort.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: fce002c3b6d10253fe67e1b483f01bfdd67e3758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce002c3b6d10253fe67e1b48… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 17 23:20:34 2007 +0200 localspl: Implement XcvData_AddPort. --- dlls/localspl/Makefile.in | 2 +- dlls/localspl/localmon.c | 58 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 06830de..c3691e8 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = localspl.dll -IMPORTS = user32 advapi32 kernel32 +IMPORTS = spoolss user32 advapi32 kernel32 C_SRCS = \ localmon.c \ diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 7e13ace..4dd0664 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -65,6 +65,7 @@ static struct list xcv_handles = LIST_INIT( xcv_handles ); /* ############################### */ +static const WCHAR cmd_AddPortW[] = {'A','d','d','P','o','r','t',0}; static const WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','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', @@ -85,6 +86,7 @@ static const WCHAR cmd_SetDefaultCommConfigW[] = {'S','e','t', 'C','o','m','m','C','o','n','f','i','g',0}; static const WCHAR dllnameuiW[] = {'l','o','c','a','l','u','i','.','d','l','l',0}; +static const WCHAR emptyW[] = {0}; static const WCHAR portname_LPT[] = {'L','P','T',0}; static const WCHAR portname_COM[] = {'C','O','M',0}; @@ -126,6 +128,44 @@ static void dlg_nothingtoconfig(HWND hWnd) } /****************************************************************** + * does_port_exist (internal) + * + * returns TRUE, when the Port already exists + * + */ +static BOOL does_port_exist(LPCWSTR myname) +{ + + LPPORT_INFO_1W pi; + DWORD needed = 0; + DWORD returned; + DWORD id; + + TRACE("(%s)\n", debugstr_w(myname)); + + id = EnumPortsW(NULL, 1, NULL, 0, &needed, &returned); + pi = spl_alloc(needed); + returned = 0; + if (pi) + id = EnumPortsW(NULL, 1, (LPBYTE) pi, needed, &needed, &returned); + + if (id && returned > 0) { + /* we got a number of valid names. */ + for (id = 0; id < returned; id++) + { + if (lstrcmpiW(myname, pi[id].pName) == 0) { + TRACE("(%u) found %s\n", id, debugstr_w(pi[id].pName)); + spl_free(pi); + return TRUE; + } + } + } + + spl_free(pi); + return FALSE; +} + +/****************************************************************** * enumerate the local Ports from the Registry (internal) * * See localmon_EnumPortsW. @@ -459,8 +499,22 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput TRACE("(%p, %s, %p, %d, %p, %d, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); - /* Native localspl.dll crashes on w2k and xp, when XcvDataPort is called - with "AddPort" as command. We do not need to implement this */ + if (!lstrcmpW(pszDataName, cmd_AddPortW)) { + TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData)); + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot); + if (res == ERROR_SUCCESS) { + if (does_port_exist((LPWSTR) pInputData)) { + RegCloseKey(hroot); + return ERROR_ALREADY_EXISTS; + } + res = RegSetValueExW(hroot, (LPWSTR) pInputData, 0, REG_SZ, (const BYTE *) emptyW, sizeof(emptyW)); + RegCloseKey(hroot); + SetLastError(ERROR_SUCCESS); + return res; + } + return res; + } + if (!lstrcmpW(pszDataName, cmd_ConfigureLPTPortCommandOKW)) { TRACE("InputData (%d): %s\n", cbInputData, debugstr_w( (LPWSTR) pInputData));

1 0

Detlef Riekenberg : spoolss: Build the import library.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 3775c9c1be22b624f6b6010932c2767262faa438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3775c9c1be22b624f6b601093… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 17 23:18:05 2007 +0200 spoolss: Build the import library. --- .gitignore | 1 + dlls/Makefile.in | 4 ++++ dlls/spoolss/Makefile.in | 1 + 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 6ac3e49..b4298a7 100644 --- a/.gitignore +++ b/.gitignore @@ -510,6 +510,7 @@ dlls/snmpapi/tests/*.ok dlls/snmpapi/tests/snmpapi_crosstest.exe dlls/snmpapi/tests/testlist.c dlls/sound.drv16 +dlls/spoolss/libspoolss.def dlls/stdole2.tlb/rsrc.res dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/rsrc.res diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f465d7a..7ec5711 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -552,6 +552,7 @@ IMPORT_LIBS = \ shfolder/libshfolder.$(IMPLIBEXT) \ shlwapi/libshlwapi.$(IMPLIBEXT) \ snmpapi/libsnmpapi.$(IMPLIBEXT) \ + spoolss/libspoolss.$(IMPLIBEXT) \ sti/libsti.$(IMPLIBEXT) \ tapi32/libtapi32.$(IMPLIBEXT) \ unicows/libunicows.$(IMPLIBEXT) \ @@ -869,6 +870,9 @@ shlwapi/libshlwapi.$(IMPLIBEXT): shlwapi/shlwapi.spec $(WINEBUILD) snmpapi/libsnmpapi.$(IMPLIBEXT): snmpapi/snmpapi.spec $(WINEBUILD) @cd snmpapi && $(MAKE) libsnmpapi.$(IMPLIBEXT) +spoolss/libspoolss.$(IMPLIBEXT): spoolss/spoolss.spec $(WINEBUILD) + @cd spoolss && $(MAKE) libspoolss.$(IMPLIBEXT) + sti/libsti.$(IMPLIBEXT): sti/sti.spec $(WINEBUILD) @cd sti && $(MAKE) libsti.$(IMPLIBEXT) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index 5cca32e..6d2a310 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -3,6 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = spoolss.dll +IMPORTLIB = libspoolss.$(IMPLIBEXT) IMPORTS = winspool kernel32 C_SRCS = \

1 0

Aric Stewart : taskmgr: Add Japanese resource.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: ac64826d0b7a722a867db11242764d2df485f6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac64826d0b7a722a867db1124… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 17 07:41:52 2007 -0500 taskmgr: Add Japanese resource. --- programs/taskmgr/Ja.rc | 501 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 502 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac64826d0b7a722a867db…

1 0

Alexandre Julliard : server: Move the FSCTL_PIPE_WAIT ioctl implementation to the server.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 3684dc181c661eed8f1d5c3872d6be7874efeb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3684dc181c661eed8f1d5c387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 22:07:07 2007 +0200 server: Move the FSCTL_PIPE_WAIT ioctl implementation to the server. --- dlls/kernel32/tests/pipe.c | 3 + dlls/ntdll/file.c | 18 +------ include/wine/server_protocol.h | 20 +------- server/named_pipe.c | 104 +++++++++++++++++++++++---------------- server/protocol.def | 9 ---- server/request.h | 2 - server/trace.c | 17 +------ 7 files changed, 69 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3684dc181c661eed8f1d5…

1 0

Alexandre Julliard : server: Add a specific data type for ioctl codes so they can be printed as symbols .
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 737148c57bf56a0906c4c3aff109c5af78b81976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737148c57bf56a0906c4c3aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 22:06:13 2007 +0200 server: Add a specific data type for ioctl codes so they can be printed as symbols. --- include/wine/server_protocol.h | 3 ++- server/fd.c | 2 +- server/file.h | 4 ++-- server/named_pipe.c | 4 ++-- server/protocol.def | 3 ++- server/trace.c | 17 ++++++++++++++++- tools/make_requests | 1 + 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e45c7ad..df2eeaa 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -21,6 +21,7 @@ typedef unsigned short atom_t; typedef unsigned int process_id_t; typedef unsigned int thread_id_t; typedef unsigned int data_size_t; +typedef unsigned int ioctl_code_t; struct request_header { @@ -2668,7 +2669,7 @@ struct ioctl_request { struct request_header __header; obj_handle_t handle; - unsigned int code; + ioctl_code_t code; async_data_t async; /* VARARG(in_data,bytes); */ }; diff --git a/server/fd.c b/server/fd.c index 7f6c31c..d24eedc 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1855,7 +1855,7 @@ static void unmount_device( struct fd *device_fd ) } /* default ioctl() routine */ -void default_fd_ioctl( struct fd *fd, unsigned int code, const async_data_t *async, +void default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, const void *data, data_size_t size ) { switch(code) diff --git a/server/file.h b/server/file.h index 7109e75..262a011 100644 --- a/server/file.h +++ b/server/file.h @@ -40,7 +40,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform an ioctl on the file */ - void (*ioctl)(struct fd *fd, unsigned int code, const async_data_t *async, + void (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, const void *data, data_size_t size); /* queue an async operation */ void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); @@ -77,7 +77,7 @@ extern void default_poll_event( struct fd *fd, int event ); extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern void default_fd_ioctl( struct fd *fd, unsigned int code, const async_data_t *async, +extern void default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, const void *data, data_size_t size ); extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); diff --git a/server/named_pipe.c b/server/named_pipe.c index aebbdd3..a6871b7 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -139,7 +139,7 @@ static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); static void pipe_server_flush( struct fd *fd, struct event **event ); static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); -static void pipe_server_ioctl( struct fd *fd, unsigned int code, const async_data_t *async, +static void pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, const void *data, data_size_t size ); static const struct object_ops pipe_server_ops = @@ -565,7 +565,7 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) return FD_TYPE_PIPE; } -static void pipe_server_ioctl( struct fd *fd, unsigned int code, const async_data_t *async, +static void pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, const void *data, data_size_t size ) { struct pipe_server *server = get_fd_user( fd ); diff --git a/server/protocol.def b/server/protocol.def index e9e3c1e..9aff9e6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -37,6 +37,7 @@ typedef unsigned short atom_t; typedef unsigned int process_id_t; typedef unsigned int thread_id_t; typedef unsigned int data_size_t; +typedef unsigned int ioctl_code_t; struct request_header { @@ -1967,7 +1968,7 @@ enum message_type /* Perform an ioctl on a file */ @REQ(ioctl) obj_handle_t handle; /* handle to the device */ - unsigned int code; /* ioctl code */ + ioctl_code_t code; /* ioctl code */ async_data_t async; /* async I/O parameters */ VARARG(in_data,bytes); /* ioctl input data */ @REPLY diff --git a/server/trace.c b/server/trace.c index 44cf32e..59cdf1d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -36,6 +36,7 @@ #include "winbase.h" #include "wincon.h" #include "winternl.h" +#include "winioctl.h" #include "file.h" #include "request.h" #include "unicode.h" @@ -82,6 +83,18 @@ static void dump_char_info( const char_info_t *info ) fprintf( stderr, "',%04x}", info->attr ); } +static void dump_ioctl_code( const ioctl_code_t *code ) +{ + switch(*code) + { +#define CASE(c) case c: fputs( #c, stderr ); break + CASE(FSCTL_DISMOUNT_VOLUME); + CASE(FSCTL_PIPE_DISCONNECT); + default: fprintf( stderr, "%08x", *code ); break; +#undef CASE + } +} + static void dump_apc_call( const apc_call_t *call ) { fputc( '{', stderr ); @@ -2391,7 +2404,9 @@ static void dump_cancel_async_request( const struct cancel_async_request *req ) static void dump_ioctl_request( const struct ioctl_request *req ) { fprintf( stderr, " handle=%p,", req->handle ); - fprintf( stderr, " code=%08x,", req->code ); + fprintf( stderr, " code=" ); + dump_ioctl_code( &req->code ); + fprintf( stderr, "," ); fprintf( stderr, " async=" ); dump_async_data( &req->async ); fprintf( stderr, "," ); diff --git a/tools/make_requests b/tools/make_requests index d0bb0a5..e735de6 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -46,6 +46,7 @@ my %formats = "apc_result_t" => "&dump_apc_result", "async_data_t" => "&dump_async_data", "luid_t" => "&dump_luid", + "ioctl_code_t" => "&dump_ioctl_code", ); my @requests = ();

1 0

Alexandre Julliard : server: Change the timeout handling to use NT-style 64-bit timeouts everywhere.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: aaf477f292c77ca7d738784ac1100ba58ac4e27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf477f292c77ca7d738784ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 17 20:08:59 2007 +0200 server: Change the timeout handling to use NT-style 64-bit timeouts everywhere. --- dlls/kernel32/sync.c | 18 +++++++-- dlls/ntdll/file.c | 19 +++++---- dlls/ntdll/nt.c | 2 +- dlls/ntdll/ntdll_misc.h | 4 +- dlls/ntdll/process.c | 4 +- dlls/ntdll/server.c | 2 +- dlls/ntdll/sync.c | 51 +++++++++---------------- dlls/ntdll/thread.c | 4 +- dlls/ntdll/time.c | 81 ++++----------------------------------- dlls/user32/message.c | 11 ++++- include/wine/server_protocol.h | 41 +++++++++----------- server/async.c | 4 +- server/fd.c | 69 +++++++++++++++++++++++---------- server/file.h | 18 +++------ server/mailslot.c | 16 +++----- server/main.c | 8 ++- server/named_pipe.c | 21 ++-------- server/object.h | 4 +- server/process.c | 18 +++------ server/process.h | 4 +- server/protocol.def | 42 ++++++++++----------- server/queue.c | 25 +++++------- server/registry.c | 7 +-- server/request.c | 19 +++------ server/serial.c | 13 ++---- server/thread.c | 54 ++++++++++++--------------- server/thread.h | 4 +- server/timer.c | 61 ++++++++++++------------------ server/trace.c | 68 +++++++++++++++++----------------- server/winstation.c | 4 +- tools/make_requests | 2 +- 31 files changed, 296 insertions(+), 402 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf477f292c77ca7d7387…

1 0

appdb/ ./index.php include/sidebar_login.php
by WineHQ 17 Apr '07

17 Apr '07

ChangeSet ID: 31050 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/17 18:30:51 Modified files: . : index.php include : sidebar_login.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Show more register links. Make registration easier by showing a register link together with the log in link on the front page and on the user menu. Patch: http://cvs.winehq.org/patch.py?id=31050 Old revision New revision Changes Path 1.45 1.46 +2 -1 appdb/index.php 1.21 1.22 +2 -1 appdb/include/sidebar_login.php Index: appdb/index.php diff -u -p appdb/index.php:1.45 appdb/index.php:1.46 --- appdb/index.php:1.45 17 Apr 2007 23:30:51 -0000 +++ appdb/index.php 17 Apr 2007 23:30:51 -0000 @@ -38,7 +38,8 @@ if(!$_SESSION['current']->isLoggedIn()) $str_benefits - <p>So what are you waiting for, [<a href=\"account.php?sCmd=login\">login now</a>]. Your help in + <p>So what are you waiting for, [<a href=\"account.php?sCmd=login\">log in</a>] + or [<a href=\"account.php?sCmd=new\">register</a>] now! Your help in stomping out Wine issues will be greatly appreciated.</p>"; } else { Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.21 appdb/include/sidebar_login.php:1.22 --- appdb/include/sidebar_login.php:1.21 17 Apr 2007 23:30:51 -0000 +++ appdb/include/sidebar_login.php 17 Apr 2007 23:30:51 -0000 @@ -61,7 +61,8 @@ function global_sidebar_login() { } else { - $g->add("Login", BASE."account.php?sCmd=login"); + $g->add("Log in", BASE."account.php?sCmd=login"); + $g->add("Register", BASE."account.php?sCmd=new"); } $g->done();

1 0

appdb/include testData.php
by WineHQ 17 Apr '07

17 Apr '07

ChangeSet ID: 31049 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/17 18:28:10 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix mails for updated test results. Pass the correct 'edit' parameter to sendNotificationMail() and only send mail if the test data has been changed. Patch: http://cvs.winehq.org/patch.py?id=31049 Old revision New revision Changes Path 1.39 1.40 +6 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.39 appdb/include/testData.php:1.40 --- appdb/include/testData.php:1.39 17 Apr 2007 23:28:10 -0000 +++ appdb/include/testData.php 17 Apr 2007 23:28:10 -0000 @@ -100,6 +100,11 @@ class testData{ return; } + $oOldTest = new testData($this->iTestingId); + /* Nothing changed */ + if($this == $oOldTest) + return TRUE; + if(query_parameters("UPDATE testResults SET versionId = '?', whatWorks = '?', @@ -127,7 +132,7 @@ class testData{ $this->iTestingId)) { if(!$bSilent) - $this->SendNotificationMail(); + $this->SendNotificationMail("edit"); return true; } else

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
69
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2007