wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Francois Gouget : wininet; Mark internal symbols with hidden visibility.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: ef0b22aabb9f33fd90b914c4ddac16d0447adc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0b22aabb9f33fd90b914c4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:27 2015 +0200 wininet; Mark internal symbols with hidden visibility. --- dlls/wininet/internet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3f1da71..925bfd0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -437,7 +437,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; void req_file_release(req_file_t*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 6027c88cdf8a4ffdded935de6fb70496941871cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6027c88cdf8a4ffdded935de6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:07 2015 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/psdrv.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index faefd71..75c062a 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -393,7 +393,7 @@ static inline PSDRV_PDEVICE *get_psdrv_dev( PHYSDEV dev ) * Every glyph name in the Adobe Glyph List and the 35 core PostScript fonts */ -extern const INT PSDRV_AGLGlyphNamesSize; +extern const INT PSDRV_AGLGlyphNamesSize DECLSPEC_HIDDEN; extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; @@ -401,19 +401,19 @@ extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; * The AGL encoding vector */ -extern const INT PSDRV_AGLbyNameSize; /* sorted by name - */ -extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ +extern const INT PSDRV_AGLbyNameSize DECLSPEC_HIDDEN; /* sorted by name */ +extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ -extern const INT PSDRV_AGLbyUVSize; /* sorted by UV - */ -extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ +extern const INT PSDRV_AGLbyUVSize DECLSPEC_HIDDEN; /* sorted by UV */ +extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0

Francois Gouget : wineconsole: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 2271d82cdaffd964b41fd573da3e9f8f78227afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271d82cdaffd964b41fd573d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:37 2015 +0200 wineconsole: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/wineconsole/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 8ca6563..8573d07 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -22,7 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : winecfg: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 6f64673fb56882e69b6baec78586ea1ff88c1474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f64673fb56882e69b6baec78… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:23 2015 +0200 winecfg: Remove unneeded NONAMELESSXXX directives. --- programs/winecfg/appdefaults.c | 1 - programs/winecfg/audio.c | 1 - programs/winecfg/libraries.c | 1 - programs/winecfg/main.c | 2 -- 4 files changed, 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 66085f4..49531fa 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -22,7 +22,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSUNION #include <windows.h> #include <commdlg.h> #include <wine/debug.h> diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 6446a67..5b03f45 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -20,7 +20,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSSTRUCT #define NONAMELESSUNION #include "config.h" diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index a9889e5..f00449d 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -23,7 +23,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSUNION #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 6ac5f89..b8a85fe 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -22,9 +22,7 @@ */ #define WIN32_LEAN_AND_MEAN - #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <windows.h> #include <commctrl.h>

1 0

Francois Gouget : regedit: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 1402201cd61b4412331c5c1f469a5940991b6a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1402201cd61b4412331c5c1f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:02 2015 +0200 regedit: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/regedit/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 97a0bf2..0ac5252 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -22,7 +22,7 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include <windows.h> #include <commctrl.h> #include <stdlib.h>

1 0

Francois Gouget : rpcss: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 546b1c4cea1ce96ecef948363970d4eccef2d6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=546b1c4cea1ce96ecef948363… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:11 2015 +0200 rpcss: Remove unneeded NONAMELESSXXX directives. --- programs/rpcss/rpcss_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 661da4a..1d246ea 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -48,8 +48,6 @@ #include <limits.h> #include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnt.h"

1 0

Francois Gouget : winedbg: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: c4f791880145ba41d41690f887e7c700b23209af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f791880145ba41d41690f88… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:24:55 2015 +0200 winedbg: Remove unneeded NONAMELESSXXX directives. --- programs/winedbg/be_x86_64.c | 2 ++ programs/winedbg/debugger.h | 2 -- programs/winedbg/symbol.c | 3 --- programs/winedbg/tgt_module.c | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 029f9f1..17feb88 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "debugger.h" #include "wine/debug.h" diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ba49f1e..e8a4d73 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -24,8 +24,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #define WIN32_LEAN_AND_MEAN diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 3069d66..c43cba9 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdlib.h> #include <stdio.h> diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 44e3c9f..58c4282 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdlib.h>

1 0

Andrew Cook : server: Implement io completion messages for job objects.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 47ffeaee7406e41708d9d5523308e3b2f4850f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ffeaee7406e41708d9d5523… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 08:56:55 2015 +1100 server: Implement io completion messages for job objects. --- dlls/kernel32/tests/process.c | 4 ---- dlls/ntdll/sync.c | 15 +++++++++++++++ include/wine/server_protocol.h | 20 +++++++++++++++++++- server/process.c | 37 +++++++++++++++++++++++++++++++++++++ server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 10 ++++++++++ 7 files changed, 95 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47ffeaee7406e41708d9d…

1 0

Andrew Cook : server: Implement job inheritance.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: 0dbe5adc2117e943c66009dd2b9a744c9a833e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbe5adc2117e943c66009dd2… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 08:56:40 2015 +1100 server: Implement job inheritance. --- dlls/kernel32/tests/process.c | 3 --- server/process.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c991108..a6f86e8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2485,7 +2485,6 @@ static void test_jobInheritance(HANDLE job) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); dwret = WaitForSingleObject(pi.hProcess, 1000); @@ -2513,9 +2512,7 @@ static void test_BreakawayOk(HANDLE job) snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); - todo_wine ok(!ret, "CreateProcessA expected failure\n"); - todo_wine expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); if (ret) diff --git a/server/process.c b/server/process.c index 84c6c82..c124705 100644 --- a/server/process.c +++ b/server/process.c @@ -1039,6 +1039,14 @@ DECL_HANDLER(new_process) return; } + if (parent->job && (req->create_flags & CREATE_BREAKAWAY_FROM_JOB) && + !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) + { + set_error( STATUS_ACCESS_DENIED ); + close( socket_fd ); + return; + } + if (!req->info_size) /* create an orphaned process */ { create_process( socket_fd, NULL, 0 ); @@ -1109,6 +1117,13 @@ DECL_HANDLER(new_process) && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); + if (parent->job + && !(req->create_flags & CREATE_BREAKAWAY_FROM_JOB) + && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + { + add_job_process( parent->job, process ); + } + /* connect to the window station */ connect_process_winstation( process, current );

1 0

Andrew Cook : server: Implement job limit flags.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: ecd41d1de7461b9601e61ee387b24a9610e22b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd41d1de7461b9601e61ee38… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 20:40:15 2015 +1100 server: Implement job limit flags. --- dlls/kernel32/tests/process.c | 1 + dlls/ntdll/sync.c | 42 ++++++++++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- include/winnt.h | 4 ++++ server/process.c | 13 +++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fd47951..c991108 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2387,6 +2387,7 @@ static void test_CompletionPort(void) port_info.CompletionKey = job; port_info.CompletionPort = port; ret = pSetInformationJobObject(job, JobObjectAssociateCompletionPortInformation, &port_info, sizeof(port_info)); + todo_wine ok(ret, "SetInformationJobObject error %u\n", GetLastError()); create_process("wait", &pi); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ce1a635..fff38c9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -634,8 +634,46 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c */ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len ) { - FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_SUCCESS; + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; + ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); + DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS; + + TRACE( "(%p, %u, %p, %u)\n", handle, class, info, len ); + + if (class >= MaxJobObjectInfoClass) + return STATUS_INVALID_PARAMETER; + + switch (class) + { + + case JobObjectExtendedLimitInformation: + info_size = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); + limit_flags = JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS; + /* fallthrough */ + case JobObjectBasicLimitInformation: + if (len != info_size) + return STATUS_INVALID_PARAMETER; + + basic_limit = info; + if (basic_limit->LimitFlags & ~limit_flags) + return STATUS_INVALID_PARAMETER; + + SERVER_START_REQ( set_job_limits ) + { + req->handle = wine_server_obj_handle( handle ); + req->limit_flags = basic_limit->LimitFlags; + status = wine_server_call( req ); + } + SERVER_END_REQ; + break; + + default: + FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); + return STATUS_NOT_IMPLEMENTED; + } + + return status; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5a9f3ab..6e113e7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5127,6 +5127,20 @@ struct process_in_job_reply }; + +struct set_job_limits_request +{ + struct request_header __header; + obj_handle_t handle; + unsigned int limit_flags; + char __pad_20[4]; +}; +struct set_job_limits_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5388,6 +5402,7 @@ enum request REQ_create_job, REQ_assign_job, REQ_process_in_job, + REQ_set_job_limits, REQ_NB_REQUESTS }; @@ -5654,6 +5669,7 @@ union generic_request struct create_job_request create_job_request; struct assign_job_request assign_job_request; struct process_in_job_request process_in_job_request; + struct set_job_limits_request set_job_limits_request; }; union generic_reply { @@ -5918,8 +5934,9 @@ union generic_reply struct create_job_reply create_job_reply; struct assign_job_reply assign_job_reply; struct process_in_job_reply process_in_job_reply; + struct set_job_limits_reply set_job_limits_reply; }; -#define SERVER_PROTOCOL_VERSION 463 +#define SERVER_PROTOCOL_VERSION 464 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winnt.h b/include/winnt.h index 4b06b2c..c2aa50e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5610,6 +5610,10 @@ typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION { #define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x00002000 #define JOB_OBJECT_LIMIT_SUBSET_AFFINITY 0x00004000 +#define JOB_OBJECT_LIMIT_VALID_FLAGS 0x0007ffff +#define JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS 0x000000ff +#define JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS 0x00007fff + typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { RelationProcessorCore = 0, diff --git a/server/process.c b/server/process.c index 9534f90..84c6c82 100644 --- a/server/process.c +++ b/server/process.c @@ -146,6 +146,7 @@ struct job struct object obj; /* object header */ struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ + unsigned int limit_flags; /* limit flags */ }; static const struct object_ops job_ops = @@ -184,6 +185,7 @@ static struct job *create_job_object( struct directory *root, const struct unico SACL_SECURITY_INFORMATION ); list_init( &job->process_list ); job->num_processes = 0; + job->limit_flags = 0; } } return job; @@ -1506,3 +1508,14 @@ DECL_HANDLER(process_in_job) } release_object( process ); } + +/* update limits of the job object */ +DECL_HANDLER(set_job_limits) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_SET_ATTRIBUTES ); + + if (!job) return; + + job->limit_flags = req->limit_flags; + release_object( job ); +} diff --git a/server/protocol.def b/server/protocol.def index b85adca..35de6ff 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3528,3 +3528,10 @@ enum coords_relative obj_handle_t job; /* handle to the job */ obj_handle_t process; /* handle to the process */ @END + + +/* Set limit flags on a job */ +@REQ(set_job_limits) + obj_handle_t handle; /* handle to the job */ + unsigned int limit_flags; /* new limit flags */ +@END diff --git a/server/request.h b/server/request.h index aef316a..d76ddea 100644 --- a/server/request.h +++ b/server/request.h @@ -365,6 +365,7 @@ DECL_HANDLER(set_suspend_context); DECL_HANDLER(create_job); DECL_HANDLER(assign_job); DECL_HANDLER(process_in_job); +DECL_HANDLER(set_job_limits); #ifdef WANT_REQUEST_HANDLERS @@ -630,6 +631,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_job, (req_handler)req_assign_job, (req_handler)req_process_in_job, + (req_handler)req_set_job_limits, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2221,6 +2223,9 @@ C_ASSERT( sizeof(struct assign_job_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct process_in_job_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct process_in_job_request, process) == 16 ); C_ASSERT( sizeof(struct process_in_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_job_limits_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_job_limits_request, limit_flags) == 16 ); +C_ASSERT( sizeof(struct set_job_limits_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index cba15a3..3d8e349 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4119,6 +4119,12 @@ static void dump_process_in_job_request( const struct process_in_job_request *re fprintf( stderr, ", process=%04x", req->process ); } +static void dump_set_job_limits_request( const struct set_job_limits_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", limit_flags=%08x", req->limit_flags ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4379,6 +4385,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_job_request, (dump_func)dump_assign_job_request, (dump_func)dump_process_in_job_request, + (dump_func)dump_set_job_limits_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4641,6 +4648,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_job_reply, NULL, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4903,6 +4911,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_job", "assign_job", "process_in_job", + "set_job_limits", }; static const struct

1 0

← Newer
1
...
38
39
40
41
42
43
44
45
46
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 2015