December 2005 - Wine-Commits

H. Verbeet : d3d9: Add a test for Get/SetVertexShader and Get/SetPixelShader refcounts.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 510c94d2d51d2db236766dcd35ee89998704ae45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=510c94d2d51d2db236766dc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 13 12:00:25 2005 +0100 d3d9: Add a test for Get/SetVertexShader and Get/SetPixelShader refcounts. --- dlls/d3d9/tests/.gitignore | 1 dlls/d3d9/tests/Makefile.in | 1 dlls/d3d9/tests/shader.c | 152 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 0 deletions(-) create mode 100644 dlls/d3d9/tests/shader.c diff --git a/dlls/d3d9/tests/.gitignore b/dlls/d3d9/tests/.gitignore index 7e88d2b..bb354df 100644 --- a/dlls/d3d9/tests/.gitignore +++ b/dlls/d3d9/tests/.gitignore @@ -1,3 +1,4 @@ Makefile +shader.ok stateblock.ok testlist.c diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index d96a9ad..ab026e0 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = d3d9.dll IMPORTS = user32 kernel32 CTESTS = \ + shader.c \ stateblock.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c new file mode 100644 index 0000000..8622e6e --- /dev/null +++ b/dlls/d3d9/tests/shader.c @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2005 Henri Verbeet + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define COBJMACROS +#include <d3d9.h> +#include "wine/test.h" + +static IDirect3DDevice9 *init_d3d9(void) +{ + IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; + HMODULE d3d9_handle = 0; + IDirect3D9 *d3d9_ptr = 0; + IDirect3DDevice9 *device_ptr = 0; + D3DPRESENT_PARAMETERS present_parameters; + HRESULT hres; + + d3d9_handle = LoadLibrary("d3d9"); + ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); + if (!d3d9_handle) return NULL; + + d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); + ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); + if (!d3d9_create) return NULL; + + d3d9_ptr = d3d9_create(D3D_SDK_VERSION); + ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); + if (!d3d9_ptr) return NULL; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = GetDesktopWindow(); + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%lx\n", hres); + + return device_ptr; +} + +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef(object); + return IUnknown_Release(object); +} + +static void test_get_set_vertex_shader(IDirect3DDevice9 *device_ptr) +{ + + static DWORD simple_vs[] = {0xFFFE0101, /* vs_1_1 */ + 0x0000001F, 0x80000000, 0x900F0000, /* dcl_position0 v0 */ + 0x00000009, 0xC0010000, 0x90E40000, 0xA0E40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xC0020000, 0x90E40000, 0xA0E40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xC0040000, 0x90E40000, 0xA0E40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xC0080000, 0x90E40000, 0xA0E40003, /* dp4 oPos.w, v0, c3 */ + 0x0000FFFF}; /* END */ + + IDirect3DVertexShader9 *shader_ptr = 0; + IDirect3DVertexShader9 *current_shader_ptr = 0; + HRESULT hret = 0; + int shader_refcount = 0; + int i = 0; + + hret = IDirect3DDevice9_CreateVertexShader(device_ptr, simple_vs, &shader_ptr); + ok(hret == D3D_OK && shader_ptr != NULL, "CreateVertexShader returned: hret 0x%lx, shader_ptr %p. " + "Expected hret 0x%lx, shader_ptr != %p. Aborting.\n", hret, shader_ptr, D3D_OK, NULL); + if (hret != D3D_OK || shader_ptr == NULL) return; + + /* SetVertexShader should not touch the shader's refcount. */ + i = get_refcount((IUnknown *)shader_ptr); + hret = IDirect3DDevice9_SetVertexShader(device_ptr, shader_ptr); + shader_refcount = get_refcount((IUnknown *)shader_ptr); + ok(hret == D3D_OK && shader_refcount == i, "SetVertexShader returned: hret 0x%lx, refcount %d. " + "Expected hret 0x%lx, refcount %d.\n", hret, shader_refcount, D3D_OK, i); + + /* GetVertexShader should increase the shader's refcount by one. */ + i = shader_refcount+1; + hret = IDirect3DDevice9_GetVertexShader(device_ptr, &current_shader_ptr); + shader_refcount = get_refcount((IUnknown *)shader_ptr); + ok(hret == D3D_OK && shader_refcount == i && current_shader_ptr == shader_ptr, + "GetVertexShader returned: hret 0x%lx, current_shader_ptr %p refcount %d. " + "Expected hret 0x%lx, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); +} + +static void test_get_set_pixel_shader(IDirect3DDevice9 *device_ptr) +{ + static DWORD simple_ps[] = {0xFFFF0101, /* ps_1_1 */ + 0x00000051, 0xA00F0001, 0x3F800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ + 0x00000042, 0xB00F0000, /* tex t0 */ + 0x00000008, 0x800F0000, 0xA0E40001, 0xA0E40000, /* dp3 r0, c1, c0 */ + 0x00000005, 0x800F0000, 0x90E40000, 0x80E40000, /* mul r0, v0, r0 */ + 0x00000005, 0x800F0000, 0xB0E40000, 0x80E40000, /* mul r0, t0, r0 */ + 0x0000FFFF}; /* END */ + + IDirect3DPixelShader9 *shader_ptr = 0; + IDirect3DPixelShader9 *current_shader_ptr = 0; + HRESULT hret = 0; + int shader_refcount = 0; + int i = 0; + + hret = IDirect3DDevice9_CreatePixelShader(device_ptr, simple_ps, &shader_ptr); + ok(hret == D3D_OK && shader_ptr != NULL, "CreatePixelShader returned: hret 0x%lx, shader_ptr %p. " + "Expected hret 0x%lx, shader_ptr != %p. Aborting.\n", hret, shader_ptr, D3D_OK, NULL); + if (hret != D3D_OK || shader_ptr == NULL) return; + + /* SetPixelsShader should not touch the shader's refcount. */ + i = get_refcount((IUnknown *)shader_ptr); + hret = IDirect3DDevice9_SetPixelShader(device_ptr, shader_ptr); + shader_refcount = get_refcount((IUnknown *)shader_ptr); + ok(hret == D3D_OK && shader_refcount == i, "SetPixelShader returned: hret 0x%lx, refcount %d. " + "Expected hret 0x%lx, refcount %d.\n", hret, shader_refcount, D3D_OK, i); + + /* GetPixelShader should increase the shader's refcount by one. */ + i = shader_refcount+1; + hret = IDirect3DDevice9_GetPixelShader(device_ptr, &current_shader_ptr); + shader_refcount = get_refcount((IUnknown *)shader_ptr); + ok(hret == D3D_OK && shader_refcount == i && current_shader_ptr == shader_ptr, + "GetPixelShader returned: hret 0x%lx, current_shader_ptr %p refcount %d. " + "Expected hret 0x%lx, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); +} + +START_TEST(shader) +{ + D3DCAPS9 caps; + IDirect3DDevice9 *device_ptr = init_d3d9(); + if (!device_ptr) return; + + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + + if (caps.VertexShaderVersion & 0xffff) + { + test_get_set_vertex_shader(device_ptr); + } + if (caps.PixelShaderVersion & 0xffff) + { + test_get_set_pixel_shader(device_ptr); + } +}

1 0

Alexandre Julliard : server: Added get_file_info implementation for named pipe and mailslot devices.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 1acb930db82d805de6244f4f5b2ccdf839d28265 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1acb930db82d805de6244f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 12:00:11 2005 +0100 server: Added get_file_info implementation for named pipe and mailslot devices. --- server/mailslot.c | 18 ++++++++++++------ server/named_pipe.c | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index d4e277b..12d9a78 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -153,6 +153,7 @@ static struct fd *mailslot_device_get_fd static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void mailslot_device_destroy( struct object *obj ); +static int mailslot_device_get_file_info( struct fd *fd ); static const struct object_ops mailslot_device_ops = { @@ -172,12 +173,12 @@ static const struct object_ops mailslot_ static const struct fd_ops mailslot_device_fd_ops = { - default_fd_get_poll_events, /* get_poll_events */ - default_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_file_info, /* get_file_info */ - default_fd_queue_async, /* queue_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + mailslot_device_get_file_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async /* cancel_async */ }; static void mailslot_destroy( struct object *obj) @@ -304,6 +305,11 @@ static void mailslot_device_destroy( str if (device->mailslots) free( device->mailslots ); } +static int mailslot_device_get_file_info( struct fd *fd ) +{ + return 0; +} + struct mailslot_device *create_mailslot_device( struct directory *root, const struct unicode_str *name ) { struct mailslot_device *dev; diff --git a/server/named_pipe.c b/server/named_pipe.c index d8892ed..8b25bc1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -200,6 +200,7 @@ static struct fd *named_pipe_device_get_ static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void named_pipe_device_destroy( struct object *obj ); +static int named_pipe_device_get_file_info( struct fd *fd ); static const struct object_ops named_pipe_device_ops = { @@ -219,12 +220,12 @@ static const struct object_ops named_pip static const struct fd_ops named_pipe_device_fd_ops = { - default_fd_get_poll_events, /* get_poll_events */ - default_poll_event, /* poll_event */ - no_flush, /* flush */ - no_get_file_info, /* get_file_info */ - default_fd_queue_async, /* queue_async */ - default_fd_cancel_async /* cancel_async */ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + named_pipe_device_get_file_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async /* cancel_async */ }; static void named_pipe_dump( struct object *obj, int verbose ) @@ -437,6 +438,11 @@ static void named_pipe_device_destroy( s if (device->pipes) free( device->pipes ); } +static int named_pipe_device_get_file_info( struct fd *fd ) +{ + return 0; +} + /* this will be deleted as soon an we fix wait_named_pipe */ static struct named_pipe_device *named_pipe_device;

1 0

Alexandre Julliard : server: Fixed refcounting in get_fd requests for named pipe and mailslot devices.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 5bcd0888ef64c24524280ba36ab4e74c93aa3d6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5bcd0888ef64c24524280ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 11:22:28 2005 +0100 server: Fixed refcounting in get_fd requests for named pipe and mailslot devices. --- server/mailslot.c | 2 +- server/named_pipe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index b6344d2..d4e277b 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -279,7 +279,7 @@ static void mailslot_device_dump( struct static struct fd *mailslot_device_get_fd( struct object *obj ) { struct mailslot_device *device = (struct mailslot_device *)obj; - return device->fd; + return (struct fd *)grab_object( device->fd ); } static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, diff --git a/server/named_pipe.c b/server/named_pipe.c index e451156..d8892ed 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -411,7 +411,7 @@ static void named_pipe_device_dump( stru static struct fd *named_pipe_device_get_fd( struct object *obj ) { struct named_pipe_device *device = (struct named_pipe_device *)obj; - return device->fd; + return (struct fd *)grab_object( device->fd ); } static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name,

1 0

Robert Shearman : widl: Start generating type format strings.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 435e36e3664ca5944965a62c8294bda1db756e38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=435e36e3664ca5944965a62… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 13 11:22:08 2005 +0100 widl: Start generating type format strings. Based on a patch by Eric Kohl. --- tools/widl/client.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/typegen.h | 2 +- 4 files changed, 64 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 24bcda8..e0c4295 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -504,7 +504,7 @@ void write_client(ifref_t *ifaces) fprintf(client, "\n"); write_procformatstring(client, iface->iface); - write_typeformatstring(client); + write_typeformatstring(client, iface->iface); fprintf(client, "\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index d90fc8d..cb10993 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -514,7 +514,7 @@ void write_server(ifref_t *ifaces) fprintf(server, "\n"); write_procformatstring(server, iface->iface); - write_typeformatstring(server); + write_typeformatstring(server, iface->iface); fprintf(server, "\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6cdff1f..32ac8e8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -137,9 +137,52 @@ void write_procformatstring(FILE *file, } -void write_typeformatstring(FILE *file) +static void write_typeformatstring_var(FILE *file, int indent, var_t *var) +{ + int ptr_level = var->ptr_level; + + /* basic types don't need a type format string */ + if (ptr_level == 0) + return; + + if (ptr_level == 1) + { + switch (var->type->type) + { +#define CASE_BASETYPE(fctype) \ + case RPC_##fctype: \ + print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ + break + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_USMALL); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ENUM16); + CASE_BASETYPE(FC_ENUM32); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_ERROR_STATUS_T); + default: + error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + } + } +} + +void write_typeformatstring(FILE *file, type_t *iface) { int indent = 0; + func_t *func = iface->funcs; + var_t *var; + print_file(file, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_file(file, indent, "{\n"); indent++; @@ -147,6 +190,23 @@ void write_typeformatstring(FILE *file) print_file(file, indent, "{\n"); indent++; print_file(file, indent, "NdrFcShort(0x0),\n"); + + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + write_typeformatstring_var(file, indent, var); + var = PREV_LINK(var); + } + } + func = PREV_LINK(func); + } + print_file(file, indent, "0x0\n"); indent--; print_file(file, indent, "}\n"); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 5517c62..6670197 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -21,7 +21,7 @@ void write_procformatstring(FILE *file, type_t *iface); -void write_typeformatstring(FILE *file); +void write_typeformatstring(FILE *file, type_t *iface); unsigned int get_required_buffer_size(type_t *type); void marshall_arguments(FILE *file, int indent, func_t *func); void unmarshall_arguments(FILE *file, int indent, func_t *func);

1 0

Eric Kohl : widl: Server stubs in generated code are void functions.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: c4173f7b99f72a25b444740da10d9d93f7f35b0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4173f7b99f72a25b444740… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Dec 13 11:12:37 2005 +0100 widl: Server stubs in generated code are void functions. --- tools/widl/server.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 4c9fcbd..d90fc8d 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -120,8 +120,7 @@ static void write_function_stubs(type_t } } - write_type(server, def->type, def, def->tname); - fprintf(server, " __RPC_STUB\n"); + fprintf(server, "void __RPC_STUB\n"); fprintf(server, "%s_", iface->name); write_name(server, def); fprintf(server, "(\n");

1 0

Eric Pouech : winecfg: Simplified module handling code.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: e7ecbe4228ab27ff32e025549b5daf0796a68e53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7ecbe4228ab27ff32e0255… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 13 11:12:24 2005 +0100 winecfg: Simplified module handling code. --- programs/winecfg/audio.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 232a41c..36227ca 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -171,10 +171,8 @@ static void initAudioDeviceTree(HWND hDl } else { - HINSTANCE lib; - - lib = LoadLibrary(name); - if (lib) + HMODULE lib; + if ((lib = GetDriverModuleHandle(hdrv))) { int num_wod = 0, num_wid = 0, num_mod = 0, num_mid = 0, num_aux = 0, num_mxd = 0; MessagePtr wodMessagePtr = (MessagePtr)GetProcAddress(lib, "wodMessage"); @@ -371,7 +369,6 @@ static void initAudioDeviceTree(HWND hDl } } } - FreeLibrary(lib); } } }

1 0

Marcus Meissner : wininet: Reinitialise NETCON on redirect.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 73893a74fd84714210707d9b2e7b3f547c411190 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73893a74fd84714210707d9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 13 11:12:09 2005 +0100 wininet: Reinitialise NETCON on redirect. --- dlls/wininet/http.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f35e2ae..b08c6be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1865,6 +1865,7 @@ static BOOL HTTP_HandleRedirect(LPWININE sizeof(struct sockaddr_in)); NETCON_close(&lpwhr->netConnection); + NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE); } HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);

1 0

Eric Pouech : winedump: Const correctness fixes.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: a6e27ea9c0a0f901041b3973860d944831db2ce9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6e27ea9c0a0f901041b397… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 13 11:11:38 2005 +0100 winedump: Const correctness fixes. --- tools/winedump/le.c | 10 +++++----- tools/winedump/ne.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/winedump/le.c b/tools/winedump/le.c index 57b34a2..16646f3 100644 --- a/tools/winedump/le.c +++ b/tools/winedump/le.c @@ -228,15 +228,15 @@ static void dump_le_header( const IMAGE_ static void dump_le_objects( const void *base, const IMAGE_VXD_HEADER *le ) { - struct o32_obj *pobj; + const struct o32_obj *pobj; unsigned int i; printf("\nObject table:\n"); - pobj = (struct o32_obj *)((const unsigned char *)le + le->e32_objtab); + pobj = (const struct o32_obj *)((const unsigned char *)le + le->e32_objtab); for (i = 0; i < le->e32_objcnt; i++) { unsigned int j; - struct o32_map *pmap=0; + const struct o32_map *pmap=0; printf(" Obj. Rel.Base Codesize Flags Tableidx Tablesize Name\n"); printf(" %04X %08lx %08lx %08lx %08lx %08lx ", i + 1, @@ -272,7 +272,7 @@ static void dump_le_objects( const void printf(" Page tables:\n"); printf(" Tableidx Offset Flags\n"); - pmap = (struct o32_map *)((const unsigned char *)le + le->e32_objmap); + pmap = (const struct o32_map *)((const unsigned char *)le + le->e32_objmap); pmap = &(pmap[pobj->o32_pagemap - 1]); for (j = 0; j < pobj->o32_mapsize; j++) { @@ -300,7 +300,7 @@ static void dump_le_names( const void *b if (le->e32_cbnrestab) { printf( "\nNon-resident name table:\n" ); - pstr = (unsigned char *)base + le->e32_nrestab; + pstr = (const unsigned char *)base + le->e32_nrestab; while (*pstr) { printf( " %4d: %*.*s\n", get_word(pstr + *pstr + 1), *pstr, *pstr, diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index 47b3dae..2cc31a7 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -108,7 +108,7 @@ static void dump_ne_names( const void *b if (ne->ne_cbnrestab) { printf( "\nNon-resident name table:\n" ); - pstr = (unsigned char *)base + ne->ne_nrestab; + pstr = (const unsigned char *)base + ne->ne_nrestab; while (*pstr) { printf( " %4d: %*.*s\n", get_word(pstr + *pstr + 1), *pstr, *pstr, pstr + 1 ); @@ -171,7 +171,7 @@ static void dump_ne_resources( const voi static const char *get_export_name( const void *base, const IMAGE_OS2_HEADER *ne, int ordinal ) { static char name[256]; - BYTE *pstr; + const BYTE *pstr; int pass = 0; /* search the resident names */ @@ -180,13 +180,13 @@ static const char *get_export_name( cons { if (pass == 0) /* resident names */ { - pstr = (BYTE *)ne + ne->ne_restab; + pstr = (const BYTE *)ne + ne->ne_restab; if (*pstr) pstr += *pstr + 1 + sizeof(WORD); /* skip first entry (module name) */ } else /* non-resident names */ { if (!ne->ne_cbnrestab) break; - pstr = (BYTE *)base + ne->ne_nrestab; + pstr = (const BYTE *)base + ne->ne_nrestab; } while (*pstr) { @@ -207,8 +207,8 @@ static const char *get_export_name( cons static void dump_ne_exports( const void *base, const IMAGE_OS2_HEADER *ne ) { - BYTE *ptr = (BYTE *)ne + ne->ne_enttab; - BYTE *end = ptr + ne->ne_cbenttab; + const BYTE *ptr = (const BYTE *)ne + ne->ne_enttab; + const BYTE *end = ptr + ne->ne_cbenttab; int i, ordinal = 1; if (!ne->ne_cbenttab || !*ptr) return;

1 0

Juan Lang : iphlpapi: Fix a couple of file descriptor leaks.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 36ac9f86652911b03b4c35dae4d9d32148eca85f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36ac9f86652911b03b4c35d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Dec 13 11:11:53 2005 +0100 iphlpapi: Fix a couple of file descriptor leaks. --- dlls/iphlpapi/ifenum.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c608cd1..63a66af 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -818,6 +818,7 @@ DWORD getInterfaceMtuByName(const char * #endif ret = NO_ERROR; } + close(fd); } else ret = ERROR_NO_MORE_FILES; @@ -858,6 +859,7 @@ DWORD getInterfaceStatusByName(const cha *status = MIB_IF_OPER_STATUS_NON_OPERATIONAL; ret = NO_ERROR; } + close(fd); } else ret = ERROR_NO_MORE_FILES;

1 0

Juan Lang : crypt32: Decode cleanups.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 07dfb1ae27dfbfd44008c8362ef6114a703b8688 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=07dfb1ae27dfbfd44008c83… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Dec 13 11:11:25 2005 +0100 crypt32: Decode cleanups. - implement a helper to decode sequences of like types - use helper functions wherever applicable when decoding - correct "expected" vs. "got" usage in tests - fix a few other small bugs --- dlls/crypt32/encode.c | 889 ++++++++++++++----------------------------- dlls/crypt32/tests/encode.c | 14 - 2 files changed, 298 insertions(+), 605 deletions(-)

1 0

H. Verbeet : wined3d: Don't change the shader's refcount in SetVertexShader and
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 6077c63feb2e0d70a077fbda3c1978c95f4c113f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6077c63feb2e0d70a077fbd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 13 11:11:01 2005 +0100 wined3d: Don't change the shader's refcount in SetVertexShader and SetPixelShader. --- dlls/wined3d/device.c | 37 +++---------------------------------- 1 files changed, 3 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3a7f9c..a9c253f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3761,7 +3761,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShader(IWineD3DDevice *iface, IWineD3DVertexShader* pShader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVertexShader *oldShader = This->updateStateBlock->vertexShader; This->updateStateBlock->vertexShader = pShader; This->updateStateBlock->changed.vertexShader = TRUE; @@ -3772,20 +3771,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer return D3D_OK; } - if (pShader != NULL) { - IUnknown *newVertexShaderParent; - /* GetParent will add a ref, so leave it hanging until the vertex buffer is cleared */ - TRACE("(%p) : setting pShader(%p)\n", This, pShader); - IWineD3DVertexShader_GetParent(pShader, &newVertexShaderParent); - } else { - TRACE("Clear down the shader\n"); - } - if (oldShader != NULL) { - IUnknown *oldVertexShaderParent; - IWineD3DVertexShader_GetParent(oldShader, &oldVertexShaderParent); - IUnknown_Release(oldVertexShaderParent); - IUnknown_Release(oldVertexShaderParent); - } + TRACE("(%p) : setting pShader(%p)\n", This, pShader); /** * TODO: merge HAL shaders context switching from prototype */ @@ -3947,39 +3933,22 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer #undef GET_SHADER_CONSTANT HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader *pShader) { - IUnknown *parent; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DPixelShader *oldpShader = This->updateStateBlock->pixelShader; This->updateStateBlock->pixelShader = pShader; This->updateStateBlock->changed.pixelShader = TRUE; This->updateStateBlock->set.pixelShader = TRUE; - if (pShader == NULL) { - /* clear down the shader */ - TRACE("Clear down the shader\n"); - } - /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); return D3D_OK; } + + TRACE("(%p) : setting pShader(%p)\n", This, pShader); /** * TODO: merge HAL shaders context switching from prototype */ - - /* manage reference counting. */ - if (pShader != NULL) { - IWineD3DPixelShader_GetParent(pShader, &parent); /* get parent adds a ref for us*/ - } - - if (oldpShader != NULL) { - IWineD3DPixelShader_GetParent(oldpShader, &parent); - IUnknown_Release(parent); /* once for the getparent */ - IUnknown_Release(parent); /* and once for the ref */ - } - return D3D_OK; }

1 0

Oliver Stieber : wined3d: Cube texture named constants.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: ea942e1e75260cbd92c37c8bccc529546312d02b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea942e1e75260cbd92c37c8… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Tue Dec 13 11:10:20 2005 +0100 wined3d: Cube texture named constants. Update cubetexture so that names constants instead of numeric constants are used for the facetype and also add some additional checks where facetype is passed as a parameter to the function. --- dlls/wined3d/cubetexture.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ce0bfce..4cc8d0a 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -140,7 +140,7 @@ void WINAPI IWineD3DCubeTextureImpl_PreL /* If were dirty then reload the surfaces */ if (This->baseTexture.dirty != FALSE) { for (i = 0; i < This->baseTexture.levels; i++) { - for (j = 0; j < 6; j++) { + for (j = D3DCUBEMAP_FACE_POSITIVE_X; j <= D3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { if(setGlTextureDesc) IWineD3DSurface_SetGlTextureDesc(This->surfaces[j][i], This->baseTexture.textureName, cube_targets[j]); IWineD3DSurface_LoadTexture(This->surfaces[j][i]); @@ -273,7 +273,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_G IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; HRESULT hr = D3DERR_INVALIDCALL; - if (Level < This->baseTexture.levels) { + if (Level < This->baseTexture.levels && FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { *ppCubeMapSurface = This->surfaces[FaceType][Level]; IWineD3DSurface_AddRef(*ppCubeMapSurface); @@ -282,7 +282,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_G if (D3D_OK == hr) { TRACE("(%p) -> faceType(%d) level(%d) returning surface@%p\n", This, FaceType, Level, This->surfaces[FaceType][Level]); } else { - WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); } return hr; @@ -292,14 +292,14 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_L HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - if (Level < This->baseTexture.levels) { + if (Level < This->baseTexture.levels && FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_LockRect(This->surfaces[FaceType][Level], pLockedRect, pRect, Flags); } if (D3D_OK == hr) { TRACE("(%p) -> faceType(%d) level(%d) returning memory@%p success(%lu)\n", This, FaceType, Level, pLockedRect->pBits, hr); } else { - WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); } return hr; @@ -309,23 +309,29 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_U HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - if (Level < This->baseTexture.levels) { + if (Level < This->baseTexture.levels && FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_UnlockRect(This->surfaces[FaceType][Level]); } if (D3D_OK == hr) { TRACE("(%p) -> faceType(%d) level(%d) success(%lu)\n", This, FaceType, Level, hr); } else { - WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); } return hr; } HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { + HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; This->baseTexture.dirty = TRUE; TRACE("(%p) : dirtyfication of faceType(%d) Level (0)\n", This, FaceType); - return IWineD3DSurface_AddDirtyRect(This->surfaces[FaceType][0], pDirtyRect); + if (FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { + hr = IWineD3DSurface_AddDirtyRect(This->surfaces[FaceType][0], pDirtyRect); + } else { + WARN("(%p) overflow FaceType(%d)\n", This, FaceType); + } + return hr; }

1 0

Paul Vriens : shell32/tests/shlfolder.c: ILFindLastID has to be called by ordinal.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ac7fd9d6e557c596f083f1f690b8154093dcb289 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac7fd9d6e557c596f083f1f… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 18:13:14 2005 +0100 shell32/tests/shlfolder.c: ILFindLastID has to be called by ordinal. --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 66df199..2a09ea6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -369,7 +369,7 @@ static void test_GetDisplayName(void) } /* WinXP stores the filenames as both ANSI and UNICODE in the pidls */ - pidlLast = ILFindLastID(pidlTestFile); + pidlLast = pILFindLastID(pidlTestFile); todo_wine { ok( pidlLast->mkid.cb >= 76, "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb);

1 0

Alexandre Julliard : TEB.StackLimit should not include the guard page.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: f3dad37ba2671a7d86c5770e498252e3363e809c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f3dad37ba2671a7d86c5770… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:28:32 2005 +0100 TEB.StackLimit should not include the guard page. --- dlls/kernel/process.c | 5 +++-- dlls/ntdll/signal_i386.c | 4 ++-- dlls/ntdll/thread.c | 8 +++++--- dlls/ntdll/virtual.c | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index af9e23f..42c4033 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -978,7 +978,8 @@ static void *init_stack(void) IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); - stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1); + stack_size += page_size; /* for the guard page */ + stack_size = (stack_size + 0xffff) & ~0xffff; /* round to 64K boundary */ if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) @@ -990,7 +991,7 @@ static void *init_stack(void) /* note: limit is lower than base since the stack grows down */ NtCurrentTeb()->DeallocationStack = base; NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; - NtCurrentTeb()->Tib.StackLimit = base; + NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; /* setup guard page */ VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3cc54af..2a7fdf5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -830,10 +830,10 @@ static EXCEPTION_RECORD *setup_exception } if (stack - 1 > stack || /* check for overflow in subtraction */ - (char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit + 4096 || + (char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit || (char *)stack > (char *)NtCurrentTeb()->Tib.StackBase) { - UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit + 4096 - (char *)stack; + UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)stack; if (diff < 4096) { ERR( "stack overflow %u bytes in thread %04lx eip %08lx esp %08lx stack %p-%p\n", diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8367751..07cd08d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -201,7 +201,7 @@ static void start_thread( struct wine_pt PRTL_THREAD_START_ROUTINE func = startup_info->entry_point; void *arg = startup_info->entry_arg; struct debug_info debug_info; - SIZE_T size; + SIZE_T size, page_size = getpagesize(); debug_info.str_pos = debug_info.strings; debug_info.out_pos = debug_info.output; @@ -219,10 +219,10 @@ static void start_thread( struct wine_pt &size, MEM_SYSTEM, PAGE_READWRITE ); /* limit is lower than base since the stack grows down */ teb->Tib.StackBase = (char *)info->stack_base + info->stack_size; - teb->Tib.StackLimit = info->stack_base; + teb->Tib.StackLimit = (char *)info->stack_base + page_size; /* setup the guard page */ - size = 1; + size = page_size; NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_READWRITE | PAGE_GUARD, NULL ); RtlFreeHeap( GetProcessHeap(), 0, info ); @@ -252,6 +252,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN DWORD tid = 0; int request_pipe[2]; NTSTATUS status; + SIZE_T page_size = getpagesize(); if( ! is_current_process( process ) ) { @@ -307,6 +308,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN if (!stack_commit) stack_commit = nt->OptionalHeader.SizeOfStackCommit; } if (stack_reserve < stack_commit) stack_reserve = stack_commit; + stack_reserve += page_size; /* for the guard page */ stack_reserve = (stack_reserve + 0xffff) & ~0xffff; /* round to 64K boundary */ if (stack_reserve < 1024 * 1024) stack_reserve = 1024 * 1024; /* Xlib needs a large stack */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f3984f0..7d2d445 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1196,7 +1196,7 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID ad ret = STATUS_GUARD_PAGE_VIOLATION; } /* is it inside the stack guard page? */ - if (((const char *)addr >= stack) && ((const char *)addr < stack + (page_mask+1))) + if (((const char *)addr >= stack - (page_mask + 1)) && ((const char *)addr < stack)) ret = STATUS_STACK_OVERFLOW; } RtlLeaveCriticalSection( &csVirtual );

1 0

Paul Vriens : mscms: Add another possible error.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 95888acbe4d713694746bd6520fb1aeffb18f72d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95888acbe4d713694746bd6… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 18:13:02 2005 +0100 mscms: Add another possible error. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index c19268d..5b0d86f 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -459,7 +459,7 @@ static void test_GetStandardColorSpacePr ret = pGetStandardColorSpaceProfileA( machine, 0, newprofile, &size ); GLE = GetLastError(); todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, + ok( !ret && (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); size = 0;

1 0

Alexandre Julliard : kernel: Moved main stack initialization to process.c.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 8a8a94aecbfcd908e5909113ea2139ce17c41b56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a8a94aecbfcd908e590911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:20:29 2005 +0100 kernel: Moved main stack initialization to process.c. --- dlls/kernel/kernel_private.h | 3 --- dlls/kernel/process.c | 40 +++++++++++++++++++++++++++++++++------- dlls/kernel/thread.c | 28 ---------------------------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h index 98195d4..7139ffb 100644 --- a/dlls/kernel/kernel_private.h +++ b/dlls/kernel/kernel_private.h @@ -115,9 +115,6 @@ extern LPVOID DOSMEM_MapDosToLinear(UINT extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ extern void load_winedos(void); -/* thread.c */ -extern TEB *THREAD_InitStack( TEB *teb, DWORD stack_size ); - /* environ.c */ extern void ENV_CopyStartupInformation(void); diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index d95d08c..af9e23f 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -967,6 +967,38 @@ static BOOL process_init(void) /*********************************************************************** + * init_stack + * + * Allocate the stack of new process. + */ +static void *init_stack(void) +{ + void *base; + SIZE_T stack_size, page_size = getpagesize(); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + + stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); + stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1); + if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ + + if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) + { + ERR( "failed to allocate main process stack\n" ); + ExitProcess( 1 ); + } + + /* note: limit is lower than base since the stack grows down */ + NtCurrentTeb()->DeallocationStack = base; + NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; + NtCurrentTeb()->Tib.StackLimit = base; + + /* setup guard page */ + VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL ); + return NtCurrentTeb()->Tib.StackBase; +} + + +/*********************************************************************** * start_process * * Startup routine of a new process. Runs on the new process stack. @@ -1010,7 +1042,6 @@ void __wine_kernel_init(void) { WCHAR *main_exe_name, *p; char error[1024]; - DWORD stack_size = 0; int file_exists; PEB *peb = NtCurrentTeb()->Peb; @@ -1130,13 +1161,8 @@ void __wine_kernel_init(void) set_library_wargv( __wine_main_argv ); if (!build_command_line( __wine_main_wargv )) goto error; - stack_size = RtlImageNtHeader(peb->ImageBaseAddress)->OptionalHeader.SizeOfStackReserve; - - /* allocate main thread stack */ - if (!THREAD_InitStack( NtCurrentTeb(), stack_size )) goto error; - /* switch to the new stack */ - wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase ); + wine_switch_to_stack( start_process, NULL, init_stack() ); error: ExitProcess( GetLastError() ); diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index fd65b99..c927037 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -49,34 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(relay); -/*********************************************************************** - * THREAD_InitStack - * - * Allocate the stack of a thread. - */ -TEB *THREAD_InitStack( TEB *teb, DWORD stack_size ) -{ - DWORD old_prot; - DWORD page_size = getpagesize(); - void *base; - - stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1); - if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ - - if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) - return NULL; - - teb->DeallocationStack = base; - teb->Tib.StackBase = (char *)base + stack_size; - teb->Tib.StackLimit = base; /* note: limit is lower than base since the stack grows down */ - - /* Setup guard pages */ - - VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, &old_prot ); - return teb; -} - - struct new_thread_info { LPTHREAD_START_ROUTINE func;

1 0

Alexandre Julliard : server: Don't enable polling on regular files in add_queue.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 770c4a1551a3198f7cf2282dbe749d95e4902804 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=770c4a1551a3198f7cf2282… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:20:03 2005 +0100 server: Don't enable polling on regular files in add_queue. --- server/fd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index 5c4efd4..90fb7af 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1479,7 +1479,7 @@ int default_fd_add_queue( struct object struct fd *fd = get_obj_fd( obj ); if (!fd) return 0; - if (list_empty( &obj->wait_queue )) /* first on the queue */ + if (!fd->inode && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); add_queue( obj, entry ); release_object( fd ); @@ -1493,7 +1493,7 @@ void default_fd_remove_queue( struct obj grab_object( obj ); remove_queue( obj, entry ); - if (list_empty( &obj->wait_queue )) /* last on the queue is gone */ + if (!fd->inode && list_empty( &obj->wait_queue )) /* last on the queue is gone */ set_fd_events( fd, 0 ); release_object( obj ); release_object( fd );

1 0

Alexandre Julliard : Pass specific access rights to wine_server_handle_to_fd.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 59797f292ec23054a90326f4319fb308776c807f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59797f292ec23054a90326f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:15:26 2005 +0100 Pass specific access rights to wine_server_handle_to_fd. --- dlls/kernel/comm.c | 24 ++++++++++++------------ dlls/kernel/sync.c | 2 +- dlls/ntdll/directory.c | 2 +- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/server.c | 5 ----- dlls/ntdll/virtual.c | 4 ++-- dlls/winedos/int13.c | 2 +- dlls/winsock/socket.c | 14 +++++++------- 8 files changed, 26 insertions(+), 31 deletions(-)

1 0

Alexandre Julliard : server: Added access rights mapping to file objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: a510a7e117bdd98c89673c2eca12852fc7824489 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a510a7e117bdd98c89673c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 16:46:17 2005 +0100 server: Added access rights mapping to file objects. --- dlls/kernel/tests/sync.c | 2 -- dlls/ntdll/server.c | 5 +++++ server/directory.c | 12 ++++++++++- server/fd.c | 10 +++++---- server/file.c | 44 +++++++++++++++++++++++++++------------- server/file.h | 6 ++++++ server/mailslot.c | 50 +++++++++++++++++++++++++++++++++------------- server/mapping.c | 18 +++++++++++++---- server/named_pipe.c | 30 ++++++++++++++++++++++++---- server/object.c | 6 +++++- server/process.c | 6 +++--- server/registry.c | 4 ++-- server/serial.c | 12 ++++++++++- server/sock.c | 30 +++++++++++++++++----------- 14 files changed, 171 insertions(+), 64 deletions(-)

1 0

Alexandre Julliard : server: Added access rights mapping to process and thread objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 46d1b3e8da47999f7d8d58be8802eadae8321b21 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46d1b3e8da47999f7d8d58b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:03:07 2005 +0100 server: Added access rights mapping to process and thread objects. --- server/process.c | 12 +++++++++++- server/thread.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index 83cd716..c1657e4 100644 --- a/server/process.c +++ b/server/process.c @@ -59,6 +59,7 @@ static int running_processes; static void process_dump( struct object *obj, int verbose ); static int process_signaled( struct object *obj, struct thread *thread ); +static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); static void process_destroy( struct object *obj ); @@ -72,7 +73,7 @@ static const struct object_ops process_o no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + process_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ process_destroy /* destroy */ @@ -415,6 +416,15 @@ static int process_signaled( struct obje return !process->running_threads; } +static unsigned int process_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/thread.c b/server/thread.c index 9e2481e..507eed5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -83,6 +83,7 @@ struct thread_apc static void dump_thread( struct object *obj, int verbose ); static int thread_signaled( struct object *obj, struct thread *thread ); +static unsigned int thread_map_access( struct object *obj, unsigned int access ); static void thread_poll_event( struct fd *fd, int event ); static void destroy_thread( struct object *obj ); static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ); @@ -97,7 +98,7 @@ static const struct object_ops thread_op no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + thread_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ destroy_thread /* destroy */ @@ -271,6 +272,15 @@ static int thread_signaled( struct objec return (mythread->state == TERMINATED); } +static unsigned int thread_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + /* get a thread pointer from a thread id (and increment the refcount) */ struct thread *get_thread_from_id( thread_id_t id ) {

1 0

Alexandre Julliard : server: Added access rights mapping to registry key objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 32a93960babeedcd48f9e20afe41b7b019dc2ff0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32a93960babeedcd48f9e20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:02:26 2005 +0100 server: Added access rights mapping to registry key objects. --- server/registry.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/registry.c b/server/registry.c index 52b4c19..09c7f5a 100644 --- a/server/registry.c +++ b/server/registry.c @@ -134,6 +134,7 @@ struct file_load_info static void key_dump( struct object *obj, int verbose ); +static unsigned int key_map_access( struct object *obj, unsigned int access ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void key_destroy( struct object *obj ); @@ -147,7 +148,7 @@ static const struct object_ops key_ops = NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + key_map_access, /* map_access */ no_lookup_name, /* lookup_name */ key_close_handle, /* close_handle */ key_destroy /* destroy */ @@ -301,6 +302,15 @@ static inline struct notify *find_notify return NULL; } +static unsigned int key_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= KEY_READ; + if (access & GENERIC_WRITE) access |= KEY_WRITE; + if (access & GENERIC_EXECUTE) access |= KEY_EXECUTE; + if (access & GENERIC_ALL) access |= KEY_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + /* close the notification associated with a handle */ static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) {

1 0

Alexandre Julliard : server: Added access rights mapping to symlink objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: e57f734765c26d928be3e20b7d911c34627ef438 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e57f734765c26d928be3e20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:01:16 2005 +0100 server: Added access rights mapping to symlink objects. --- server/symlink.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/symlink.c b/server/symlink.c index 62fb863..fab7c13 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -46,6 +46,7 @@ struct symlink }; static void symlink_dump( struct object *obj, int verbose ); +static unsigned int symlink_map_access( struct object *obj, unsigned int access ); static struct object *symlink_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void symlink_destroy( struct object *obj ); @@ -60,7 +61,7 @@ static const struct object_ops symlink_o NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + symlink_map_access, /* map_access */ symlink_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ symlink_destroy /* destroy */ @@ -102,6 +103,15 @@ static struct object *symlink_lookup_nam return target; } +static unsigned int symlink_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= SYMBOLIC_LINK_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static void symlink_destroy( struct object *obj ) { struct symlink *symlink = (struct symlink *)obj;

1 0

Alexandre Julliard : server: Added access rights mapping to token objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 5fb2e68bb24d2b82a28e4a389d8f80f20c5600ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fb2e68bb24d2b82a28e4a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:01:08 2005 +0100 server: Added access rights mapping to token objects. --- server/token.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 11b1f11..53bbc13 100644 --- a/server/token.c +++ b/server/token.c @@ -106,6 +106,7 @@ struct sid_and_attributes }; static void token_dump( struct object *obj, int verbose ); +static unsigned int token_map_access( struct object *obj, unsigned int access ); static void token_destroy( struct object *obj ); static const struct object_ops token_ops = @@ -118,7 +119,7 @@ static const struct object_ops token_ops NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + token_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ token_destroy /* destroy */ @@ -131,6 +132,15 @@ static void token_dump( struct object *o /* FIXME: dump token members */ } +static unsigned int token_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= TOKEN_READ; + if (access & GENERIC_WRITE) access |= TOKEN_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= TOKEN_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static SID *security_sid_alloc( const SID_IDENTIFIER_AUTHORITY *idauthority, int subauthcount, const unsigned int subauth[] ) { int i;

1 0

Alexandre Julliard : server: Added access rights mapping to synchronization objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 03f46e1321b4c4cbcef405f2cad2f37d5c4054a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03f46e1321b4c4cbcef405f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:58:44 2005 +0100 server: Added access rights mapping to synchronization objects. --- server/event.c | 12 +++++++++++- server/mutex.c | 12 +++++++++++- server/semaphore.c | 12 +++++++++++- server/timer.c | 12 +++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/server/event.c b/server/event.c index d6c8fef..6aec64a 100644 --- a/server/event.c +++ b/server/event.c @@ -45,6 +45,7 @@ struct event static void event_dump( struct object *obj, int verbose ); static int event_signaled( struct object *obj, struct thread *thread ); static int event_satisfied( struct object *obj, struct thread *thread ); +static unsigned int event_map_access( struct object *obj, unsigned int access ); static int event_signal( struct object *obj, unsigned int access); static const struct object_ops event_ops = @@ -57,7 +58,7 @@ static const struct object_ops event_ops event_satisfied, /* satisfied */ event_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + event_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ no_destroy /* destroy */ @@ -132,6 +133,15 @@ static int event_satisfied( struct objec return 0; /* Not abandoned */ } +static unsigned int event_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int event_signal( struct object *obj, unsigned int access ) { struct event *event = (struct event *)obj; diff --git a/server/mutex.c b/server/mutex.c index 0f1e9f8..4104161 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -47,6 +47,7 @@ struct mutex static void mutex_dump( struct object *obj, int verbose ); static int mutex_signaled( struct object *obj, struct thread *thread ); static int mutex_satisfied( struct object *obj, struct thread *thread ); +static unsigned int mutex_map_access( struct object *obj, unsigned int access ); static void mutex_destroy( struct object *obj ); static int mutex_signal( struct object *obj, unsigned int access ); @@ -60,7 +61,7 @@ static const struct object_ops mutex_ops mutex_satisfied, /* satisfied */ mutex_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + mutex_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ mutex_destroy /* destroy */ @@ -143,6 +144,15 @@ static int mutex_satisfied( struct objec return 1; } +static unsigned int mutex_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int mutex_signal( struct object *obj, unsigned int access ) { struct mutex *mutex = (struct mutex *)obj; diff --git a/server/semaphore.c b/server/semaphore.c index 6cc1012..d818898 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -45,6 +45,7 @@ struct semaphore static void semaphore_dump( struct object *obj, int verbose ); static int semaphore_signaled( struct object *obj, struct thread *thread ); static int semaphore_satisfied( struct object *obj, struct thread *thread ); +static unsigned int semaphore_map_access( struct object *obj, unsigned int access ); static int semaphore_signal( struct object *obj, unsigned int access ); static const struct object_ops semaphore_ops = @@ -57,7 +58,7 @@ static const struct object_ops semaphore semaphore_satisfied, /* satisfied */ semaphore_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + semaphore_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ no_destroy /* destroy */ @@ -133,6 +134,15 @@ static int semaphore_satisfied( struct o return 0; /* not abandoned */ } +static unsigned int semaphore_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int semaphore_signal( struct object *obj, unsigned int access ) { struct semaphore *sem = (struct semaphore *)obj; diff --git a/server/timer.c b/server/timer.c index 7c20f19..b87dd88 100644 --- a/server/timer.c +++ b/server/timer.c @@ -53,6 +53,7 @@ struct timer static void timer_dump( struct object *obj, int verbose ); static int timer_signaled( struct object *obj, struct thread *thread ); static int timer_satisfied( struct object *obj, struct thread *thread ); +static unsigned int timer_map_access( struct object *obj, unsigned int access ); static void timer_destroy( struct object *obj ); static const struct object_ops timer_ops = @@ -65,7 +66,7 @@ static const struct object_ops timer_ops timer_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + timer_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ timer_destroy /* destroy */ @@ -196,6 +197,15 @@ static int timer_satisfied( struct objec return 0; } +static unsigned int timer_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | TIMER_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | TIMER_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= TIMER_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static void timer_destroy( struct object *obj ) { struct timer *timer = (struct timer *)obj;

1 0

Alexandre Julliard : server: Added infrastructure for access rights mapping.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

1 0

Alexandre Julliard : server: Allow the named pipe device to be opened as a file object.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 26e60d8ffcadf8835bb2519af48bcda722a3de32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26e60d8ffcadf8835bb2519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:30:06 2005 +0100 server: Allow the named pipe device to be opened as a file object. --- server/named_pipe.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index bda6bd9..45ebf11 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -102,6 +102,7 @@ struct named_pipe struct named_pipe_device { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ struct namespace *pipes; /* named pipe namespace */ }; @@ -188,6 +189,7 @@ static const struct fd_ops pipe_client_f }; static void named_pipe_device_dump( struct object *obj, int verbose ); +static struct fd *named_pipe_device_get_fd( struct object *obj ); static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void named_pipe_device_destroy( struct object *obj ); @@ -201,12 +203,22 @@ static const struct object_ops named_pip NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + named_pipe_device_get_fd, /* get_fd */ named_pipe_device_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ named_pipe_device_destroy /* destroy */ }; +static const struct fd_ops named_pipe_device_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async /* cancel_async */ +}; + static void named_pipe_dump( struct object *obj, int verbose ) { struct named_pipe *pipe = (struct named_pipe *) obj; @@ -370,6 +382,12 @@ static void named_pipe_device_dump( stru fprintf( stderr, "Named pipe device\n" ); } +static struct fd *named_pipe_device_get_fd( struct object *obj ) +{ + struct named_pipe_device *device = (struct named_pipe_device *)obj; + return device->fd; +} + static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { @@ -389,7 +407,8 @@ static void named_pipe_device_destroy( s { struct named_pipe_device *device = (struct named_pipe_device*)obj; assert( obj->ops == &named_pipe_device_ops ); - free( device->pipes ); + if (device->fd) release_object( device->fd ); + if (device->pipes) free( device->pipes ); } /* this will be deleted as soon an we fix wait_named_pipe */ @@ -403,7 +422,9 @@ struct named_pipe_device *create_named_p if ((dev = create_named_object_dir( root, name, 0, &named_pipe_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { - if (!(dev->pipes = create_namespace( 7 ))) + dev->pipes = NULL; + if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj )) || + !(dev->pipes = create_namespace( 7 ))) { release_object( dev ); dev = NULL;

1 0

Alexandre Julliard : server: Allow the mailslot device to be opened as a file object.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: b0aa29effacd4212e24213693d8e8d9febefe7f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0aa29effacd4212e242136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:39:27 2005 +0100 server: Allow the mailslot device to be opened as a file object. --- server/mailslot.c | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index f4accf2..ce2fbfd 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -65,6 +65,7 @@ struct mailslot struct mailslot_device { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ struct namespace *mailslots; /* mailslot namespace */ }; @@ -142,6 +143,7 @@ static const struct fd_ops mail_writer_f }; static void mailslot_device_dump( struct object *obj, int verbose ); +static struct fd *mailslot_device_get_fd( struct object *obj ); static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void mailslot_device_destroy( struct object *obj ); @@ -149,16 +151,26 @@ static void mailslot_device_destroy( str static const struct object_ops mailslot_device_ops = { sizeof(struct mailslot_device), /* size */ - mailslot_device_dump, /* dump */ - no_add_queue, /* add_queue */ - NULL, /* remove_queue */ - NULL, /* signaled */ - no_satisfied, /* satisfied */ - no_signal, /* signal */ - no_get_fd, /* get_fd */ - mailslot_device_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ - mailslot_device_destroy /* destroy */ + mailslot_device_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + mailslot_device_get_fd, /* get_fd */ + mailslot_device_lookup_name, /* lookup_name */ + no_close_handle, /* close_handle */ + mailslot_device_destroy /* destroy */ +}; + +static const struct fd_ops mailslot_device_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async /* cancel_async */ }; static void mailslot_destroy( struct object *obj) @@ -248,6 +260,12 @@ static void mailslot_device_dump( struct fprintf( stderr, "Mail slot device\n" ); } +static struct fd *mailslot_device_get_fd( struct object *obj ) +{ + struct mailslot_device *device = (struct mailslot_device *)obj; + return device->fd; +} + static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { @@ -266,7 +284,8 @@ static void mailslot_device_destroy( str { struct mailslot_device *device = (struct mailslot_device*)obj; assert( obj->ops == &mailslot_device_ops ); - free( device->mailslots ); + if (device->fd) release_object( device->fd ); + if (device->mailslots) free( device->mailslots ); } struct mailslot_device *create_mailslot_device( struct directory *root, const struct unicode_str *name ) @@ -276,7 +295,9 @@ struct mailslot_device *create_mailslot_ if ((dev = create_named_object_dir( root, name, 0, &mailslot_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { - if (!(dev->mailslots = create_namespace( 7 ))) + dev->mailslots = NULL; + if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj )) || + !(dev->mailslots = create_namespace( 7 ))) { release_object( dev ); dev = NULL;

1 0

Alexandre Julliard : server: Support for opening devices.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 67505c00af371ff3257a9a64df2e07cf45e5b39e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67505c00af371ff3257a9a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:27:45 2005 +0100 server: Support for opening devices. Added support for opening devices directly with the server when they don't correspond to a Unix file. --- dlls/kernel/file.c | 4 ++ dlls/ntdll/directory.c | 4 +- dlls/ntdll/file.c | 16 ++++++++++ include/wine/server_protocol.h | 22 +++++++++++++ server/fd.c | 66 ++++++++++++++++++++++++++++++++++++++-- server/file.h | 1 + server/protocol.def | 12 +++++++ server/request.h | 2 + server/trace.c | 19 ++++++++++++ 9 files changed, 140 insertions(+), 6 deletions(-)

1 0

Alexandre Julliard : server: Use a better error code for a zero-size mapped file.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 2017555b06a2e7c6773383ec613ed54a32d9480e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2017555b06a2e7c6773383e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 13:38:43 2005 +0100 server: Use a better error code for a zero-size mapped file. --- server/mapping.c | 2 +- server/trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c9813f2..af6f074 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -308,7 +308,7 @@ static struct object *create_mapping( st if (!get_file_size( mapping->file, &size )) goto error; if (!size) { - set_error( STATUS_FILE_INVALID ); + set_error( STATUS_MAPPED_FILE_SIZE_ZERO ); goto error; } } diff --git a/server/trace.c b/server/trace.c index fcc447e..fb1be68 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3848,7 +3848,6 @@ static const struct { "ERROR_CLIPBOARD_NOT_OPEN", 0xc0010000 | ERROR_CLIPBOARD_NOT_OPEN }, { "ERROR_INVALID_INDEX", 0xc0010000 | ERROR_INVALID_INDEX }, { "ERROR_SEEK", 0xc0010000 | ERROR_SEEK }, - { "FILE_INVALID", STATUS_FILE_INVALID }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, @@ -3859,6 +3858,7 @@ static const struct { "INVALID_PARAMETER", STATUS_INVALID_PARAMETER }, { "IO_TIMEOUT", STATUS_IO_TIMEOUT }, { "KEY_DELETED", STATUS_KEY_DELETED }, + { "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO }, { "MEDIA_WRITE_PROTECTED", STATUS_MEDIA_WRITE_PROTECTED }, { "MUTANT_NOT_OWNED", STATUS_MUTANT_NOT_OWNED }, { "NAME_TOO_LONG", STATUS_NAME_TOO_LONG },

1 0

Eric Pouech : kernel32: Get rid of DOSMEM_AllocSelector.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 4e7b8f4a7b7701826b671db6f5277f5dc0abc86a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e7b8f4a7b7701826b671db… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 13:02:35 2005 +0100 kernel32: Get rid of DOSMEM_AllocSelector. --- dlls/kernel/dosmem.c | 16 ---------------- dlls/kernel/kernel32.spec | 5 ----- dlls/kernel/kernel_private.h | 1 - dlls/winedos/int31.c | 4 +++- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c index 7bb1b24..30ca6cf 100644 --- a/dlls/kernel/dosmem.c +++ b/dlls/kernel/dosmem.c @@ -254,19 +254,3 @@ LPVOID DOSMEM_MapRealToLinear(DWORD x) TRACE_(selector)("(0x%08lx) returns %p.\n", x, lin ); return lin; } - -/*********************************************************************** - * DOSMEM_AllocSelector - * - * Allocates a protected mode selector for a realmode segment. - */ -WORD DOSMEM_AllocSelector(WORD realsel) -{ - HMODULE16 hModule = GetModuleHandle16("KERNEL"); - WORD sel; - - sel=GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_dosmem+realsel*16, DOSMEM_64KB, - hModule, WINE_LDT_FLAGS_DATA ); - TRACE_(selector)("(0x%04x) returns 0x%04x.\n", realsel,sel); - return sel; -} diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 701eecd..260c6f6 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1255,8 +1255,3 @@ # Init code @ cdecl __wine_kernel_init() - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl DOSMEM_AllocSelector(long) diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h index 3ed5f67..98195d4 100644 --- a/dlls/kernel/kernel_private.h +++ b/dlls/kernel/kernel_private.h @@ -110,7 +110,6 @@ extern WORD DOSMEM_BiosSysSeg; /* dosmem.c */ extern BOOL DOSMEM_Init(void); -extern WORD DOSMEM_AllocSelector(WORD); extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 94b6a31..e34b720 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -913,7 +913,9 @@ void WINAPI DOSVM_Int31Handler( CONTEXT8 case 0xe000: entryPoint = 190; break; /* __E000H */ case 0xf000: entryPoint = 194; break; /* __F000H */ default: - SET_AX( context, DOSMEM_AllocSelector(BX_reg(context)) ); + FIXME("Real mode segment (%x) to descriptor: no longer supported\n", + BX_reg(context)); + SET_CFLAG( context ); break; } if (entryPoint)

1 0

Detlef Riekenberg : winspool: Added tests for OpenPrinter.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 4b418d6f2b900856d005548637e0e04e8b9cfc16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b418d6f2b900856d005548… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 12 13:02:15 2005 +0100 winspool: Added tests for OpenPrinter. --- dlls/winspool/tests/Makefile.in | 2 dlls/winspool/tests/info.c | 234 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 216 insertions(+), 20 deletions(-)

1 0

Michael Jung : shell32: Fix drag-scrolling in the shellview object.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: edf6cf94ca84d1006f10792193588c86506b2daa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edf6cf94ca84d1006f10792… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Mon Dec 12 12:43:03 2005 +0100 shell32: Fix drag-scrolling in the shellview object. --- dlls/shell32/shlview.c | 86 +++++++++++++++--------------------------------- 1 files changed, 26 insertions(+), 60 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 99ca862..a887c6e 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -103,7 +103,8 @@ typedef struct IDropTarget* pCurDropTarget; /* The sub-item, which is currently dragged over */ IDataObject* pCurDataObject; /* The dragged data-object */ LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ - UINT iActiveTimersMask; /* Bookkeeping of activated timers for drag scrolling */ + UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ + POINT ptLastMousePos; /* Mouse position at last DragOver call */ } IShellViewImpl; static const IShellViewVtbl svvt; @@ -197,7 +198,9 @@ IShellView * IShellView_Constructor( ISh sv->pCurDropTarget = NULL; sv->pCurDataObject = NULL; sv->iDragOverItem = 0; - sv->iActiveTimersMask = 0; + sv->cScrollDelay = 0; + sv->ptLastMousePos.x = 0; + sv->ptLastMousePos.y = 0; TRACE("(%p)->(%p)\n",sv, pFolder); return (IShellView *) sv; @@ -2179,48 +2182,6 @@ static ULONG WINAPI ISVDropTarget_Releas } /****************************************************************************** - * scroll_timer_proc [Internal] - * - * Timer callback function for drag&drop scrolling - */ - -#define IDT_UP 0x1u -#define IDT_DOWN 0x2u -#define IDT_LEFT 0x4u -#define IDT_RIGHT 0x8u - -VOID CALLBACK scroll_timer_proc(HWND hwnd, UINT uMsg, UINT_PTR idTimer, DWORD dwTimer) { - switch (idTimer) { - case IDT_UP: - SendMessageW(hwnd, WM_VSCROLL, SB_LINEUP, 0); - break; - case IDT_DOWN: - SendMessageW(hwnd, WM_VSCROLL, SB_LINEDOWN, 0); - break; - case IDT_LEFT: - SendMessageW(hwnd, WM_HSCROLL, SB_LINEUP, 0); - break; - case IDT_RIGHT: - SendMessageW(hwnd, WM_HSCROLL, SB_LINEDOWN, 0); - break; - } -} - -/****************************************************************************** - * start_stop_timer [Internal] - */ -static inline void start_stop_timer(IShellViewImpl *This, UINT_PTR idTimer, BOOL fStart) { - if (fStart && !(This->iActiveTimersMask & idTimer)) { - SetTimer(This->hWndList, idTimer, 200, scroll_timer_proc); - This->iActiveTimersMask |= idTimer; - } - if (!fStart && This->iActiveTimersMask & idTimer) { - KillTimer(This->hWndList, idTimer); - This->iActiveTimersMask &= ~idTimer; - } -} - -/****************************************************************************** * drag_notify_subitem [Internal] * * Figure out the shellfolder object, which is currently under the mouse cursor @@ -2246,13 +2207,28 @@ static HRESULT drag_notify_subitem(IShel ScreenToClient(This->hWndList, &htinfo.pt); lResult = SendMessageW(This->hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo); - /* Start or stop the drag scrolling timers */ + /* Send WM_*SCROLL messages every 250 ms during drag-scrolling */ GetClientRect(This->hWndList, &clientRect); - start_stop_timer(This, IDT_LEFT, htinfo.pt.x < SCROLLAREAWIDTH); - start_stop_timer(This, IDT_RIGHT, htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH); - start_stop_timer(This, IDT_UP, htinfo.pt.y < SCROLLAREAWIDTH); - start_stop_timer(This, IDT_DOWN, htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH); - + if (htinfo.pt.x == This->ptLastMousePos.x && htinfo.pt.y == This->ptLastMousePos.y && + (htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH || + htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH )) + { + This->cScrollDelay = (This->cScrollDelay + 1) % 5; /* DragOver is called every 50 ms */ + if (This->cScrollDelay == 0) { /* Mouse did hover another 250 ms over the scroll-area */ + if (htinfo.pt.x < SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_HSCROLL, SB_LINEUP, 0); + if (htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_HSCROLL, SB_LINEDOWN, 0); + if (htinfo.pt.y < SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_VSCROLL, SB_LINEUP, 0); + if (htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_VSCROLL, SB_LINEDOWN, 0); + } + } else { + This->cScrollDelay = 0; /* Reset, if the cursor is not over the listview's scroll-area */ + } + This->ptLastMousePos = htinfo.pt; + /* If we are still over the previous sub-item, notify it via DragOver and return. */ if (This->pCurDropTarget && lResult == This->iDragOverItem) return IDropTarget_DragOver(This->pCurDropTarget, grfKeyState, pt, pdwEffect); @@ -2321,11 +2297,6 @@ static HRESULT WINAPI ISVDropTarget_Drag This->pCurDropTarget = NULL; This->iDragOverItem = 0; - start_stop_timer(This, IDT_LEFT, FALSE); - start_stop_timer(This, IDT_RIGHT, FALSE); - start_stop_timer(This, IDT_UP, FALSE); - start_stop_timer(This, IDT_DOWN, FALSE); - return S_OK; } @@ -2342,11 +2313,6 @@ static HRESULT WINAPI ISVDropTarget_Drop This->pCurDropTarget = NULL; This->iDragOverItem = 0; - start_stop_timer(This, IDT_LEFT, FALSE); - start_stop_timer(This, IDT_RIGHT, FALSE); - start_stop_timer(This, IDT_UP, FALSE); - start_stop_timer(This, IDT_DOWN, FALSE); - return S_OK; }

1 0

Michael Jung : ole32: Periodically call IDropTarger::DragOver during Drag&Drop.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 892fc1093d3b7994570938da01554c988fe3e437 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=892fc1093d3b7994570938d… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Mon Dec 12 12:42:53 2005 +0100 ole32: Periodically call IDropTarger::DragOver during Drag&Drop. --- dlls/ole32/ole2.c | 129 ++++++++++++++--------------------------------------- 1 files changed, 34 insertions(+), 95 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4bc815e..fd55930 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -79,6 +79,8 @@ typedef struct tagTrackerWindowInfo HWND curTargetHWND; /* window the mouse is hovering over */ HWND curDragTargetHWND; /* might be a ancestor of curTargetHWND */ IDropTarget* curDragTarget; + POINTL curMousePos; /* current position of the mouse in screen coordinates */ + DWORD dwKeyState; /* current state of the shift and ctrl keys and the mouse buttons */ } TrackerWindowInfo; typedef struct tagOleMenuDescriptor /* OleMenuDescriptor */ @@ -158,13 +160,9 @@ static LRESULT WINAPI OLEDD_DragTracker WPARAM wParam, LPARAM lParam); static void OLEDD_TrackMouseMove( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState); + TrackerWindowInfo* trackerInfo); static void OLEDD_TrackStateChange( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState); + TrackerWindowInfo* trackerInfo); static DWORD OLEDD_GetButtonState(void); @@ -533,6 +531,10 @@ HRESULT WINAPI DoDragDrop ( */ while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) ) { + trackerInfo.curMousePos.x = msg.pt.x; + trackerInfo.curMousePos.y = msg.pt.y; + trackerInfo.dwKeyState = OLEDD_GetButtonState(); + if ( (msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST) ) { @@ -551,9 +553,7 @@ HRESULT WINAPI DoDragDrop ( /* * Notify the drop source. */ - OLEDD_TrackStateChange(&trackerInfo, - msg.pt, - OLEDD_GetButtonState()); + OLEDD_TrackStateChange(&trackerInfo); } else { @@ -2033,6 +2033,9 @@ static DropTargetNode* OLEDD_FindDropTar * to receive the user input and act upon it. This procedure is in charge * of this behavior. */ + +#define DRAG_TIMER_ID 1 + static LRESULT WINAPI OLEDD_DragTrackerWindowProc( HWND hwnd, UINT uMsg, @@ -2046,27 +2049,14 @@ static LRESULT WINAPI OLEDD_DragTrackerW LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam; SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams); - + SetTimer(hwnd, DRAG_TIMER_ID, 50, NULL); break; } + case WM_TIMER: case WM_MOUSEMOVE: { - TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0); - POINT mousePos; - - /* - * Get the current mouse position in screen coordinates. - */ - mousePos.x = LOWORD(lParam); - mousePos.y = HIWORD(lParam); - ClientToScreen(hwnd, &mousePos); - - /* - * Track the movement of the mouse. - */ - OLEDD_TrackMouseMove(trackerInfo, mousePos, wParam); - + OLEDD_TrackMouseMove((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); break; } case WM_LBUTTONUP: @@ -2076,22 +2066,12 @@ static LRESULT WINAPI OLEDD_DragTrackerW case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: { - TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0); - POINT mousePos; - - /* - * Get the current mouse position in screen coordinates. - */ - mousePos.x = LOWORD(lParam); - mousePos.y = HIWORD(lParam); - ClientToScreen(hwnd, &mousePos); - - /* - * Notify everyone that the button state changed - * TODO: Check if the "escape" key was pressed. - */ - OLEDD_TrackStateChange(trackerInfo, mousePos, wParam); - + OLEDD_TrackStateChange((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); + break; + } + case WM_DESTROY: + { + KillTimer(hwnd, DRAG_TIMER_ID); break; } } @@ -2114,23 +2094,19 @@ static LRESULT WINAPI OLEDD_DragTrackerW * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. - * mousePos - Current position of the mouse in screen - * coordinates. - * keyState - Contains the state of the shift keys and the - * mouse buttons (MK_LBUTTON and the like) */ -static void OLEDD_TrackMouseMove( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState) +static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) { HWND hwndNewTarget = 0; HRESULT hr = S_OK; + POINT pt; /* * Get the handle of the window under the mouse */ - hwndNewTarget = WindowFromPoint(mousePos); + pt.x = trackerInfo->curMousePos.x; + pt.y = trackerInfo->curMousePos.y; + hwndNewTarget = WindowFromPoint(pt); /* * Every time, we re-initialize the effects passed to the @@ -2145,19 +2121,9 @@ static void OLEDD_TrackMouseMove( if ( (trackerInfo->curDragTarget != 0) && (trackerInfo->curTargetHWND == hwndNewTarget) ) { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be in the target - * window's coordinate space. However, the tests I made tell me the - * coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_DragOver(trackerInfo->curDragTarget, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); } else @@ -2197,20 +2163,10 @@ static void OLEDD_TrackMouseMove( */ if (trackerInfo->curDragTarget!=0) { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be in the target - * window's coordinate space. However, the tests I made tell me the - * coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_DragEnter(trackerInfo->curDragTarget, trackerInfo->dataObject, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); } } @@ -2276,15 +2232,8 @@ static void OLEDD_TrackMouseMove( * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. - * mousePos - Current position of the mouse in screen - * coordinates. - * keyState - Contains the state of the shift keys and the - * mouse buttons (MK_LBUTTON and the like) */ -static void OLEDD_TrackStateChange( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState) +static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) { /* * Ask the drop source what to do with the operation. @@ -2292,7 +2241,7 @@ static void OLEDD_TrackStateChange( trackerInfo->returnValue = IDropSource_QueryContinueDrag( trackerInfo->dropSource, trackerInfo->escPressed, - keyState); + trackerInfo->dwKeyState); /* * All the return valued will stop the operation except the S_OK @@ -2325,20 +2274,10 @@ static void OLEDD_TrackStateChange( */ case DRAGDROP_S_DROP: { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be - * in the target window's coordinate space. However, the tests - * I made tell me the coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); break; }

1 0

Eric Pouech : Functions with no paramters must be (void).
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 681b71ed9ab6d630005f36be7cb2a98737c23fb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=681b71ed9ab6d630005f36b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 12:42:44 2005 +0100 Functions with no paramters must be (void). --- dlls/msvcrt/msvcrt.h | 8 ++++---- dlls/ntdll/relay.c | 4 ++-- dlls/ole32/ole16.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9680114..d46f738 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -65,10 +65,10 @@ typedef long MSVCRT_clock_t; typedef long MSVCRT_time_t; typedef __int64 MSVCRT_fpos_t; -typedef void (*MSVCRT_terminate_handler)(); -typedef void (*MSVCRT_terminate_function)(); -typedef void (*MSVCRT_unexpected_handler)(); -typedef void (*MSVCRT_unexpected_function)(); +typedef void (*MSVCRT_terminate_handler)(void); +typedef void (*MSVCRT_terminate_function)(void); +typedef void (*MSVCRT_unexpected_handler)(void); +typedef void (*MSVCRT_unexpected_function)(void); typedef void (*MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); typedef void (*MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 32da763..9adc522 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -266,8 +266,8 @@ typedef struct tagSNOOP_RETURNENTRIES { #include "poppack.h" -extern void WINAPI SNOOP_Entry(); -extern void WINAPI SNOOP_Return(); +extern void WINAPI SNOOP_Entry(void); +extern void WINAPI SNOOP_Return(void); static SNOOP_DLL *firstdll; static SNOOP_RETURNENTRIES *firstrets; diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 15e054f..117d484 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -173,7 +173,7 @@ LPVOID IMalloc16_fnHeapMinimize(IMalloc1 * IMalloc16_Constructor [VTABLE] */ LPMALLOC16 -IMalloc16_Constructor() +IMalloc16_Constructor(void) { static IMalloc16Vtbl vt16; static SEGPTR msegvt16;

1 0

Robert Shearman : widl: Generate FC_ERROR_STATUS_T proc format.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ccdc119da025ecde55223159226d6a994189ee8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccdc119da025ecde5522315… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:14:31 2005 +0100 widl: Generate FC_ERROR_STATUS_T proc format. - Include the header file for the functions implemented in typegen.c. - Generate proc format for FC_ERROR_STATUS_T type. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 14817da..6cdff1f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -39,6 +39,7 @@ #include "windef.h" #include "widl.h" +#include "typegen.h" static int print_file(FILE *file, int indent, const char *format, ...) { @@ -75,6 +76,7 @@ static void write_procformatstring_var(F CASE_BASETYPE(FC_SMALL); CASE_BASETYPE(FC_FLOAT); CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE default: error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type);

1 0

Robert Shearman : widl: Support explicit binding handles.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 12159aec96d3b0ee5cdda45557f747b6093d51cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12159aec96d3b0ee5cdda45… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:14:03 2005 +0100 widl: Support explicit binding handles. --- tools/widl/client.c | 30 ++++++++++++++++++++++++++++-- tools/widl/header.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/widl/header.h | 1 + tools/widl/server.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 2 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 773b318..24bcda8 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -124,6 +124,7 @@ static void write_function_stubs(type_t { func_t *func = iface->funcs; char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); var_t *var; int method_count = 0; unsigned int proc_offset = 0; @@ -132,6 +133,26 @@ static void write_function_stubs(type_t while (func) { var_t *def = func->def; + var_t* explicit_handle_var; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (explicit_handle) + { + if (!explicit_handle_var) + { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } + else if (implicit_handle) + { + if (explicit_handle_var) + { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } write_type(client, def->type, def, def->tname); fprintf(client, " "); @@ -157,7 +178,7 @@ static void write_function_stubs(type_t fprintf(client, " _RetVal;\n"); } - if (implicit_handle) + if (implicit_handle || explicit_handle_var) print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); @@ -181,6 +202,11 @@ static void write_function_stubs(type_t print_client("_Handle = %s;\n", implicit_handle); fprintf(client, "\n"); } + else if (explicit_handle_var) + { + print_client("_Handle = %s;\n", explicit_handle_var->name); + fprintf(client, "\n"); + } /* emit the message buffer size */ print_client("_StubMsg.BufferLength ="); @@ -191,7 +217,7 @@ static void write_function_stubs(type_t indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - if (implicit_handle) + if (implicit_handle || explicit_handle_var) print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); diff --git a/tools/widl/header.c b/tools/widl/header.c index 070657a..f68844b 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -502,6 +502,28 @@ void write_library(const char *name, att fprintf(header, "\n"); } + +var_t* get_explicit_handle_var(func_t* func) +{ + var_t* var; + + if (!func->args) + return NULL; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->type->type == RPC_FC_IGNORE) + return var; + + var = PREV_LINK(var); + } + + return NULL; +} + + /********** INTERFACES **********/ int is_object(attr_t *a) @@ -739,10 +761,29 @@ static void write_method_proto(type_t *i static void write_function_proto(type_t *iface) { + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); + var_t* explicit_handle_var; + func_t *cur = iface->funcs; while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); while (cur) { var_t *def = cur->def; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(cur); + if (explicit_handle) { + if (!explicit_handle_var) { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } else if (implicit_handle) { + if (explicit_handle_var) { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + /* FIXME: do we need to handle call_as? */ write_type(header, def->type, def, def->tname); fprintf(header, " "); diff --git a/tools/widl/header.h b/tools/widl/header.h index 5ecb8aa..c649513 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -42,5 +42,6 @@ extern void write_constdef(var_t *v); extern void write_externdef(var_t *v); extern void write_library(const char *name, attr_t *attr); extern void write_user_types(void); +extern var_t* get_explicit_handle_var(func_t* func); #endif diff --git a/tools/widl/server.c b/tools/widl/server.c index 2abfe83..4c9fcbd 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -89,8 +89,11 @@ static void write_parameters_init(func_t static void write_function_stubs(type_t *iface) { + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); func_t *func = iface->funcs; var_t *var; + var_t* explicit_handle_var; unsigned int proc_offset = 0; while (NEXT_LINK(func)) func = NEXT_LINK(func); @@ -98,6 +101,25 @@ static void write_function_stubs(type_t { var_t *def = func->def; + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (explicit_handle) + { + if (!explicit_handle_var) + { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } + else if (implicit_handle) + { + if (explicit_handle_var) + { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + write_type(server, def->type, def, def->tname); fprintf(server, " __RPC_STUB\n"); fprintf(server, "%s_", iface->name); @@ -152,6 +174,12 @@ static void write_function_stubs(type_t write_parameters_init(func); + if (explicit_handle_var) + { + print_server("%s = _pRpcMessage->Handle;\n", explicit_handle_var->name); + fprintf(server, "\n"); + } + print_server("RpcTryFinally\n"); print_server("{\n"); indent++;

1 0

Robert Shearman : widl: Zero initialize parameters in the generated server code.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 759e3c9fe3b9012937227e1618d33f492a506ccc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=759e3c9fe3b9012937227e1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:13:43 2005 +0100 widl: Zero initialize parameters in the generated server code. Zero initialize parameters in the generated code. Based on a patch by Eric Kohl. --- tools/widl/server.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 2ddbc41..2abfe83 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -68,6 +68,25 @@ static int print_server(const char *form } +static void write_parameters_init(func_t *func) +{ + var_t *var; + + if (!func->args) + return; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + print_server("%s = 0;\n", var->name); + + var = PREV_LINK(var); + } + fprintf(server, "\n"); +} + + static void write_function_stubs(type_t *iface) { func_t *func = iface->funcs; @@ -131,6 +150,8 @@ static void write_function_stubs(type_t indent--; fprintf(server, "\n"); + write_parameters_init(func); + print_server("RpcTryFinally\n"); print_server("{\n"); indent++;

1 0

Robert Shearman : widl: Calculate the size of buffer required.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: dfb716f3d614fd0d21022d2c686efef19023292a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfb716f3d614fd0d21022d2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:12:50 2005 +0100 widl: Calculate the size of buffer required. - Calculate the size of buffer required. - Fix a typo. - Set the buffer start and buffer end markers. --- tools/widl/client.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 61 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7d583a0..773b318 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -66,6 +66,60 @@ static int print_client( const char *for } +static void print_message_buffer_size(func_t *func) +{ + unsigned int total_size = 0; + + if (func->args) + { + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + unsigned int alignment = 8; + + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + total_size += 1; + alignment = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + total_size += 2 + alignment % 2; + alignment = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + total_size += 4 + alignment % 4; + alignment = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + total_size += 8 + alignment % 8; + alignment = 8; + break; + + default: + alignment = 1; + } + + var = PREV_LINK(var); + } + } + fprintf(client, " %u", total_size); +} + + static void write_function_stubs(type_t *iface) { func_t *func = iface->funcs; @@ -130,7 +184,7 @@ static void write_function_stubs(type_t /* emit the message buffer size */ print_client("_StubMsg.BufferLength ="); - print_client("0"); /* FIXME */ + print_message_buffer_size(func); fprintf(client, ";\n"); print_client("NdrGetBuffer(\n"); @@ -138,7 +192,7 @@ static void write_function_stubs(type_t print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); if (implicit_handle) - print_client("%_Handle);\n"); + print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); indent--; @@ -150,14 +204,17 @@ static void write_function_stubs(type_t /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ + /* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */ + /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char *)_StubMsg.Buffer);\n"); - /* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */ - /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ indent--; + print_client("_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); + print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n"); + /* unmarshal return value */ if (!is_void(def->type, NULL)) {

1 0

Robert Shearman : widl: Don't cast buffer pointers to long in generated server code.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: fc3821f475bb2f9a85180da6e0ccab2d288617d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc3821f475bb2f9a85180da… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:12:06 2005 +0100 widl: Don't cast buffer pointers to long in generated server code. --- tools/widl/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 68b46e6..2ddbc41 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -235,7 +235,7 @@ static void write_function_stubs(type_t fprintf(server, "\n"); print_server("_pRpcMessage->BufferLength =\n"); indent++; - print_server("(unsigned int)((long)_StubMsg.Buffer - (long)_pRpcMessage->Buffer);\n"); + print_server("(unsigned int)(_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer);\n"); indent--; indent--; fprintf(server, "}\n");

1 0

Eric Kohl : widl: Support multiple interfaces per file.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 6744d4e3ea2ead8a44a6a15d5a709fdb4bff51ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6744d4e3ea2ead8a44a6a15… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Mon Dec 12 12:11:44 2005 +0100 widl: Support multiple interfaces per file. --- tools/widl/client.c | 48 +++++++++++++++++++++++++++++------------------- tools/widl/server.c | 46 ++++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 37 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 6c33692..7d583a0 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -386,37 +386,47 @@ static void init_client(void) void write_client(ifref_t *ifaces) { - ifref_t *lcur = ifaces; + ifref_t *iface = ifaces; if (!do_client) return; - if (!lcur) + if (!iface) return; - END_OF_LIST(lcur); + END_OF_LIST(iface); init_client(); if (!client) return; - write_formatstringsdecl(lcur->iface); - write_implicithandledecl(lcur->iface); + while (iface) + { + fprintf(client, "/*****************************************************************************\n"); + fprintf(client, " * %s interface\n", iface->iface->name); + fprintf(client, " */\n"); + fprintf(client, "\n"); + + write_formatstringsdecl(iface->iface); + write_implicithandledecl(iface->iface); + + write_clientinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + write_bindinghandledecl(iface->iface); + + write_function_stubs(iface->iface); + write_stubdescriptor(iface->iface); + + print_client("#if !defined(__RPC_WIN32__)\n"); + print_client("#error Invalid build platform for this stub.\n"); + print_client("#endif\n"); + fprintf(client, "\n"); - write_clientinterfacedecl(lcur->iface); - write_stubdescdecl(lcur->iface); - write_bindinghandledecl(lcur->iface); + write_procformatstring(client, iface->iface); + write_typeformatstring(client); - write_function_stubs(lcur->iface); - write_stubdescriptor(lcur->iface); + fprintf(client, "\n"); - print_client("#if !defined(__RPC_WIN32__)\n"); - print_client("#error Invalid build platform for this stub.\n"); - print_client("#endif\n"); - fprintf(client, "\n"); - - write_procformatstring(client, lcur->iface); - write_typeformatstring(client); - - fprintf(client, "\n"); + iface = PREV_LINK(iface); + } fclose(client); } diff --git a/tools/widl/server.c b/tools/widl/server.c index 668e492..68b46e6 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -432,36 +432,46 @@ static void init_server(void) void write_server(ifref_t *ifaces) { - ifref_t *lcur = ifaces; + ifref_t *iface = ifaces; if (!do_server) return; - if (!lcur) + if (!iface) return; - END_OF_LIST(lcur); + END_OF_LIST(iface); init_server(); if (!server) return; - write_formatstringsdecl(lcur->iface); - write_serverinterfacedecl(lcur->iface); - write_stubdescdecl(lcur->iface); + while (iface) + { + fprintf(server, "/*****************************************************************************\n"); + fprintf(server, " * %s interface\n", iface->iface->name); + fprintf(server, " */\n"); + fprintf(server, "\n"); + + write_formatstringsdecl(iface->iface); + write_serverinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + + write_function_stubs(iface->iface); + + write_stubdescriptor(iface->iface); + write_dispatchtable(iface->iface); + + print_server("#if !defined(__RPC_WIN32__)\n"); + print_server("#error Invalid build platform for this stub.\n"); + print_server("#endif\n"); + fprintf(server, "\n"); - write_function_stubs(lcur->iface); + write_procformatstring(server, iface->iface); + write_typeformatstring(server); - write_stubdescriptor(lcur->iface); - write_dispatchtable(lcur->iface); + fprintf(server, "\n"); - print_server("#if !defined(__RPC_WIN32__)\n"); - print_server("#error Invalid build platform for this stub.\n"); - print_server("#endif\n"); - fprintf(server, "\n"); - - write_procformatstring(server, lcur->iface); - write_typeformatstring(server); - - fprintf(server, "\n"); + iface = PREV_LINK(iface); + } fclose(server); }

1 0

Robert Shearman : widl: Don't treat FC_SMALL as FC_SHORT.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: f4356a64e3daefe125efe8714903ae84d68dfbfc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4356a64e3daefe125efe87… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:11:11 2005 +0100 widl: Don't treat FC_SMALL as FC_SHORT. FC_SMALL is its own type and is the same size as FC_CHAR, not FC_SHORT. --- tools/widl/header.c | 5 +++++ tools/widl/parser.y | 2 +- tools/widl/typegen.c | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index be279ad..070657a 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -221,6 +221,11 @@ void write_type(FILE *h, type_t *t, var_ case RPC_FC_WCHAR: fprintf(h, "WCHAR"); break; + case RPC_FC_USMALL: + case RPC_FC_SMALL: + if (t->ref) fprintf(h, t->ref->name); + else fprintf(h, "small"); + break; case RPC_FC_USHORT: case RPC_FC_SHORT: if (t->ref) fprintf(h, t->ref->name); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 86eac75..ef331a2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -585,7 +585,7 @@ m_int: int_std: tINT { $$ = make_type(RPC_FC_LONG, &std_int); } /* win32 only */ | tSHORT m_int { $$ = make_type(RPC_FC_SHORT, NULL); } - | tSMALL { $$ = make_type(RPC_FC_SHORT, NULL); } + | tSMALL { $$ = make_type(RPC_FC_SMALL, NULL); } | tLONG m_int { $$ = make_type(RPC_FC_LONG, NULL); } | tHYPER m_int { $$ = make_type(RPC_FC_HYPER, NULL); } | tINT64 { $$ = make_type(RPC_FC_HYPER, &std_int64); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ae84f1..14817da 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -71,6 +71,7 @@ static void write_procformatstring_var(F CASE_BASETYPE(FC_LONG); CASE_BASETYPE(FC_HYPER); CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_USMALL); CASE_BASETYPE(FC_SMALL); CASE_BASETYPE(FC_FLOAT); CASE_BASETYPE(FC_DOUBLE); @@ -162,6 +163,8 @@ unsigned int get_required_buffer_size(ty case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: + case RPC_FC_USMALL: + case RPC_FC_SMALL: case RPC_FC_ULONG: case RPC_FC_LONG: case RPC_FC_FLOAT: @@ -198,6 +201,8 @@ void marshall_arguments(FILE *file, int { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: size = 1; alignment = 0; break; @@ -266,6 +271,8 @@ void unmarshall_arguments(FILE *file, in { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: size = 1; alignment = 0; break;

1 0

Robert Shearman : widl: Use WCHAR instead of wchar_t.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 6066106bb0aeb71d2e79390260743a86e2a04426 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6066106bb0aeb71d2e79390… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:10:26 2005 +0100 widl: Use WCHAR instead of wchar_t. Output IDL wchar_t types as WCHAR to avoid conflicts with the generally incompatible Unix wchar_t. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 95db8c9..be279ad 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -219,7 +219,7 @@ void write_type(FILE *h, type_t *t, var_ else fprintf(h, "char"); break; case RPC_FC_WCHAR: - fprintf(h, "wchar_t"); + fprintf(h, "WCHAR"); break; case RPC_FC_USHORT: case RPC_FC_SHORT:

1 0

Detlef Riekenberg : winspool: Added documentation for OpenPrinter.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: dd6aa8cf2d5247458ff6322a300582d1149e8a46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd6aa8cf2d5247458ff6322… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 12 12:10:13 2005 +0100 winspool: Added documentation for OpenPrinter. --- dlls/winspool/info.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index f1d05c1..9b1771d 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1039,6 +1039,8 @@ LONG WINAPI DocumentPropertiesW(HWND hWn /****************************************************************** * OpenPrinterA [WINSPOOL.@] * + * See OpenPrinterW. + * */ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSA pDefault) @@ -1069,6 +1071,32 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinter /****************************************************************** * OpenPrinterW [WINSPOOL.@] * + * Open a Printer / Printserver or a Printer-Object + * + * PARAMS + * lpPrinterName [I] Name of Printserver, Printer, or Printer-Object + * phPrinter [O] The resulting Handle is stored here + * pDefault [I] PTR to Default Printer Settings or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * lpPrinterName is one of: + *| Printserver (NT only): "Servername" or NULL for the local Printserver + *| Printer: "PrinterName" + *| Printer-Object: "PrinterName,Job xxx" + *| XcvMonitor: "Servername,XcvMonitor MonitorName" + *| XcvPort: "Servername,XcvPort PortName" + * + * BUGS + *| Printserver not supported + *| Printer-Object not supported + *| XcvMonitor not supported + *| XcvPort not supported + *| pDefaults not supported + * */ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault)

1 0

Eric Pouech : Const correctness fixes.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 28442721fd0494263f8c6b671ee6dcb1873c93dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28442721fd0494263f8c6b6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:55:49 2005 +0100 Const correctness fixes. --- dlls/commdlg/finddlg32.c | 2 +- dlls/ole32/ole16.c | 4 ++-- dlls/user/cursoricon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/commdlg/finddlg32.c b/dlls/commdlg/finddlg32.c index 20f9e34..6225773 100644 --- a/dlls/commdlg/finddlg32.c +++ b/dlls/commdlg/finddlg32.c @@ -385,7 +385,7 @@ static HWND COMDLG32_FR_DoFindReplace( hmod = (HMODULE)pdata->fr.hInstance; if(pdata->fr.Flags & FR_WINE_UNICODE) { - htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); + htemplate = FindResourceW(hmod, (LPCWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOG); } else { diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index f7d76f3..15e054f 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -144,7 +144,7 @@ SEGPTR IMalloc16_fnRealloc(IMalloc16* if /****************************************************************************** * IMalloc16_GetSize [COMPOBJ.506] */ -DWORD IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv) +DWORD IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) { IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->GetSize(%08lx)\n",This,pv); @@ -154,7 +154,7 @@ DWORD IMalloc16_fnGetSize(const IMalloc1 /****************************************************************************** * IMalloc16_DidAlloc [COMPOBJ.507] */ -INT16 IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) { +INT16 IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { IMalloc16 *This = (IMalloc16 *)iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index 2e64d4a..c3bb046 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -284,7 +284,7 @@ static BOOL is_dib_monochrome( const BIT } else /* assume BITMAPINFOHEADER */ { - RGBQUAD *rgb = info->bmiColors; + const RGBQUAD *rgb = info->bmiColors; /* Check if the first color is black */ if ((rgb->rgbRed == 0) && (rgb->rgbGreen == 0) &&

1 0

Marcus Meissner : winsock: getaddrinfo return codes
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 8e203745f4834ea3088fbbb9fea2c0f92807b1f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e203745f4834ea3088fbbb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 12 11:55:33 2005 +0100 winsock: getaddrinfo return codes Adjust return code EAI_NODATA to WSAHOST_NOT_FOUND, like windows does it. --- include/ws2tcpip.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 642808c..90a224b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -182,7 +182,7 @@ typedef struct _INTERFACE_INFO # define EAI_FAIL WSANO_RECOVERY # define EAI_FAMILY WSAEAFNOSUPPORT # define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY -# define EAI_NODATA WSANO_DATA +# define EAI_NODATA EAI_NONAME # define EAI_NONAME WSAHOST_NOT_FOUND # define EAI_SERVICE WSATYPE_NOT_FOUND # define EAI_SOCKTYPE WSAESOCKTNOSUPPORT @@ -196,7 +196,7 @@ typedef struct _INTERFACE_INFO # define WS_EAI_FAIL WSANO_RECOVERY # define WS_EAI_FAMILY WSAEAFNOSUPPORT # define WS_EAI_MEMORY WSA_NOT_ENOUGH_MEMORY -# define WS_EAI_NODATA WSANO_DATA +# define WS_EAI_NODATA WS_EAI_NONAME # define WS_EAI_NONAME WSAHOST_NOT_FOUND # define WS_EAI_SERVICE WSATYPE_NOT_FOUND # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT

1 0

Marcus Meissner : winsock: getaddrinfo - return code mapping.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: b364f81218805bf6fdc63fef7a18fa806c137785 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b364f81218805bf6fdc63fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 12 11:55:11 2005 +0100 winsock: getaddrinfo - return code mapping. convert_eai_u2w should map from unix to windows, not the other way round (spotted by Dominic Wise). --- dlls/winsock/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index e67363b..2fc7d37 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -3106,8 +3106,8 @@ static int convert_eai_u2w(int unixret) int i; for (i=0;ws_eai_map[i][0];i++) - if (ws_eai_map[i][0] == unixret) - return ws_eai_map[i][1]; + if (ws_eai_map[i][1] == unixret) + return ws_eai_map[i][0]; return unixret; }

1 0

Paul Vriens : urlmon.idl: Add some BINDSTATUS values.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 6194255d5b8afa076bdbc0e5a03ae19aca2de198 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6194255d5b8afa076bdbc0e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 11:54:55 2005 +0100 urlmon.idl: Add some BINDSTATUS values. --- include/urlmon.idl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 1fa8b4f..97ab839 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -219,7 +219,11 @@ interface IBindStatusCallback : IUnknown BINDSTATUS_SESSION_COOKIE_RECEIVED, BINDSTATUS_PERSISTENT_COOKIE_RECEIVED, BINDSTATUS_SESSION_COOKIES_ALLOWED, - BINDSTATUS_CACHECONTROL + BINDSTATUS_CACHECONTROL, + BINDSTATUS_CONTENTDISPOSITIONFILENAME, + BINDSTATUS_MIMETEXTPLAINMISMATCH, + BINDSTATUS_PUBLISHERAVAILABLE, + BINDSTATUS_DISPLAYNAMEAVAILABLE } BINDSTATUS;

1 0

Eric Pouech : comctl32: Fixed (harmless) typo.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 1d2f975ba9330bdca5bf5d47cf606564dba3f259 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d2f975ba9330bdca5bf5d4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:54:35 2005 +0100 comctl32: Fixed (harmless) typo. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index cf04d4b..df71326 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -565,7 +565,7 @@ TREEVIEW_SendTreeviewNotify(TREEVIEW_INF TRACE("code:%d action:%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); - ZeroMemory(&nmhdr, sizeof(NMTREEVIEWA)); + ZeroMemory(&nmhdr, sizeof(NMTREEVIEWW)); nmhdr.hdr.hwndFrom = hwnd; nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID);

1 0

Eric Pouech : Removed some dead-code.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ada6df3a84a7f2118bf5611184e2ab3ce7aa2da8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ada6df3a84a7f2118bf5611… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:54:19 2005 +0100 Removed some dead-code. --- dlls/commdlg/fontdlg.c | 3 +-- dlls/winaspi/aspi.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index 1f9980b..b6ad99c 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -1076,7 +1076,6 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wP HDC hdc; HPEN hOrigPen; HFONT hOrigFont; - COLORREF rgbPrev; LOGFONTW lf = *(lpcf->lpLogFont); MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2); @@ -1104,7 +1103,7 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wP info.rcWindow.top++; info.rcWindow.left++; hOrigFont = SelectObject( hdc, CreateFontIndirectW( &lf ) ); - rgbPrev=SetTextColor( hdc, lpcf->rgbColors ); + SetTextColor( hdc, lpcf->rgbColors ); DrawTextW( hdc, sample_lang_text[CHARSET_ORDER[lpcf->lpLogFont->lfCharSet]], diff --git a/dlls/winaspi/aspi.c b/dlls/winaspi/aspi.c index 35c8c8a..85e7dcf 100644 --- a/dlls/winaspi/aspi.c +++ b/dlls/winaspi/aspi.c @@ -221,7 +221,7 @@ DWORD ASPI_GetHCforController( int contr RegCloseKey(hkeyPort); return ((--i) << 16) + atoiW(&wPortName[9]); -}; +} int SCSI_OpenDevice( int h, int c, int t, int d ) {

1 0

Eric Pouech : Made some functions static.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 8cddd5d2fbd00b8addb02c57cdfe95002cec3250 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8cddd5d2fbd00b8addb02c5… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:53:56 2005 +0100 Made some functions static. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- dlls/setupapi/queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 065157d..679ad12 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -94,7 +94,7 @@ static void flushdisplaymodes(void) modes_cnt = modes_size = 0; } -HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) +static HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext) { trace("Width = %li, Height = %li, Refresh Rate = %li\r\n", lpddsd->dwWidth, lpddsd->dwHeight, diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index a444f9d..390fd04 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -947,7 +947,7 @@ static BOOL create_full_pathW(const WCHA return ret; } -BOOL static do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) +static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style) { BOOL rc = FALSE; BOOL docopy = TRUE;

1 0

Eric Pouech : vidc: Return error codes when a message isn't supported.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ed43709a385ff99f1e407e9c2b87acc5125720f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed43709a385ff99f1e407e9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:53:28 2005 +0100 vidc: Return error codes when a message isn't supported. --- dlls/iccvid/iccvid.c | 3 +-- dlls/msvidc32/msvideo1.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index ad04d5f..009c4ae 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -978,14 +978,13 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ case ICM_DECOMPRESSEX: return ICCVID_DecompressEx( info, (ICDECOMPRESSEX*) lParam1, (DWORD) lParam2 ); - case DRV_CLOSE: return ICCVID_Close( info ); default: FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); } - return 0; + return ICERR_UNSUPPORTED; } BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index f971d4f..0a79139 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -482,7 +482,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT LPARAM lParam1, LPARAM lParam2 ) { Msvideo1Context *info = (Msvideo1Context *) dwDriverId; - LRESULT r = 0; + LRESULT r = ICERR_UNSUPPORTED; TRACE("%ld %p %04x %08lx %08lx\n", dwDriverId, hdrvr, msg, lParam1, lParam2);

1 0

Robert Shearman : OLE: Fix SafeArrayCopy for NULL pvData.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 9f1c6bf6bce0c2be5dcb236b5ff7a1daded2892d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f1c6bf6bce0c2be5dcb236… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:51 2005 +0100 OLE: Fix SafeArrayCopy for NULL pvData. It is allowed to copy a SAFEARRAY with a NULL pvData, as long as cbElements is non-zero. Add a test for this and fix the safe array code. --- dlls/oleaut32/safearray.c | 10 +++++++++- dlls/oleaut32/tests/safearray.c | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index b84226b..4ff056a 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -355,7 +355,9 @@ static HRESULT SAFEARRAY_DestroyData(SAF /* Copy data items from one array to another */ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { - if (!psa->pvData || !dest->pvData || psa->fFeatures & FADF_DATADELETED) + if (!psa->pvData) + return S_OK; + else if (!dest->pvData || psa->fFeatures & FADF_DATADELETED) return E_INVALIDARG; else { @@ -1378,6 +1380,12 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY * if (!psa) return S_OK; /* Handles copying of NULL arrays */ + if (!psa->cbElements) + { + ERR("not copying an array of 0 elements\n"); + return E_INVALIDARG; + } + if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) { VARTYPE vt; diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index a39d43a..d7909e7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1418,7 +1418,7 @@ static void test_SafeArrayClear(void) static void test_SafeArrayCopy(void) { SAFEARRAYBOUND sab; - SAFEARRAY *sa; + SAFEARRAY *sa, *sa2; VARIANTARG vSrc, vDst; HRESULT hres; @@ -1450,6 +1450,19 @@ static void test_SafeArrayCopy(void) SafeArrayDestroy(V_ARRAY(&vSrc)); SafeArrayDestroy(V_ARRAY(&vDst)); + + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08lx\n", hres); + + hres = SafeArrayCopy(sa, &sa2); + ok(hres == E_INVALIDARG, + "SafeArrayCopy with empty array should have failed with error E_INVALIDARG instead of 0x%08lx\n", + hres); + sa->cbElements = 16; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08lx\n", hres); + + SafeArrayDestroy(sa); } #define MKARRAY(low,num,typ) sab.lLbound = low; sab.cElements = num; \

1 0

Robert Shearman : CreateErrorInfo trace fix.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 6c3e1f9adfe687184b4eb5e7890a57399d8b3c9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c3e1f9adfe687184b4eb5e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:36 2005 +0100 CreateErrorInfo trace fix. CreateErrorInfo isn't a stub so don't print this in the trace message. --- dlls/ole32/errorinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 730f0d8..7404c6c 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -476,7 +476,7 @@ HRESULT WINAPI CreateErrorInfo(ICreateEr { IErrorInfo * pei; HRESULT res; - TRACE("(%p): stub:\n", pperrinfo); + TRACE("(%p)\n", pperrinfo); if(! pperrinfo ) return E_INVALIDARG; if(!(pei=IErrorInfoImpl_Constructor()))return E_OUTOFMEMORY;

1 0

Robert Shearman : OLE: Add const to several typelib functions.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 69aa9f9d2e5347c4fe81959bcee3891d0ca5c5d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69aa9f9d2e5347c4fe81959… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:23 2005 +0100 OLE: Add const to several typelib functions. Add const attributes to parameters for several functions and fix up some formatting. --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a6e2495..29585a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -85,7 +85,7 @@ WINE_DECLARE_DEBUG_CHANNEL(typelib); /* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } }; -static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt); +static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); /**************************************************************************** @@ -5054,7 +5054,7 @@ _copy_arg( ITypeInfo2 *tinfo, TYPEDESC * return E_FAIL; } -static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt) +static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; ITypeInfo *tinfo2 = NULL; @@ -5088,11 +5088,11 @@ static HRESULT userdefined_to_variantvt( break; case TKIND_INTERFACE: - if (IsEqualIID(&IID_IDispatch, &tattr->guid)) - *vt |= VT_DISPATCH; - else - *vt |= VT_UNKNOWN; - break; + if (IsEqualIID(&IID_IDispatch, &tattr->guid)) + *vt |= VT_DISPATCH; + else + *vt |= VT_UNKNOWN; + break; case TKIND_DISPATCH: *vt |= VT_DISPATCH; @@ -5118,7 +5118,7 @@ static HRESULT userdefined_to_variantvt( return hr; } -static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt) +static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; @@ -5134,7 +5134,7 @@ static HRESULT typedescvt_to_variantvt(I ((tdesc->vt == VT_PTR) && (tdesc->u.lptdesc->vt == VT_USERDEFINED))) { VARTYPE vt_userdefined = 0; - TYPEDESC *tdesc_userdefined = tdesc; + const TYPEDESC *tdesc_userdefined = tdesc; if (tdesc->vt == VT_PTR) { vt_userdefined = VT_BYREF;

1 0

Robert Shearman : OleTranslateColor trace fix.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: e7299cdf47a5588a0e7357403b08d18da61d0bdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7299cdf47a5588a0e73574… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:02 2005 +0100 OleTranslateColor trace fix. OleTranslateColor isn't a stub so don't print ":stub" in the trace message. --- dlls/oleaut32/oleaut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 3ef2088..bedca34 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -629,7 +629,7 @@ HRESULT WINAPI OleTranslateColor( COLORREF colorref; BYTE b = HIBYTE(HIWORD(clr)); - TRACE("(%08lx, %p, %p):stub\n", clr, hpal, pColorRef); + TRACE("(%08lx, %p, %p)\n", clr, hpal, pColorRef); /* * In case pColorRef is NULL, provide our own to simplify the code.

1 0

Jacek Caban : mshtml: Added IHTMLDocument3 stub implementation.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 7f7e94d331481a381dc4c188240c9b235548cde8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f7e94d331481a381dc4c18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 11:51:43 2005 +0100 mshtml: Added IHTMLDocument3 stub implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 4 dlls/mshtml/htmldoc3.c | 448 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 4 files changed, 456 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmldoc3.c

1 0

Stefan Leichter : winetest: Add d3d9 tests.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: e6b17d1b06a578be5552ba7946a29355add28f5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6b17d1b06a578be5552ba7… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Mon Dec 12 11:51:29 2005 +0100 winetest: Add d3d9 tests. --- programs/winetest/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 5cea062..4208b94 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -26,6 +26,7 @@ TESTBINS = \ advapi32_test.exe$(DLLEXT) \ comctl32_test.exe$(DLLEXT) \ crypt32_test.exe$(DLLEXT) \ + d3d9_test.exe$(DLLEXT) \ dinput_test.exe$(DLLEXT) \ dsound_test.exe$(DLLEXT) \ gdi32_test.exe$(DLLEXT) \ @@ -104,6 +105,8 @@ comctl32_test.exe$(DLLEXT): $(DLLDIR)/co cp $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) $@ && $(STRIP) $@ crypt32_test.exe$(DLLEXT): $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) cp $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +d3d9_test.exe$(DLLEXT): $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) + cp $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) $@ && $(STRIP) $@ ddraw_test.exe$(DLLEXT): $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) cp $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) $@ && $(STRIP) $@ dinput_test.exe$(DLLEXT): $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT)

1 0

Robert Shearman : widl: Don't output __RPC_FAR in generated code.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: fea330364bbf4109e3465d2ee0cca84b6ff34400 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fea330364bbf4109e3465d2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:51:11 2005 +0100 widl: Don't output __RPC_FAR in generated code. --- tools/widl/client.c | 10 +++++----- tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index a371be6..6c33692 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -153,9 +153,9 @@ static void write_function_stubs(type_t print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer);\n"); - /* print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); */ - /* print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ + print_client("(unsigned char *)_StubMsg.Buffer);\n"); + /* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */ + /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ indent--; /* unmarshal return value */ @@ -174,7 +174,7 @@ static void write_function_stubs(type_t print_client("_RetVal = *(("); write_type(client, def->type, def, def->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); + fprintf(client, " *)_StubMsg.Buffer)++;\n"); } /* update proc_offset */ @@ -244,7 +244,7 @@ static void write_stubdescriptor(type_t print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; - print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); + print_client("(void *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); if (implicit_handle) diff --git a/tools/widl/server.c b/tools/widl/server.c index 4009bb2..668e492 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -216,12 +216,12 @@ static void write_function_stubs(type_t print_server("RpcRaiseException(_Status);\n"); indent--; fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)_pRpcMessage->Buffer;\n"); + print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); fprintf(server, "\n"); print_server("*(("); write_type(server, def->type, def, def->tname); - fprintf(server, " __RPC_FAR *)_StubMsg.Buffer)++ = _RetVal;\n"); + fprintf(server, " *)_StubMsg.Buffer)++ = _RetVal;\n"); } indent--; @@ -306,7 +306,7 @@ static void write_stubdescriptor(type_t print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_server("{\n"); indent++; - print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name); + print_server("(void *)& %s___RpcServerInterface,\n", iface->name); print_server("MIDL_user_allocate,\n"); print_server("MIDL_user_free,\n"); print_server("0,\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8883b3f..1ae84f1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -236,7 +236,7 @@ void marshall_arguments(FILE *file, int print_file(file, indent, "*(("); write_type(file, var->type, var, var->tname); - fprintf(file, " __RPC_FAR*)_StubMsg.Buffer)++ = "); + fprintf(file, " *)_StubMsg.Buffer)++ = "); write_name(file, var); fprintf(file, ";\n"); fprintf(file, "\n"); @@ -306,7 +306,7 @@ void unmarshall_arguments(FILE *file, in write_name(file, var); fprintf(file, " = *(("); write_type(file, var->type, var, var->tname); - fprintf(file, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(file, " *)_StubMsg.Buffer)++;\n"); fprintf(file, "\n"); last_size = size;

1 0

Paul Vriens : winecfg: Update Dutch resources for the Audio tab.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 019aef9f5f5391df8486ca59bb06a3eb47b488ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=019aef9f5f5391df8486ca5… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 11:50:57 2005 +0100 winecfg: Update Dutch resources for the Audio tab. --- programs/winecfg/Nl.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 3c8318a..b4cdf9a 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -154,13 +154,13 @@ BEGIN LTEXT "Geluidsbesturing: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Automatisch detecteren",IDC_AUDIO_AUTODETECT,170,18,79,14 - PUSHBUTTON "Configureer",IDC_AUDIO_CONFIGURE,170,38,49,14 - PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,58,69,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - LTEXT "Hardwareversnelling: ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + PUSHBUTTON "Configureer",IDC_AUDIO_CONFIGURE,170,38,79,14 + PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,58,79,14 + CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 + LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Jacek Caban : Added declaration of IHTMLDocument3 and more DISPIDs.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: f94acfdd7daacaac6f4cf1205f54d90ef2780f9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f94acfdd7daacaac6f4cf12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 11:50:38 2005 +0100 Added declaration of IHTMLDocument3 and more DISPIDs. --- include/mshtmdid.h | 373 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mshtml.idl | 225 +++++++++++++++++++++++++++++++ 2 files changed, 598 insertions(+), 0 deletions(-)

1 0

Filip Navara : kernel: Fix the Mach-O binary magic.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 2f7480e5afbbcaded9029e34eab323f40c6334a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f7480e5afbbcaded9029e3… Author: Filip Navara <xnavara(a)volny.cz> Date: Mon Dec 12 11:50:15 2005 +0100 kernel: Fix the Mach-O binary magic. --- dlls/kernel/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c index 360f534..c26345d 100644 --- a/dlls/kernel/module.c +++ b/dlls/kernel/module.c @@ -270,7 +270,7 @@ enum binary_type MODULE_GetBinaryType( H } /* Mach-o File with Endian set to Big Endian or Little Endian */ - if (header.macho.magic == 0xfeedface || header.macho.magic == 0xecafdeef) + if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) { switch(header.macho.filetype) {

1 0

Thomas Weidenmueller : urlmon: Correctly fix IStream::Read.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ac459e7ea0592feacc67e322d40cc835a805a99f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac459e7ea0592feacc67e32… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Dec 12 11:49:29 2005 +0100 urlmon: Correctly fix IStream::Read. Don't dereference a possible NULL pointer. --- dlls/urlmon/umstream.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 720c8ba..36909b6 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -225,7 +225,7 @@ static HRESULT WINAPI IStream_fnRead (IS ULONG cb, ULONG* pcbRead) { - DWORD dwBytesRead; + ULONG dwBytesRead; IUMCacheStream *This = (IUMCacheStream *)iface; TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); @@ -233,7 +233,10 @@ static HRESULT WINAPI IStream_fnRead (IS if ( !pv ) return STG_E_INVALIDPOINTER; - if ( ! ReadFile( This->handle, pv, cb, (pcbRead ? pcbRead : &dwBytesRead), NULL ) ) + if ( !pcbRead) + pcbRead = &dwBytesRead; + + if ( ! ReadFile( This->handle, pv, cb, (LPDWORD)pcbRead, NULL ) ) return S_FALSE; if (!*pcbRead)

1 0

Markus Amsler : winedos: Implement MCB.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 19d60d3c5afa63b95d56ce2498c70cb7fd60ca1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19d60d3c5afa63b95d56ce2… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Dec 12 11:50:01 2005 +0100 winedos: Implement MCB. --- dlls/winedos/dosmem.c | 411 ++++++++++++++++++++++--------------------------- 1 files changed, 185 insertions(+), 226 deletions(-)

1 0

lostwages/wwn wn20051211_301.xml
by WineHQ Dec. 12, 2005

Dec. 12, 2005

ChangeSet ID: 21768 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/11 23:13:22 Modified files: wwn : wn20051211_301.xml Log message: fix spelling mistakes in WWN #301 Patch: http://cvs.winehq.org/patch.py?id=21768 Old revision New revision Changes Path 1.1 1.2 +19 -19 lostwages/wwn/wn20051211_301.xml Index: lostwages/wwn/wn20051211_301.xml diff -u -p lostwages/wwn/wn20051211_301.xml:1.1 lostwages/wwn/wn20051211_301.xml:1.2 --- lostwages/wwn/wn20051211_301.xml:1.1 12 Dec 2005 5:13:22 -0000 +++ lostwages/wwn/wn20051211_301.xml 12 Dec 2005 5:13:22 -0000 @@ -74,7 +74,7 @@ Its main goal is to break drill bits. It <section title="News: Wine 0.9.3" subject="News" - archive="http://www.winehq.com/?announce=1.107"> + archive="http://www.winehq.com/?announce=1.107" posts="1" > <topic>News</topic> @@ -134,13 +134,13 @@ GetDC/ReleaseDC a lot. While the patch fixes the conversion bottleneck for various games it doesn't handle 8bit paletted which is used by games like StarCraft as OpenGL doesn't -support this by default. The second patch which I attached aswell adds -support for this. On cards (atleast all nvidia cards from geforce 1 to the +support this by default. The second patch which I attached as well adds +support for this. On cards (at least all nvidia cards from geforce 1 to the fx) that support the opengl paletted texture extension this extension is used. It makes StarCraft very fast atleast on my Athlon XP2000 system with a GeforceFX where the game was slow before. As not all cards support paletted textures I emulated this using a simple fragment shader. (a 1D texture -containing the palette is used as a loopup table) +containing the palette is used as a lookup table) The <a href="http://www.winehq.org/pipermail/wine-devel/attachments/20051204/ca64706a/dd…">attached</a> @@ -161,7 +161,7 @@ I can fix the patches and submit them to Jesse Allen asked some questions about it: <quote who="Jesse Allen"> Is Starcraft really that slow? How does this compare with using DGA? - I'm not too sure because its speed vaires. I've been testing + I'm not too sure because its speed varies. I've been testing Starcraft this weekend and it has been plenty speedy. But I do remember when trying to play it multiplayer a few months ago and was burned when it ran slow. In fact it slowed *everyone* down. Not fun. @@ -191,12 +191,12 @@ and the rendering of them. I think the patch is a reasonable solution to work around various depth conversion problems. For sure it is the fastest way for the conversion as -the videocard basicly does it for free. On my system StarCraft and the +the videocard basically does it for free. On my system StarCraft and the Command & Conquer series (although they crash quite quickly due to threading issues) felt a lot faster, I think that the speed is close to that of DGA. Perhaps I should clarify some misunderstandings that some people have. (I -hope I explain it correctly) Basicly DirectDraw provides a mechanism to +hope I explain it correctly) Basically DirectDraw provides a mechanism to directly access the framebuffer of the videocard. This is the fastest way to render 2D images on the screen. Games like StarCraft, Total Annihilation, C&C and lots of others use DirectDraw in this way. Second there's another @@ -206,13 +206,13 @@ then use GetDC/ReleaseDC to get a device the surface. (directly into the video memory) In case of X direct framebuffer access is only possible through DGA but it -is unsecure and has other issues. When DGA works correctly it can accelerate +is insecure and has other issues. When DGA works correctly it can accelerate games like StarCraft. Further DGA doesn't have any depth conversion issues as it does depth switching. Without DGA the rendering operations need to go through X. Because of limitations of X, depth conversion problems appear when the depth of the desktop and X aren't the same. -For depth conversion purposes Wine's DirectDraw uses a DIB section. Basicly +For depth conversion purposes Wine's DirectDraw uses a DIB section. Basically all pixels of an image are translated to the depth of X. This is slow and especially for the case when the application requests 8bit paletted mode using a 24bit desktop. In this case a color lookup needs to happen in a @@ -241,7 +241,7 @@ StarCraft (much) as for those DIBs were the conversion algorithm stays the same (it can't be tweaked much if at all). So there's not really a way to speedup games like StarCraft for old videocards. Perhaps XShm might be of use but not sure how much it would -help. (think it would only be usefull for GetDC/ReleaseDC games) +help. (think it would only be useful for GetDC/ReleaseDC games) </quote> Pretty much everyone was in favor of any patch that would improve @@ -257,7 +257,7 @@ I think that to merge Roderick's and you the best would be to directly hook WineD3D even at the 2D level and not have DDraw hook DDraw's D3D which then goes into WineD3D. -This way we would have an unified DDraw. +This way we would have a unified DDraw. Of course, then the problem remains of what to do with older cards :-) </quote> @@ -269,11 +269,11 @@ a quite long chain. I abandoned it as to worth considering. How about moving the current 2D code to WineD3D, and making DDraw running over -WineD3D in any case. Then WineD3D could decide wether to use plain X11, DGA +WineD3D in any case. Then WineD3D could decide whether to use plain X11, DGA or OpenGL for 2D rendering. :) Maybe we should have a close look at the details of such a thing. I do not -really recommend a ad-hoc attemt, as d3d7->WineD3D was nearly too much. +really recommend a ad-hoc attempt, as d3d7->WineD3D was nearly too much. </quote> Lionel liked the idea: @@ -312,7 +312,7 @@ So what's the point of this mail? While by wrapping D3D7 only and leave DirectDraw in ddraw.dll, it has a few ugly drawbacks: <ul> -<li> Device initalisation: In D3D7, the first step is to create a IDirectDraw +<li> Device initialization: In D3D7, the first step is to create a IDirectDraw Device, set up the device, create a surface and then create a Direct3D Device. When creating the WineD3DDevice in the last step, I have to do some ugly things to wrap the already existing Surface to a newly created @@ -340,7 +340,7 @@ adopt it for D3D9 and D3D8.</li> <li> The IWineD3DSurface interface gets additional functionality for DirectDraw operations. I'd suggest 3 versions of the 2D functions: One based on plain -X11(for compatiblity) calls, one that uses DGA(speed without 3D +X11(for compatibility) calls, one that uses DGA(speed without 3D acceleration), and one that uses OpenGL(For fast rendering without /dev/mem access). For DXVersion > 7 the OpenGL version is used, and for DX7 it can be decided when the primary surface is created.</li> @@ -429,7 +429,7 @@ can also be the most time consuming part out exactly what broke something can get you really close to having a fix. -(There's also some exceptions to this, such as adding in stubbed +(There are also some exceptions to this, such as adding in stubbed functions that cause programs to suddenly break. The right fix is not to remove the stub, but to turn the stub into a complete function.. which may be a lot of work.) @@ -512,7 +512,7 @@ once be a problem?</quote> > <topic>Build Process</topic> Apparently Fedora's 64-bit version doesn't provide some of the -32-bit compatbility libraries necessary for Wine. (Which is somewhat +32-bit compatibility libraries necessary for Wine. (Which is somewhat surprising since Wine doesn't have as many dependencies as you'd expect.) Pavel Roskin came up with a script to work around it: <quote who="Pavel Roskin"> @@ -589,7 +589,7 @@ Wine crashes the first time it enters/us debug setup from ntdll/relay.c:RELAY_SetupDLL. (Which happens to be a RtlInitUnicode in kernel/module:GetModuleHandleW) . If you exclude the ntdll in relaying, wine - without parameters - does not crash. BUT at soon -as you try running a program it will cracsh when calling a kernel32/* +as you try running a program it will crash when calling a kernel32/* function.</quote> Mike McCormack knew of it as well and mentioned there was a @@ -611,6 +611,6 @@ Try booting with <tt>noexec=off</tt>. I month ago, but my mandrake crashed - for some obscure reasons - before reaching a prompt.</quote> -So that's where we stand. A problem with a possible workaround, but +So that's where we stand: a problem with a possible workaround, but insufficient info to have a real fix. Is it a Wine problem? Kernel? </section></kc>

1 0

lostwages/ news/2005121102.xml wwn/wn20051211_ ...
by WineHQ Dec. 12, 2005

Dec. 12, 2005

ChangeSet ID: 21767 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/11 19:08:34 Added files: news : 2005121102.xml wwn : wn20051211_301.xml Log message: WWN #301 Patch: http://cvs.winehq.org/patch.py?id=21767 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005121102.xml Added 1.1 +0 -0 lostwages/wwn/wn20051211_301.xml

1 0

lostwages/ include/winehq.conf news/2005121101.xml
by WineHQ Dec. 11, 2005

Dec. 11, 2005

ChangeSet ID: 21766 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/11 09:40:31 Modified files: include : winehq.conf Added files: news : 2005121101.xml Log message: News about Wine 0.9.3 Patch: http://cvs.winehq.org/patch.py?id=21766 Old revision New revision Changes Path 1.26 1.27 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005121101.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.26 lostwages/include/winehq.conf:1.27 --- lostwages/include/winehq.conf:1.26 11 Dec 2005 15:40:31 -0000 +++ lostwages/include/winehq.conf 11 Dec 2005 15:40:31 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.2 +snapshot_date: 0.9.3 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2005121101.xml diff -u -p /dev/null lostwages/news/2005121101.xml:1.1 --- /dev/null 11 Dec 2005 15:40:31 -0000 +++ lostwages/news/2005121101.xml 11 Dec 2005 15:40:31 -0000 @@ -0,0 +1,26 @@ +<news> + <date>December 11, 2005</date> + <title>Wine 0.9.3 Released</title> + <body> + +A new CVS snapshot is out, wine-0.9.3. Alexandre noted the following +changes: +<ul> + <li> Many marshalling fixes in rpcrt4.</li> + <li> Various OLE improvements and fixes.</li> + <li> Better audio driver management in winecfg.</li> + <li> Many wininet fixes.</li> + <li> Several Web browser improvements.</li> + <li> More dbghelp APIs implemented.</li> + <li> Directory objects in wineserver.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.3.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.107">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

H. Verbeet : d3d9: Add a test for BeginStateBlock and EndStateBlock.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: c26ad82e75e408c302c21228ef08c1af0482326c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c26ad82e75e408c302c2122… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 9 14:53:28 2005 +0100 d3d9: Add a test for BeginStateBlock and EndStateBlock. --- configure | 3 + configure.ac | 1 dlls/d3d9/Makefile.in | 2 + dlls/d3d9/tests/.gitignore | 3 + dlls/d3d9/tests/Makefile.in | 13 ++++++ dlls/d3d9/tests/stateblock.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 1 deletions(-) create mode 100644 dlls/d3d9/tests/.gitignore create mode 100644 dlls/d3d9/tests/Makefile.in create mode 100644 dlls/d3d9/tests/stateblock.c

1 0

Markus Amsler : Remove unneeded ; from DECL_WINELIB_TYPE_AW in mmsystem.h.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 60519ea7afd5e8cd75c8e5e88cc8cc1b6b78d516 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60519ea7afd5e8cd75c8e5e… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Fri Dec 9 14:52:39 2005 +0100 Remove unneeded ; from DECL_WINELIB_TYPE_AW in mmsystem.h. --- include/mmsystem.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mmsystem.h b/include/mmsystem.h index 81b34e6..2b55be0 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -2045,8 +2045,8 @@ typedef struct tagMCI_SOUND_PARMSW { LPCWSTR lpstrSoundName; } MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; -DECL_WINELIB_TYPE_AW(MCI_SOUND_PARMS); -DECL_WINELIB_TYPE_AW(LPMCI_SOUND_PARMS); +DECL_WINELIB_TYPE_AW(MCI_SOUND_PARMS) +DECL_WINELIB_TYPE_AW(LPMCI_SOUND_PARMS) typedef struct tagMCI_SAVE_PARMSA { DWORD_PTR dwCallback; @@ -2058,8 +2058,8 @@ typedef struct tagMCI_SAVE_PARMSW { LPCWSTR lpfilename; } MCI_SAVE_PARMSW, *LPMCI_SAVE_PARMSW; -DECL_WINELIB_TYPE_AW(MCI_SAVE_PARMS); -DECL_WINELIB_TYPE_AW(LPMCI_SAVE_PARMS); +DECL_WINELIB_TYPE_AW(MCI_SAVE_PARMS) +DECL_WINELIB_TYPE_AW(LPMCI_SAVE_PARMS) typedef struct tagMCI_LOAD_PARMSA { DWORD_PTR dwCallback;

1 0

Kai Blin : secur32: Fix conversion of password in NTLM AcquireCredentialsHandleA.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 3ba73f0ff6d749cc6c049b88da287c9afa1e59f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ba73f0ff6d749cc6c049b8… Author: Kai Blin <blin(a)gmx.net> Date: Fri Dec 9 14:52:20 2005 +0100 secur32: Fix conversion of password in NTLM AcquireCredentialsHandleA. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94715b5..3de699f 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -353,7 +353,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac passwd = HeapAlloc(GetProcessHeap(), 0, passwd_sizeW * sizeof(SEC_WCHAR)); MultiByteToWideChar(CP_ACP, 0, (LPCSTR)identity->Password, - identity->PasswordLength, passwd, passwd_sizeW); + identity->PasswordLength+1, passwd, passwd_sizeW); } else {

1 0

Alexandre Julliard : server: Added object attributes to a few more requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 03b040c51dbfbcc73973199452da0ca6f1c66d64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03b040c51dbfbcc73973199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 14:52:04 2005 +0100 server: Added object attributes to a few more requests. --- dlls/kernel/change.c | 8 +++++--- dlls/ntdll/reg.c | 16 +++++++++------- include/wine/server_protocol.h | 6 +++++- server/change.c | 3 +-- server/protocol.def | 4 ++++ server/registry.c | 4 ++-- server/trace.c | 4 ++++ 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index e2d6978..601c18f 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -88,9 +88,11 @@ HANDLE WINAPI FindFirstChangeNotificatio SERVER_START_REQ( create_change_notification ) { - req->handle = file; - req->subtree = bWatchSubtree; - req->filter = dwNotifyFilter; + req->access = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE; + req->attributes = 0; + req->handle = file; + req->subtree = bWatchSubtree; + req->filter = dwNotifyFilter; if (!wine_server_call_err( req )) ret = reply->handle; } SERVER_END_REQ; diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 5ade8bd..d05d9c7 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -63,11 +63,12 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE ret SERVER_START_REQ( create_key ) { - req->parent = attr->RootDirectory; - req->access = access; - req->options = options; - req->modif = 0; - req->namelen = attr->ObjectName->Length; + req->parent = attr->RootDirectory; + req->access = access; + req->attributes = attr->Attributes; + req->options = options; + req->modif = 0; + req->namelen = attr->ObjectName->Length; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); if (class) wine_server_add_data( req, class->Buffer, class->Length ); if (!(ret = wine_server_call( req ))) @@ -123,8 +124,9 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retke SERVER_START_REQ( open_key ) { - req->parent = attr->RootDirectory; - req->access = access; + req->parent = attr->RootDirectory; + req->access = access; + req->attributes = attr->Attributes; wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *retkey = reply->hkey; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f494e54..46af45f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1382,6 +1382,8 @@ struct send_console_signal_reply struct create_change_notification_request { struct request_header __header; + unsigned int access; + unsigned int attributes; obj_handle_t handle; int subtree; unsigned int filter; @@ -1689,6 +1691,7 @@ struct create_key_request struct request_header __header; obj_handle_t parent; unsigned int access; + unsigned int attributes; unsigned int options; time_t modif; size_t namelen; @@ -1708,6 +1711,7 @@ struct open_key_request struct request_header __header; obj_handle_t parent; unsigned int access; + unsigned int attributes; /* VARARG(name,unicode_str); */ }; struct open_key_reply @@ -4321,6 +4325,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 214 +#define SERVER_PROTOCOL_VERSION 215 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/change.c b/server/change.c index f85f0d3..661cb87 100644 --- a/server/change.c +++ b/server/change.c @@ -232,8 +232,7 @@ DECL_HANDLER(create_change_notification) if ((change = create_change_notification( fd, req->subtree, req->filter ))) { - reply->handle = alloc_handle( current->process, change, - STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE, 0 ); + reply->handle = alloc_handle( current->process, change, req->access, req->attributes ); release_object( change ); } release_object( fd ); diff --git a/server/protocol.def b/server/protocol.def index 3fd4ff0..3d055cb 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1031,6 +1031,8 @@ enum char_info_mode /* Create a change notification */ @REQ(create_change_notification) + unsigned int access; /* wanted access rights */ + unsigned int attributes; /* object attributes */ obj_handle_t handle; /* handle to the directory */ int subtree; /* watch all the subtree */ unsigned int filter; /* notification filter */ @@ -1237,6 +1239,7 @@ enum char_info_mode @REQ(create_key) obj_handle_t parent; /* handle to the parent key */ unsigned int access; /* desired access rights */ + unsigned int attributes; /* object attributes */ unsigned int options; /* creation options */ time_t modif; /* last modification time */ size_t namelen; /* length of key name in bytes */ @@ -1251,6 +1254,7 @@ enum char_info_mode @REQ(open_key) obj_handle_t parent; /* handle to the parent key */ unsigned int access; /* desired access rights */ + unsigned int attributes; /* object attributes */ VARARG(name,unicode_str); /* key name */ @REPLY obj_handle_t hkey; /* handle to the open key */ diff --git a/server/registry.c b/server/registry.c index 964bdef..5610984 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1731,7 +1731,7 @@ DECL_HANDLER(create_key) if ((key = create_key( parent, &name, &class, flags, req->modif, &reply->created ))) { - reply->hkey = alloc_handle( current->process, key, access, 0 ); + reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); } release_object( parent ); @@ -1753,7 +1753,7 @@ DECL_HANDLER(open_key) get_req_path( &name, !req->parent ); if ((key = open_key( parent, &name ))) { - reply->hkey = alloc_handle( current->process, key, access, 0 ); + reply->hkey = alloc_handle( current->process, key, access, req->attributes ); release_object( key ); } release_object( parent ); diff --git a/server/trace.c b/server/trace.c index e0947e2..fcc447e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1432,6 +1432,8 @@ static void dump_send_console_signal_req static void dump_create_change_notification_request( const struct create_change_notification_request *req ) { + fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " subtree=%d,", req->subtree ); fprintf( stderr, " filter=%08x", req->filter ); @@ -1655,6 +1657,7 @@ static void dump_create_key_request( con { fprintf( stderr, " parent=%p,", req->parent ); fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " options=%08x,", req->options ); fprintf( stderr, " modif=%ld,", (long)req->modif ); fprintf( stderr, " namelen=%d,", req->namelen ); @@ -1675,6 +1678,7 @@ static void dump_open_key_request( const { fprintf( stderr, " parent=%p,", req->parent ); fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Alexandre Julliard : server: Make alloc_handle use attributes instead of inherit flag.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 24560e70bb8a8519aff932d5e06d4e0519b6f1bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24560e70bb8a8519aff932d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 13:58:25 2005 +0100 server: Make alloc_handle use attributes instead of inherit flag. --- server/atom.c | 2 +- server/console.c | 13 +++++-------- server/debugger.c | 14 +++++++------- server/directory.c | 6 ++---- server/event.c | 6 ++---- server/file.c | 6 ++---- server/handle.c | 14 +++++++------- server/handle.h | 4 ++-- server/mailslot.c | 6 ++---- server/mapping.c | 6 ++---- server/mutex.c | 6 ++---- server/named_pipe.c | 6 ++---- server/process.c | 15 +++++++-------- server/semaphore.c | 6 ++---- server/snapshot.c | 2 +- server/sock.c | 6 ++---- server/symlink.c | 6 ++---- server/thread.c | 6 ++---- server/timer.c | 6 ++---- server/token.c | 7 +++---- server/winstation.c | 10 ++++------ 21 files changed, 61 insertions(+), 92 deletions(-)

1 0

Alexandre Julliard : Make wine_server_fd_to_handle use attributes instead of inherit flag.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: d02c4a1b828ec63846cf19081bbadf351a43f8ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d02c4a1b828ec63846cf190… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:22:35 2005 +0100 Make wine_server_fd_to_handle use attributes instead of inherit flag. --- dlls/kernel/console.c | 4 ++-- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/thread.c | 6 +++--- dlls/x11drv/x11drv_main.c | 2 +- include/wine/server.h | 2 +- programs/wineconsole/curses.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c index 5dac5ec..249c7c2 100644 --- a/dlls/kernel/console.c +++ b/dlls/kernel/console.c @@ -250,8 +250,8 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, ret = INVALID_HANDLE_VALUE; if (fd != -1) { - DWORD attr = (output ? GENERIC_WRITE : GENERIC_READ) | SYNCHRONIZE; - wine_server_fd_to_handle(fd, attr, inherit, &ret); + DWORD access = (output ? GENERIC_WRITE : GENERIC_READ) | SYNCHRONIZE; + wine_server_fd_to_handle(fd, access, inherit ? OBJ_INHERIT : 0, &ret); close(fd); } } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 43629a0..88c0015 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -440,13 +440,13 @@ static int receive_fd( obj_handle_t *han * PARAMS * fd [I] Unix file descriptor. * access [I] Win32 access flags. - * inherit [I] Indicates whether this handle is inherited by child processes. + * attributes [I] Object attributes. * handle [O] Address where Wine file handle will be stored. * * RETURNS * NTSTATUS code */ -int wine_server_fd_to_handle( int fd, unsigned int access, int inherit, obj_handle_t *handle ) +int wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, obj_handle_t *handle ) { int ret; @@ -456,7 +456,7 @@ int wine_server_fd_to_handle( int fd, un SERVER_START_REQ( alloc_file_handle ) { req->access = access; - req->attributes = inherit ? OBJ_INHERIT : 0; + req->attributes = attributes; req->fd = fd; if (!(ret = wine_server_call( req ))) *handle = reply->handle; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6088c97..8367751 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -181,9 +181,9 @@ void thread_init(void) /* This is wine specific: we have no parent (we're started from unix) * so, create a simple console with bare handles to unix stdio */ - wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, TRUE, &params.hStdInput ); - wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, TRUE, &params.hStdOutput ); - wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, TRUE, &params.hStdError ); + wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params.hStdInput ); + wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); + wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); } } diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index 2eee0b8..5c10690 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -533,7 +533,7 @@ struct x11drv_thread_data *x11drv_init_t WARN("Input Method is not available\n"); if (wine_server_fd_to_handle( ConnectionNumber(data->display), GENERIC_READ | SYNCHRONIZE, - FALSE, &data->display_fd )) + 0, &data->display_fd )) { MESSAGE( "x11drv: Can't allocate handle for display fd\n" ); ExitProcess(1); diff --git a/include/wine/server.h b/include/wine/server.h index aa83cac..4f7ed68 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -51,7 +51,7 @@ struct __server_request_info extern unsigned int wine_server_call( void *req_ptr ); extern void wine_server_send_fd( int fd ); -extern int wine_server_fd_to_handle( int fd, unsigned int access, int inherit, obj_handle_t *handle ); +extern int wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, obj_handle_t *handle ); extern int wine_server_handle_to_fd( obj_handle_t handle, unsigned int access, int *unix_fd, int *flags ); extern void wine_server_release_fd( obj_handle_t handle, int unix_fd ); diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 7ec3baa..8b283da 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -919,7 +919,7 @@ enum init_return WCCURSES_InitBackend(st data->fnSetFont = WCCURSES_SetFont; data->fnDeleteBackend = WCCURSES_DeleteBackend; - if (wine_server_fd_to_handle(0, GENERIC_READ|SYNCHRONIZE, FALSE, + if (wine_server_fd_to_handle(0, GENERIC_READ|SYNCHRONIZE, 0, (obj_handle_t*)&PRIVATE(data)->hInput)) { WINE_FIXME("Cannot open 0\n");

1 0

Alexandre Julliard : wineconsole: Remove some unnecessary typecasts.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 2c54b344672d5ec7ee20af2fa87d7981dbfc55ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c54b344672d5ec7ee20af2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:22:01 2005 +0100 wineconsole: Remove some unnecessary typecasts. --- programs/wineconsole/wineconsole.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1d5ad7d..83fedf5 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -45,7 +45,7 @@ void WINECON_FetchCells(struct inner_dat { SERVER_START_REQ( read_console_output ) { - req->handle = (obj_handle_t)data->hConOut; + req->handle = data->hConOut; req->x = 0; req->y = upd_tp; req->mode = CHAR_INFO_MODE_TEXTATTR; @@ -67,7 +67,7 @@ void WINECON_NotifyWindowChange(struct i { SERVER_START_REQ( set_console_output_info ) { - req->handle = (obj_handle_t)data->hConOut; + req->handle = data->hConOut; req->win_left = data->curcfg.win_pos.X; req->win_top = data->curcfg.win_pos.Y; req->win_right = data->curcfg.win_pos.X + data->curcfg.win_width - 1; @@ -89,7 +89,7 @@ int WINECON_GetHistorySize(HANDLE hConIn SERVER_START_REQ(get_console_input_info) { - req->handle = (obj_handle_t)hConIn; + req->handle = hConIn; if (!wine_server_call_err( req )) ret = reply->history_size; } SERVER_END_REQ; @@ -107,7 +107,7 @@ BOOL WINECON_SetHistorySize(HANDLE hConI SERVER_START_REQ(set_console_input_info) { - req->handle = (obj_handle_t)hConIn; + req->handle = hConIn; req->mask = SET_CONSOLE_INPUT_INFO_HISTORY_SIZE; req->history_size = size; ret = !wine_server_call_err( req ); @@ -128,7 +128,7 @@ int WINECON_GetHistoryMode(HANDLE hConIn SERVER_START_REQ(get_console_input_info) { - req->handle = (obj_handle_t)hConIn; + req->handle = hConIn; if (!wine_server_call_err( req )) ret = reply->history_mode; } SERVER_END_REQ; @@ -146,7 +146,7 @@ BOOL WINECON_SetHistoryMode(HANDLE hConI SERVER_START_REQ(set_console_input_info) { - req->handle = (obj_handle_t)hConIn; + req->handle = hConIn; req->mask = SET_CONSOLE_INPUT_INFO_HISTORY_MODE; req->history_mode = mode; ret = !wine_server_call_err( req ); @@ -168,7 +168,7 @@ BOOL WINECON_GetConsoleTitle(HANDLE hCon SERVER_START_REQ( get_console_input_info ) { - req->handle = (obj_handle_t)hConIn; + req->handle = hConIn; wine_server_set_reply( req, buffer, len - sizeof(WCHAR) ); if ((ret = !wine_server_call_err( req ))) { @@ -191,7 +191,7 @@ static BOOL WINECON_SetEditionMode(HANDL SERVER_START_REQ( set_console_input_info ) { - req->handle = (obj_handle_t)hConIn; + req->handle = hConIn; req->mask = SET_CONSOLE_INPUT_INFO_EDITION_MODE; req->edition_mode = edition_mode; ret = !wine_server_call_err( req ); @@ -214,7 +214,7 @@ int WINECON_GrabChanges(struct inner_dat SERVER_START_REQ( get_console_renderer_events ) { wine_server_set_reply( req, evts, sizeof(evts) ); - req->handle = (obj_handle_t)data->hSynchro; + req->handle = data->hSynchro; if (!wine_server_call_err( req )) num = wine_server_reply_size(reply) / sizeof(evts[0]); else num = 0; } @@ -621,7 +621,7 @@ static struct inner_data* WINECON_Init(H SERVER_START_REQ( set_console_input_info ) { - req->handle = (obj_handle_t)data->hConIn; + req->handle = data->hConIn; req->mask = SET_CONSOLE_INPUT_INFO_TITLE; wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); ret = !wine_server_call_err( req );

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in dup_handle request.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 7b910f40f266476514cbafd4c43199c8651cdb18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b910f40f266476514cbafd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:21:35 2005 +0100 server: Use attributes instead of inherit flag in dup_handle request. --- dlls/ntdll/om.c | 2 +- include/wine/server_protocol.h | 6 +++--- server/handle.c | 4 ++-- server/protocol.def | 4 ++-- server/trace.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 8a358eb..c46845a 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -306,7 +306,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDL req->src_handle = source; req->dst_process = dest_process; req->access = access; - req->inherit = (attributes & OBJ_INHERIT) != 0; + req->attributes = attributes; req->options = options; if (!(ret = wine_server_call( req ))) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 65a5be8..f494e54 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -547,8 +547,8 @@ struct dup_handle_request obj_handle_t src_handle; obj_handle_t dst_process; unsigned int access; - int inherit; - int options; + unsigned int attributes; + unsigned int options; }; struct dup_handle_reply { @@ -4321,6 +4321,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 213 +#define SERVER_PROTOCOL_VERSION 214 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/handle.c b/server/handle.c index 176249e..9ba56b6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -573,12 +573,12 @@ DECL_HANDLER(dup_handle) if (req->options & DUP_HANDLE_MAKE_GLOBAL) { reply->handle = duplicate_handle( src, req->src_handle, NULL, - req->access, req->inherit, req->options ); + req->access, req->attributes & OBJ_INHERIT, req->options ); } else if ((dst = get_process_from_handle( req->dst_process, PROCESS_DUP_HANDLE ))) { reply->handle = duplicate_handle( src, req->src_handle, dst, - req->access, req->inherit, req->options ); + req->access, req->attributes & OBJ_INHERIT, req->options ); release_object( dst ); } /* close the handle no matter what happened */ diff --git a/server/protocol.def b/server/protocol.def index 70b587a..3fd4ff0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -450,8 +450,8 @@ enum apc_type { APC_NONE, APC_USER, APC_ obj_handle_t src_handle; /* src handle to duplicate */ obj_handle_t dst_process; /* dst process handle */ unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ - int options; /* duplicate options (see below) */ + unsigned int attributes; /* object attributes */ + unsigned int options; /* duplicate options (see below) */ @REPLY obj_handle_t handle; /* duplicated handle in dst process */ int fd; /* associated fd to close */ diff --git a/server/trace.c b/server/trace.c index aff977f..e0947e2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -846,8 +846,8 @@ static void dump_dup_handle_request( con fprintf( stderr, " src_handle=%p,", req->src_handle ); fprintf( stderr, " dst_process=%p,", req->dst_process ); fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); - fprintf( stderr, " options=%d", req->options ); + fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " options=%08x", req->options ); } static void dump_dup_handle_reply( const struct dup_handle_reply *req )

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in token requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 836d07c36971305960d8af8d4c9acb4e3ae9de43 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=836d07c36971305960d8af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:17:19 2005 +0100 server: Use attributes instead of inherit flag in token requests. Also use the specified access rights in the open_token request. --- dlls/ntdll/nt.c | 20 ++++++++++++-------- include/wine/server_protocol.h | 6 ++++-- server/protocol.def | 10 ++++++---- server/token.c | 9 ++++++--- server/trace.c | 4 +++- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a60820d..3fe44cb 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -63,10 +63,10 @@ NTSTATUS WINAPI NtDuplicateToken( SERVER_START_REQ( duplicate_token ) { - req->handle = ExistingToken; - req->access = DesiredAccess; - req->inherit = ObjectAttributes && (ObjectAttributes->Attributes & OBJ_INHERIT); - req->primary = (TokenType == TokenPrimary); + req->handle = ExistingToken; + req->access = DesiredAccess; + req->attributes = ObjectAttributes ? ObjectAttributes->Attributes : 0; + req->primary = (TokenType == TokenPrimary); req->impersonation_level = ImpersonationLevel; status = wine_server_call( req ); if (!status) *NewToken = reply->new_handle; @@ -91,8 +91,10 @@ NTSTATUS WINAPI NtOpenProcessToken( SERVER_START_REQ( open_token ) { - req->handle = ProcessHandle; - req->flags = 0; + req->handle = ProcessHandle; + req->access = DesiredAccess; + req->attributes = 0; + req->flags = 0; ret = wine_server_call( req ); if (!ret) *TokenHandle = reply->token; } @@ -118,8 +120,10 @@ NTSTATUS WINAPI NtOpenThreadToken( SERVER_START_REQ( open_token ) { - req->handle = ThreadHandle; - req->flags = OPEN_TOKEN_THREAD; + req->handle = ThreadHandle; + req->access = DesiredAccess; + req->attributes = 0; + req->flags = OPEN_TOKEN_THREAD; if (OpenAsSelf) req->flags |= OPEN_TOKEN_AS_SELF; ret = wine_server_call( req ); if (!ret) *TokenHandle = reply->token; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f38868f..65a5be8 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3416,6 +3416,8 @@ struct open_token_request { struct request_header __header; obj_handle_t handle; + unsigned int access; + unsigned int attributes; unsigned int flags; }; struct open_token_reply @@ -3498,7 +3500,7 @@ struct duplicate_token_request struct request_header __header; obj_handle_t handle; unsigned int access; - int inherit; + unsigned int attributes; int primary; int impersonation_level; }; @@ -4319,6 +4321,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 212 +#define SERVER_PROTOCOL_VERSION 213 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index df5a975..70b587a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2399,6 +2399,8 @@ enum message_type /* Open a security token */ @REQ(open_token) obj_handle_t handle; /* handle to the thread or process */ + unsigned int access; /* access rights to the new token */ + unsigned int attributes;/* object attributes */ unsigned int flags; /* flags (see below) */ @REPLY obj_handle_t token; /* handle to the token */ @@ -2454,10 +2456,10 @@ enum message_type @END @REQ(duplicate_token) - obj_handle_t handle; /* handle to the token to duplicate */ - unsigned int access; /* access rights to the new token */ - int inherit; /* inherit flag */ - int primary; /* is the new token to be a primary one? */ + obj_handle_t handle; /* handle to the token to duplicate */ + unsigned int access; /* access rights to the new token */ + unsigned int attributes; /* object attributes */ + int primary; /* is the new token to be a primary one? */ int impersonation_level; /* impersonation level of the new token */ @REPLY obj_handle_t new_handle; /* duplicated handle */ diff --git a/server/token.c b/server/token.c index a31d656..d10b9a1 100644 --- a/server/token.c +++ b/server/token.c @@ -883,7 +883,8 @@ DECL_HANDLER(open_token) if (thread) { if (thread->token) - reply->token = alloc_handle( current->process, thread->token, TOKEN_ALL_ACCESS, 0); + reply->token = alloc_handle( current->process, thread->token, req->access, + req->attributes & OBJ_INHERIT ); else set_error(STATUS_NO_TOKEN); release_object( thread ); @@ -895,7 +896,8 @@ DECL_HANDLER(open_token) if (process) { if (process->token) - reply->token = alloc_handle( current->process, process->token, TOKEN_ALL_ACCESS, 0); + reply->token = alloc_handle( current->process, process->token, req->access, + req->attributes & OBJ_INHERIT ); else set_error(STATUS_NO_TOKEN); release_object( process ); @@ -1015,7 +1017,8 @@ DECL_HANDLER(duplicate_token) access = req->access; if (access & MAXIMUM_ALLOWED) access = TOKEN_ALL_ACCESS; /* FIXME: needs general solution */ - reply->new_handle = alloc_handle( current->process, token, access, req->inherit); + reply->new_handle = alloc_handle( current->process, token, access, + req->attributes & OBJ_INHERIT); release_object( token ); } release_object( src_token ); diff --git a/server/trace.c b/server/trace.c index 153f5a9..aff977f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2949,6 +2949,8 @@ static void dump_set_clipboard_info_repl static void dump_open_token_request( const struct open_token_request *req ) { fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " flags=%08x", req->flags ); } @@ -3021,7 +3023,7 @@ static void dump_duplicate_token_request { fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " primary=%d,", req->primary ); fprintf( stderr, " impersonation_level=%d", req->impersonation_level ); }

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in process and thread requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: f2d7dd645e771fdb6052d789a5b1651ce8740566 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2d7dd645e771fdb6052d78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:13:11 2005 +0100 server: Use attributes instead of inherit flag in process and thread requests. --- dlls/kernel/process.c | 8 +++++--- dlls/ntdll/process.c | 6 +++--- dlls/ntdll/thread.c | 9 +++++---- include/wine/server_protocol.h | 15 +++++++++------ server/process.c | 7 ++++--- server/protocol.def | 15 +++++++++------ server/thread.c | 5 +++-- server/trace.c | 13 ++++++++----- 8 files changed, 46 insertions(+), 32 deletions(-)

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in console requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 7a096601e3f94e932a33e10f3fe40a6a40c1ddee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a096601e3f94e932a33e10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:05:20 2005 +0100 server: Use attributes instead of inherit flag in console requests. --- dlls/kernel/console.c | 16 ++++++++-------- include/wine/server_protocol.h | 12 ++++++------ programs/wineconsole/wineconsole.c | 18 +++++++++--------- server/console.c | 6 +++--- server/protocol.def | 10 +++++----- server/trace.c | 10 +++++----- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c index 9e62bcb..5dac5ec 100644 --- a/dlls/kernel/console.c +++ b/dlls/kernel/console.c @@ -230,10 +230,10 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, SERVER_START_REQ( open_console ) { - req->from = output; - req->access = access; - req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; - req->inherit = inherit; + req->from = output; + req->access = access; + req->attributes = inherit ? OBJ_INHERIT : 0; + req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; SetLastError(0); wine_server_call_err( req ); ret = reply->handle; @@ -1665,10 +1665,10 @@ HANDLE WINAPI CreateConsoleScreenBuffer( SERVER_START_REQ(create_console_output) { - req->handle_in = 0; - req->access = dwDesiredAccess; - req->share = dwShareMode; - req->inherit = (sa && sa->bInheritHandle); + req->handle_in = 0; + req->access = dwDesiredAccess; + req->attributes = (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0; + req->share = dwShareMode; if (!wine_server_call_err( req )) ret = reply->handle_out; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4677cfb..785db2f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -977,7 +977,7 @@ struct alloc_console_request { struct request_header __header; unsigned int access; - int inherit; + unsigned int attributes; process_id_t pid; }; struct alloc_console_reply @@ -1063,7 +1063,7 @@ struct open_console_request int from; unsigned int access; - int inherit; + unsigned int attributes; int share; }; struct open_console_reply @@ -1183,9 +1183,9 @@ struct create_console_output_request { struct request_header __header; obj_handle_t handle_in; - int access; - int share; - int inherit; + unsigned int access; + unsigned int attributes; + unsigned int share; }; struct create_console_output_reply { @@ -4316,6 +4316,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 209 +#define SERVER_PROTOCOL_VERSION 210 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d73dc96..1d5ad7d 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -274,10 +274,10 @@ int WINECON_GrabChanges(struct inner_dat case CONSOLE_RENDERER_ACTIVE_SB_EVENT: SERVER_START_REQ( open_console ) { - req->from = (int)data->hConIn; - req->access = GENERIC_READ | GENERIC_WRITE; - req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; - req->inherit = FALSE; + req->from = (int)data->hConIn; + req->access = GENERIC_READ | GENERIC_WRITE; + req->attributes = 0; + req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; h = wine_server_call_err( req ) ? 0 : (HANDLE)reply->handle; } SERVER_END_REQ; @@ -608,7 +608,7 @@ static struct inner_data* WINECON_Init(H SERVER_START_REQ(alloc_console) { req->access = GENERIC_READ | GENERIC_WRITE; - req->inherit = FALSE; + req->attributes = 0; req->pid = pid; ret = !wine_server_call_err( req ); @@ -631,10 +631,10 @@ static struct inner_data* WINECON_Init(H SERVER_START_REQ(create_console_output) { - req->handle_in = (obj_handle_t)data->hConIn; - req->access = GENERIC_WRITE|GENERIC_READ; - req->share = FILE_SHARE_READ|FILE_SHARE_WRITE; - req->inherit = FALSE; + req->handle_in = data->hConIn; + req->access = GENERIC_WRITE|GENERIC_READ; + req->attributes = 0; + req->share = FILE_SHARE_READ|FILE_SHARE_WRITE; ret = !wine_server_call_err( req ); data->hConOut = (HANDLE)reply->handle_out; } diff --git a/server/console.c b/server/console.c index e567d60..e096079 100644 --- a/server/console.c +++ b/server/console.c @@ -1240,7 +1240,7 @@ DECL_HANDLER(alloc_console) } if ((console = (struct console_input*)create_console_input( current ))) { - if ((in = alloc_handle( renderer, console, req->access, req->inherit ))) + if ((in = alloc_handle( renderer, console, req->access, req->attributes & OBJ_INHERIT ))) { if ((evt = alloc_handle( renderer, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, FALSE ))) @@ -1312,7 +1312,7 @@ DECL_HANDLER(open_console) /* FIXME: req->share is not used (as in screen buffer creation) */ if (obj) { - reply->handle = alloc_handle( current->process, obj, req->access, req->inherit ); + reply->handle = alloc_handle( current->process, obj, req->access, req->attributes & OBJ_INHERIT ); release_object( obj ); } else if (!get_error()) set_error( STATUS_ACCESS_DENIED ); @@ -1411,7 +1411,7 @@ DECL_HANDLER(create_console_output) /* FIXME: should store sharing and test it when opening the CONOUT$ device * see file.c on how this could be done */ reply->handle_out = alloc_handle( current->process, screen_buffer, - req->access, req->inherit ); + req->access, req->attributes & OBJ_INHERIT ); release_object( screen_buffer ); } release_object( console ); diff --git a/server/protocol.def b/server/protocol.def index 98bcb90..2dfd020 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -738,7 +738,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, /* Allocate a console (only used by a console renderer) */ @REQ(alloc_console) unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ process_id_t pid; /* pid of process which shall be attached to the console */ @REPLY obj_handle_t handle_in; /* handle to console input */ @@ -808,7 +808,7 @@ struct console_renderer_event int from; /* 0 (resp 1) input (resp output) of current process console */ /* otherwise console_in handle to get active screen buffer? */ unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ int share; /* share mask (only for output handles) */ @REPLY obj_handle_t handle; /* handle to the console */ @@ -885,9 +885,9 @@ struct console_renderer_event /* creates a new screen buffer on process' console */ @REQ(create_console_output) obj_handle_t handle_in; /* handle to console input, or 0 for process' console */ - int access; /* wanted access rights */ - int share; /* sharing credentials */ - int inherit; /* inherit flag */ + unsigned int access; /* wanted access rights */ + unsigned int attributes; /* object attributes */ + unsigned int share; /* sharing credentials */ @REPLY obj_handle_t handle_out; /* handle to the screen buffer */ @END diff --git a/server/trace.c b/server/trace.c index 6ede1c2..d79adb6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1169,7 +1169,7 @@ static void dump_set_socket_deferred_req static void dump_alloc_console_request( const struct alloc_console_request *req ) { fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " pid=%04x", req->pid ); } @@ -1198,7 +1198,7 @@ static void dump_open_console_request( c { fprintf( stderr, " from=%d,", req->from ); fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " share=%d", req->share ); } @@ -1282,9 +1282,9 @@ static void dump_get_console_input_histo static void dump_create_console_output_request( const struct create_console_output_request *req ) { fprintf( stderr, " handle_in=%p,", req->handle_in ); - fprintf( stderr, " access=%d,", req->access ); - fprintf( stderr, " share=%d,", req->share ); - fprintf( stderr, " inherit=%d", req->inherit ); + fprintf( stderr, " access=%08x,", req->access ); + fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " share=%08x", req->share ); } static void dump_create_console_output_reply( const struct create_console_output_reply *req )

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in snapshot requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: f11d0a375f0118a2cc1a528fe0471d0933b9206d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f11d0a375f0118a2cc1a528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:09:44 2005 +0100 server: Use attributes instead of inherit flag in snapshot requests. --- dlls/kernel/toolhelp.c | 5 ++--- dlls/ntdll/nt.c | 6 +++--- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/snapshot.c | 2 +- server/trace.c | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c index cfbe0e3..2aef731 100644 --- a/dlls/kernel/toolhelp.c +++ b/dlls/kernel/toolhelp.c @@ -61,9 +61,8 @@ HANDLE WINAPI CreateToolhelp32Snapshot( if (flags & TH32CS_SNAPMODULE) req->flags |= SNAP_MODULE; if (flags & TH32CS_SNAPPROCESS) req->flags |= SNAP_PROCESS; if (flags & TH32CS_SNAPTHREAD) req->flags |= SNAP_THREAD; - - req->inherit = (flags & TH32CS_INHERIT) != 0; - req->pid = process; + req->attributes = (flags & TH32CS_INHERIT) ? OBJ_INHERIT : 0; + req->pid = process; wine_server_call_err( req ); ret = reply->handle; } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 4c90f49..a60820d 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -657,9 +657,9 @@ NTSTATUS WINAPI NtQuerySystemInformation SERVER_START_REQ( create_snapshot ) { - req->flags = SNAP_PROCESS | SNAP_THREAD; - req->inherit = FALSE; - req->pid = 0; + req->flags = SNAP_PROCESS | SNAP_THREAD; + req->attributes = 0; + req->pid = 0; if (!(ret = wine_server_call( req ))) hSnap = reply->handle; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 785db2f..4746729 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1473,7 +1473,7 @@ struct get_mapping_info_reply struct create_snapshot_request { struct request_header __header; - int inherit; + unsigned int attributes; int flags; process_id_t pid; }; @@ -4316,6 +4316,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 210 +#define SERVER_PROTOCOL_VERSION 211 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 2dfd020..0792f22 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1096,7 +1096,7 @@ enum char_info_mode #define SNAP_MODULE 0x00000008 /* Create a snapshot */ @REQ(create_snapshot) - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ int flags; /* snapshot flags (SNAP_*) */ process_id_t pid; /* process id */ @REPLY diff --git a/server/snapshot.c b/server/snapshot.c index 7695f0d..4159962 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -236,7 +236,7 @@ DECL_HANDLER(create_snapshot) reply->handle = 0; if ((snapshot = create_snapshot( req->pid, req->flags ))) { - reply->handle = alloc_handle( current->process, snapshot, 0, req->inherit ); + reply->handle = alloc_handle( current->process, snapshot, 0, req->attributes & OBJ_INHERIT ); release_object( snapshot ); } } diff --git a/server/trace.c b/server/trace.c index d79adb6..5cdcfef 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1494,7 +1494,7 @@ static void dump_get_mapping_info_reply( static void dump_create_snapshot_request( const struct create_snapshot_request *req ) { - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " flags=%d,", req->flags ); fprintf( stderr, " pid=%04x", req->pid ); }

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in file requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 27b1aec925e445488b99b686573835a2263787cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27b1aec925e445488b99b68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 12:00:48 2005 +0100 server: Use attributes instead of inherit flag in file requests. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/server.c | 6 +++--- include/wine/server_protocol.h | 6 +++--- server/file.c | 6 ++++-- server/protocol.def | 4 ++-- server/trace.c | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 660ba1b..2e70296 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -214,7 +214,7 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha SERVER_START_REQ( create_file ) { req->access = access; - req->inherit = (attr->Attributes & OBJ_INHERIT) != 0; + req->attributes = attr->Attributes; req->sharing = sharing; req->create = disposition; req->options = options; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 7bd015c..43629a0 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -455,9 +455,9 @@ int wine_server_fd_to_handle( int fd, un SERVER_START_REQ( alloc_file_handle ) { - req->access = access; - req->inherit = inherit; - req->fd = fd; + req->access = access; + req->attributes = inherit ? OBJ_INHERIT : 0; + req->fd = fd; if (!(ret = wine_server_call( req ))) *handle = reply->handle; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 359affa..4677cfb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -754,7 +754,7 @@ struct create_file_request { struct request_header __header; unsigned int access; - int inherit; + unsigned int attributes; unsigned int sharing; int create; unsigned int options; @@ -773,7 +773,7 @@ struct alloc_file_handle_request { struct request_header __header; unsigned int access; - int inherit; + unsigned int attributes; int fd; }; struct alloc_file_handle_reply @@ -4316,6 +4316,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 208 +#define SERVER_PROTOCOL_VERSION 209 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/file.c b/server/file.c index 4d13ca7..1b34c7a 100644 --- a/server/file.c +++ b/server/file.c @@ -356,7 +356,8 @@ DECL_HANDLER(create_file) if ((file = create_file( get_req_data(), get_req_data_size(), req->access, req->sharing, req->create, req->options, req->attrs ))) { - reply->handle = alloc_handle( current->process, file, req->access, req->inherit ); + reply->handle = alloc_handle( current->process, file, req->access, + req->attributes & OBJ_INHERIT ); release_object( file ); } } @@ -375,7 +376,8 @@ DECL_HANDLER(alloc_file_handle) } if ((file = create_file_for_fd( fd, req->access, FILE_SHARE_READ | FILE_SHARE_WRITE ))) { - reply->handle = alloc_handle( current->process, file, req->access, req->inherit ); + reply->handle = alloc_handle( current->process, file, req->access, + req->attributes & OBJ_INHERIT ); release_object( file ); } } diff --git a/server/protocol.def b/server/protocol.def index bbb842e..98bcb90 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -590,7 +590,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, /* Create a file */ @REQ(create_file) unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ unsigned int sharing; /* sharing flags */ int create; /* file create action */ unsigned int options; /* file options */ @@ -604,7 +604,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, /* Allocate a file handle for a Unix fd */ @REQ(alloc_file_handle) unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ int fd; /* file descriptor on the client side */ @REPLY obj_handle_t handle; /* handle to the file */ diff --git a/server/trace.c b/server/trace.c index eeb4e76..6ede1c2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1008,7 +1008,7 @@ static void dump_open_semaphore_reply( c static void dump_create_file_request( const struct create_file_request *req ) { fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " sharing=%08x,", req->sharing ); fprintf( stderr, " create=%d,", req->create ); fprintf( stderr, " options=%08x,", req->options ); @@ -1025,7 +1025,7 @@ static void dump_create_file_reply( cons static void dump_alloc_file_handle_request( const struct alloc_file_handle_request *req ) { fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " fd=%d", req->fd ); }

1 0

Alexandre Julliard : server: Use attributes instead of inherit flag in socket requests.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: bc30303c5668877f7dcb927ddf8777da9e3b5316 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc30303c5668877f7dcb927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 11:58:55 2005 +0100 server: Use attributes instead of inherit flag in socket requests. --- dlls/winsock/socket.c | 18 +++++++++--------- include/wine/server_protocol.h | 6 +++--- server/protocol.def | 4 ++-- server/sock.c | 6 ++++-- server/trace.c | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index e83e747..e67363b 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -1592,9 +1592,9 @@ SOCKET WINAPI WS_accept(SOCKET s, struct } SERVER_START_REQ( accept_socket ) { - req->lhandle = SOCKET2HANDLE(s); - req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->inherit = TRUE; + req->lhandle = SOCKET2HANDLE(s); + req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; + req->attributes = OBJ_INHERIT; set_error( wine_server_call( req ) ); as = HANDLE2SOCKET( reply->handle ); } @@ -3513,12 +3513,12 @@ SOCKET WINAPI WSASocketW(int af, int typ SERVER_START_REQ( create_socket ) { - req->family = af; - req->type = type; - req->protocol = protocol; - req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->flags = dwFlags; - req->inherit = TRUE; + req->family = af; + req->type = type; + req->protocol = protocol; + req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; + req->attributes = OBJ_INHERIT; + req->flags = dwFlags; set_error( wine_server_call( req ) ); ret = HANDLE2SOCKET( reply->handle ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b81cc6c..359affa 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -885,7 +885,7 @@ struct create_socket_request { struct request_header __header; unsigned int access; - int inherit; + unsigned int attributes; int family; int type; int protocol; @@ -904,7 +904,7 @@ struct accept_socket_request struct request_header __header; obj_handle_t lhandle; unsigned int access; - int inherit; + unsigned int attributes; }; struct accept_socket_reply { @@ -4316,6 +4316,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 207 +#define SERVER_PROTOCOL_VERSION 208 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index dc302b0..bbb842e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -679,7 +679,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, /* Create a socket */ @REQ(create_socket) unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ int family; /* family, see socket manpage */ int type; /* type, see socket manpage */ int protocol; /* protocol, see socket manpage */ @@ -693,7 +693,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(accept_socket) obj_handle_t lhandle; /* handle to the listening socket */ unsigned int access; /* wanted access rights */ - int inherit; /* inherit flag */ + unsigned int attributes; /* object attributes */ @REPLY obj_handle_t handle; /* handle to the new socket */ @END diff --git a/server/sock.c b/server/sock.c index 62f39e5..6e2acbb 100644 --- a/server/sock.c +++ b/server/sock.c @@ -773,7 +773,8 @@ DECL_HANDLER(create_socket) reply->handle = 0; if ((obj = create_socket( req->family, req->type, req->protocol, req->flags )) != NULL) { - reply->handle = alloc_handle( current->process, obj, req->access, req->inherit ); + reply->handle = alloc_handle( current->process, obj, req->access, + req->attributes & OBJ_INHERIT ); release_object( obj ); } } @@ -786,7 +787,8 @@ DECL_HANDLER(accept_socket) reply->handle = 0; if ((sock = accept_socket( req->lhandle )) != NULL) { - reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->inherit ); + reply->handle = alloc_handle( current->process, &sock->obj, req->access, + req->attributes & OBJ_INHERIT ); sock->wparam = reply->handle; /* wparam for message is the socket handle */ sock_reselect( sock ); release_object( &sock->obj ); diff --git a/server/trace.c b/server/trace.c index 5319912..eeb4e76 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1103,7 +1103,7 @@ static void dump_unmount_device_request( static void dump_create_socket_request( const struct create_socket_request *req ) { fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d,", req->inherit ); + fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " family=%d,", req->family ); fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " protocol=%d,", req->protocol ); @@ -1119,7 +1119,7 @@ static void dump_accept_socket_request( { fprintf( stderr, " lhandle=%p,", req->lhandle ); fprintf( stderr, " access=%08x,", req->access ); - fprintf( stderr, " inherit=%d", req->inherit ); + fprintf( stderr, " attributes=%08x", req->attributes ); } static void dump_accept_socket_reply( const struct accept_socket_reply *req )

1 0

Vincent Béron : Add some missing includes which contain used prototypes.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 834385cad48e6026e1ea9518e1ffcf2108b00b5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=834385cad48e6026e1ea951… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:51:17 2005 +0100 Add some missing includes which contain used prototypes. --- dlls/mpr/mpr_main.c | 1 + dlls/shlwapi/regstream.c | 1 + dlls/user/mouse16.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c index 49c4925..b944649 100644 --- a/dlls/mpr/mpr_main.c +++ b/dlls/mpr/mpr_main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "winnetwk.h" #include "wine/debug.h" #include "wnetpriv.h" diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 50b6c45..b0f7117 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h" diff --git a/dlls/user/mouse16.c b/dlls/user/mouse16.c index 3e5b180..510f2b6 100644 --- a/dlls/user/mouse16.c +++ b/dlls/user/mouse16.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "wine/winbase16.h" +#include "wine/winuser16.h" #include "pshpack1.h" typedef struct _MOUSEINFO

1 0

Jacek Caban : mshtml: Added PromptService implementation.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 3fab5312d8e57901509f1568ba15622a979cb660 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3fab5312d8e57901509f156… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:51:02 2005 +0100 mshtml: Added PromptService implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/mshtml_private.h | 2 dlls/mshtml/nsembed.c | 11 ++ dlls/mshtml/nsiface.idl | 66 ++++++++++ dlls/mshtml/nsservice.c | 276 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 356 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/nsservice.c

1 0

Jacek Caban : mshtml: Added nsIURIContentListener to QueryInterface.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: db452fdf7ce8201b5970d9337ca3f45576511e3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db452fdf7ce8201b5970d93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:41:33 2005 +0100 mshtml: Added nsIURIContentListener to QueryInterface. Always release nsIWebBrowserSetup. --- dlls/mshtml/nsembed.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 3e7a04f..ffdfbb6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -395,6 +395,9 @@ static nsresult NSAPI nsWebBrowserChrome }else if(IsEqualGUID(&IID_nsIContextMenuListener, riid)) { TRACE("(%p)->(IID_nsIContextMenuListener, %p)\n", This, result); *result = NSCML(This); + }else if(IsEqualGUID(&IID_nsIURIContentListener, riid)) { + TRACE("(%p)->(IID_nsIURIContentListener %p)\n", This, result); + *result = NSURICL(This); }else if(IsEqualGUID(&IID_nsIEmbeddingSiteWindow, riid)) { TRACE("(%p)->(IIS_nsIEmbeddingSiteWindow %p)\n", This, result); *result = NSEMBWNDS(This); @@ -895,9 +898,9 @@ void HTMLDocument_NSContainer_Init(HTMLD &IID_nsIWebBrowserSetup, (void**)&wbsetup); if(NS_SUCCEEDED(nsres)) { nsres = nsIWebBrowserSetup_SetProperty(wbsetup, SETUP_IS_CHROME_WRAPPER, TRUE); - if(NS_FAILED(nsres)) - ERR("SetProperty failed: %08lx\n", nsres); nsIWebBrowserSetup_Release(wbsetup); + if(NS_FAILED(nsres)) + ERR("SetProperty(SETUP_IS_CHROME_WRAPPER) failed: %08lx\n", nsres); }else { ERR("Could not get nsIWebBrowserSetup interface\n"); }

1 0

Jacek Caban : mshtml: Added nsIEmbeddingSiteWindow implementation.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 37b1a456d706b32be02117d40f6dd4edc8cb3bb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37b1a456d706b32be02117d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:23:58 2005 +0100 mshtml: Added nsIEmbeddingSiteWindow implementation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/nsembed.c | 109 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 16 ++++++ 3 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d3b42e6..457d5cf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -80,6 +80,7 @@ struct NSContainer { const nsIWebBrowserChromeVtbl *lpWebBrowserChromeVtbl; const nsIContextMenuListenerVtbl *lpContextMenuListenerVtbl; const nsIURIContentListenerVtbl *lpURIContentListenerVtbl; + const nsIEmbeddingSiteWindowVtbl *lpEmbeddingSiteWindowVtbl; nsIWebBrowser *webbrowser; nsIWebNavigation *navigation; @@ -117,6 +118,7 @@ struct NSContainer { #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) #define NSURICL(x) ((nsIURIContentListener*) &(x)->lpURIContentListenerVtbl) +#define NSEMBWNDS(x) ((nsIEmbeddingSiteWindow*) &(x)->lpEmbeddingSiteWindowVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6380c48..3e7a04f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -395,6 +395,9 @@ static nsresult NSAPI nsWebBrowserChrome }else if(IsEqualGUID(&IID_nsIContextMenuListener, riid)) { TRACE("(%p)->(IID_nsIContextMenuListener, %p)\n", This, result); *result = NSCML(This); + }else if(IsEqualGUID(&IID_nsIEmbeddingSiteWindow, riid)) { + TRACE("(%p)->(IIS_nsIEmbeddingSiteWindow %p)\n", This, result); + *result = NSEMBWNDS(This); } if(*result) @@ -749,6 +752,111 @@ static const nsIURIContentListenerVtbl n nsURIContentListener_SetParentContentListener }; +/********************************************************** + * nsIEmbeddinSiteWindow interface + */ + +#define NSEMBWNDS_THIS(iface) DEFINE_THIS(NSContainer, EmbeddingSiteWindow, iface) + +static nsresult NSAPI nsEmbeddingSiteWindow_QueryInterface(nsIEmbeddingSiteWindow *iface, + nsIIDRef riid, nsQIResult result) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + return nsIWebBrowserChrome_QueryInterface(NSWBCHROME(This), riid, result); +} + +static nsrefcnt NSAPI nsEmbeddingSiteWindow_AddRef(nsIEmbeddingSiteWindow *iface) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + return nsIWebBrowserChrome_AddRef(NSWBCHROME(This)); +} + +static nsrefcnt NSAPI nsEmbeddingSiteWindow_Release(nsIEmbeddingSiteWindow *iface) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + return nsIWebBrowserChrome_Release(NSWBCHROME(This)); +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetDimensions(nsIEmbeddingSiteWindow *iface, + PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%08lx %ld %ld %ld %ld)\n", This, flags, x, y, cx, cy); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow *iface, + PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%08lx %p %p %p %p)\n", This, flags, x, y, cx, cy); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *iface) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)\n", This); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetVisibility(nsIEmbeddingSiteWindow *iface, + PRBool *aVisibility) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%p)\n", This, aVisibility); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetVisibility(nsIEmbeddingSiteWindow *iface, + PRBool aVisibility) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%x)\n", This, aVisibility); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetTitle(nsIEmbeddingSiteWindow *iface, + PRUnichar **aTitle) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%p)\n", This, aTitle); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_SetTitle(nsIEmbeddingSiteWindow *iface, + const PRUnichar *aTitle) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + WARN("(%p)->(%s)\n", This, debugstr_w(aTitle)); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsEmbeddingSiteWindow_GetSiteWindow(nsIEmbeddingSiteWindow *iface, + void **aSiteWindow) +{ + NSContainer *This = NSEMBWNDS_THIS(iface); + + TRACE("(%p)->(%p)\n", This, aSiteWindow); + + *aSiteWindow = This->hwnd; + return NS_OK; +} + +static const nsIEmbeddingSiteWindowVtbl nsEmbeddingSiteWindowVtbl = { + nsEmbeddingSiteWindow_QueryInterface, + nsEmbeddingSiteWindow_AddRef, + nsEmbeddingSiteWindow_Release, + nsEmbeddingSiteWindow_SetDimensions, + nsEmbeddingSiteWindow_GetDimensions, + nsEmbeddingSiteWindow_SetFocus, + nsEmbeddingSiteWindow_GetVisibility, + nsEmbeddingSiteWindow_SetVisibility, + nsEmbeddingSiteWindow_GetTitle, + nsEmbeddingSiteWindow_SetTitle, + nsEmbeddingSiteWindow_GetSiteWindow +}; + void HTMLDocument_NSContainer_Init(HTMLDocument *This) { nsIWebBrowserSetup *wbsetup; @@ -764,6 +872,7 @@ void HTMLDocument_NSContainer_Init(HTMLD This->nscontainer->lpWebBrowserChromeVtbl = &nsWebBrowserChromeVtbl; This->nscontainer->lpContextMenuListenerVtbl = &nsContextMenuListenerVtbl; This->nscontainer->lpURIContentListenerVtbl = &nsURIContentListenerVtbl; + This->nscontainer->lpEmbeddingSiteWindowVtbl = &nsEmbeddingSiteWindowVtbl; This->nscontainer->doc = This; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1517ae6..dfdf4ee 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -433,3 +433,19 @@ interface nsIDOMMouseEvent : nsIDOMUIEve PRBool shiftKeyArg, PRBool metaKeyArg, PRUint16 buttonArg, nsIDOMEventTarget *relatedTargetArg); } + +[ + object, + uuid(3e5432cd-9568-4bd1-8cbe-d50aba110743) +] +interface nsIEmbeddingSiteWindow : nsISupports +{ + nsresult SetDimensions(PRUint32 flags, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy); + nsresult GetDimensions(PRUint32 flags, PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy); + nsresult SetFocus(); + nsresult GetVisibility(PRBool *aVisibility); + nsresult SetVisibility(PRBool aVisibility); + nsresult GetTitle(PRUnichar **aTitle); + nsresult SetTitle(const PRUnichar *aTitle); + nsresult GetSiteWindow(void **aSiteWindow); +}

1 0

Oliver Stieber : wined3d: Vertex shader 8 support.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 7c482cb9a1a3d7b694700dd00095f2434ed682d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c482cb9a1a3d7b694700dd… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Fri Dec 9 11:23:52 2005 +0100 wined3d: Vertex shader 8 support. Start to add support for DirectX 8 vertex shaders, constants and registers are now correctly assigned and loaded allowing support for most basic d3d8 shaders. --- dlls/d3d9/vertexshader.c | 2 - dlls/wined3d/device.c | 35 ++++++++++++- dlls/wined3d/drawprim.c | 80 +++++++++++++++++++++++++---- dlls/wined3d/vertexdeclaration.c | 106 +++++++++++++++++++++----------------- dlls/wined3d/vertexshader.c | 1 dlls/wined3d/wined3d_private.h | 11 +++- include/wine/wined3d_interface.h | 4 + include/wine/wined3d_types.h | 1 8 files changed, 175 insertions(+), 65 deletions(-)

1 0

Thomas Weidenmueller : urlmon: Fix call to ReadFile.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 38bfd5e6351801fb20ed41dd3e9a01f7b6b36909 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38bfd5e6351801fb20ed41d… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Fri Dec 9 11:22:59 2005 +0100 urlmon: Fix call to ReadFile. The BytesRead parameter passed to ReadFile may never be NULL. --- dlls/urlmon/umstream.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index f907317..720c8ba 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -225,6 +225,7 @@ static HRESULT WINAPI IStream_fnRead (IS ULONG cb, ULONG* pcbRead) { + DWORD dwBytesRead; IUMCacheStream *This = (IUMCacheStream *)iface; TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); @@ -232,7 +233,7 @@ static HRESULT WINAPI IStream_fnRead (IS if ( !pv ) return STG_E_INVALIDPOINTER; - if ( ! ReadFile( This->handle, pv, cb, pcbRead, NULL ) ) + if ( ! ReadFile( This->handle, pv, cb, (pcbRead ? pcbRead : &dwBytesRead), NULL ) ) return S_FALSE; if (!*pcbRead)

1 0

Vincent Béron : Update win16.api and win32.api.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 648cc6f435d3ffee30d224a927ff17eb3d57b874 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=648cc6f435d3ffee30d224a… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:22:32 2005 +0100 Update win16.api and win32.api. --- tools/winapi/win16.api | 5 ++++- tools/winapi/win32.api | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api index c11b5b0..20bea75 100644 --- a/tools/winapi/win16.api +++ b/tools/winapi/win16.api @@ -1491,7 +1491,6 @@ u_long INT16 * LPWSADATA16 ULONG * -struct WS_in_addr struct WS_sockaddr * struct WS_timeval * ws_fd_set16 * @@ -1506,6 +1505,10 @@ SEGPTR LPCSTR char * +%unknown + +struct WS_in_addr + %void void diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 80020b9..2eb5979 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1168,7 +1168,7 @@ GCP_RESULTSA * GCP_RESULTSW * GOBJENUMPROC HANDLETABLE * -ICMENUMPROCA +ICMENUMPROCA ICMENUMPROCW INT * LINEDDAPROC @@ -3062,6 +3062,10 @@ signed char unsigned int unsigned long +%long --pointer + +ULONG_PTR + %longlong CY

1 0

Vincent Béron : sfnt2fnt: Don't print two newlines after error messages.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: af5a54dea52b717245076ace3e3346a69339d893 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af5a54dea52b717245076ac… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:22:21 2005 +0100 sfnt2fnt: Don't print two newlines after error messages. --- tools/sfnt2fnt.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 4d894e6..6b9f341 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -73,7 +73,6 @@ static void error(const char *s, ...) va_start(ap, s); fprintf(stderr, "Error: "); vfprintf(stderr, s, ap); - fprintf(stderr, "\n"); va_end(ap); exit(1); }

1 0

Thomas Weidenmueller : quartz: Fix incorrect usages of the HRESULT_FROM_WIN32 macro.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 2b4377f5eb0a8b11484e4f053f9dbcf765c5a32d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b4377f5eb0a8b11484e4f0… Author: Thomas Weidenmueller <w3seek(a)reactos.com> Date: Fri Dec 9 11:21:51 2005 +0100 quartz: Fix incorrect usages of the HRESULT_FROM_WIN32 macro. --- dlls/quartz/filesource.c | 4 ++ dlls/quartz/filtermapper.c | 78 ++++++++++++++++++++++++++++++-------------- 2 files changed, 57 insertions(+), 25 deletions(-)

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian Bokmaal resources.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: 3c7afa61a76ef85f3ebd72e294f6789c92648286 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c7afa61a76ef85f3ebd72e… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 9 11:21:35 2005 +0100 winecfg: Updated Norwegian Bokmaal resources. --- programs/winecfg/No.rc | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 7581b5f..7e49c4b 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -60,8 +60,6 @@ BEGIN CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Aktiver dobbelt hurtigminne for skrivebordet",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - LTEXT "Du kan velge � emulere et Windows-skrivebord, s�nn at alle Windows-programmer samles i ett vindu, eller at Windows-programmer oppfrer seg som vanlige programmer.", - IDC_STATIC,15,73,228,28 LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", IDC_STATIC,15,73,228,28 LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED @@ -154,29 +152,27 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Lyddriver: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Automatisk",IDC_AUDIO_AUTODETECT,170,20,49,14 - PUSHBUTTON "Konfigurer",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 - + PUSHBUTTON "Automatisk",IDC_AUDIO_AUTODETECT,170,20,59,14 + PUSHBUTTON "Oppsett",IDC_AUDIO_CONFIGURE,170,40,59,14 + PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,60,59,14 + CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 + LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Temaer ",IDC_STATIC,8,10,244,94 - LTEXT "Tema:",IDC_STATIC,15,22,228,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,30,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Farge:",IDC_THEME_COLORTEXT,15,48,228,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,56,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "St�rrelse:",IDC_THEME_SIZETEXT,15,74,228,8 - COMBOBOX IDC_THEME_SIZECOMBO,15,82,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "Tema:",IDC_STATIC,8,10,244,8 +COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Installer tema . . .",IDC_THEME_INSTALL,152,32,100,14 + LTEXT "Farge:",IDC_THEME_COLORTEXT,8,48,244,8 + COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "St�rrelse:",IDC_THEME_SIZETEXT,8,74,244,8 + COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END STRINGTABLE DISCARDABLE @@ -193,7 +189,7 @@ BEGIN IDS_TAB_APPEARANCE "Utseende" IDS_TAB_AUDIO "Lyd" IDS_TAB_ABOUT "Om" - IDS_WINECFG_TITLE "Wine-konfigurasjon" + IDS_WINECFG_TITLE "Oppsett av Wine" IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" END

1 0

Vincent Béron : widl: Issue correct C++ headers.
by Alexandre Julliard Dec. 9, 2005

Dec. 9, 2005

Module: wine Branch: refs/heads/master Commit: fe987b303581740cb96231a9abc42987473451db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe987b303581740cb96231a… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Fri Dec 9 11:22:04 2005 +0100 widl: Issue correct C++ headers. --- tools/widl/header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 88621f3..95db8c9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -806,7 +806,7 @@ static void write_com_interface(type_t * fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); if (iface->ref) { - fprintf(header, "%s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "interface %s : public %s\n", iface->name, iface->ref->name); fprintf(header, "{\n"); indentation++; write_cpp_method_def(iface); @@ -815,7 +815,7 @@ static void write_com_interface(type_t * } else { - fprintf(header, "%s\n", iface->name); + fprintf(header, "interface %s\n", iface->name); fprintf(header, "{\n"); fprintf(header, " BEGIN_INTERFACE\n"); fprintf(header, "\n"); @@ -888,7 +888,7 @@ void write_dispinterface(type_t *iface) write_forward(iface); /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); - fprintf(header, "%s : public %s\n", iface->name, iface->ref->name); + fprintf(header, "interface %s : public %s\n", iface->name, iface->ref->name); fprintf(header, "{\n"); fprintf(header, "};\n"); fprintf(header, "#else\n");

1 0

Tag wine-0.9.3 : Alexandre Julliard : Release 0.9.3
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/tags/wine-0.9.3 Tag: 525e96c12d547b570ae2e1156ad4502264f39f46 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=525e96c12d547b570ae2e1156a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:59:44 2005 +0100 Release 0.9.3

1 0

Alexandre Julliard : Release 0.9.3.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 30855169a0a9106cb94aa6d493b1f4e7272d11af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30855169a0a9106cb94aa6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:59:44 2005 +0100 Release 0.9.3. --- ANNOUNCE | 19 - ChangeLog | 2295 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 4 files changed, 2316 insertions(+), 18 deletions(-)

1 0

Huw Davies : gdi: Fix 24bpp -> 32bpp copy.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: e32932e6ab37dd6d6d1993dbea736dc38f0e195f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e32932e6ab37dd6d6d1993d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 8 13:53:07 2005 +0100 gdi: Fix 24bpp -> 32bpp copy. --- dlls/gdi/dib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c index 6b55d8b..26b8a1a 100644 --- a/dlls/gdi/dib.c +++ b/dlls/gdi/dib.c @@ -897,7 +897,9 @@ INT WINAPI GetDIBits( width = min(srcwidth, dstwidth); for( y = 0; y < lines; y++) { for( x = 0; x < width; x++, srcbits+=3 ) - *dstbits++ = ((DWORD)*srcbits) & 0x00ffffff; + *dstbits++ = srcbits[0] | + (srcbits[1] << 8) | + (srcbits[2] << 16); dstbits=(LPDWORD)(dbits+=dstwidthb); srcbits=(sbits+=srcwidthb); }

1 0

Rein Klazes : advapi32: RegCreateKeyEx fix.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 62b69d64869600e5d81c611b5450386e9fcab586 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62b69d64869600e5d81c611… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Thu Dec 8 13:49:02 2005 +0100 advapi32: RegCreateKeyEx fix. On Win9x,ME RegCreateKeyEx ignores the backslash character if the subkey begins with one. With a regression test. --- dlls/advapi32/registry.c | 6 +++++- dlls/advapi32/tests/registry.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9399c1e..4cb6add 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -206,7 +206,11 @@ DWORD WINAPI RegCreateKeyExA( HKEY hkey, NTSTATUS status; if (reserved) return ERROR_INVALID_PARAMETER; - if (!is_version_nt()) access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + if (!is_version_nt()) + { + access = KEY_ALL_ACCESS; /* Win95 ignores the access mask */ + if (name && *name == '\\') name++; /* win9x,ME ignores one (and only one) beginning backslash */ + } else if (!(access & KEY_ACCESS_MASK) || (access & ~KEY_ACCESS_MASK)) return ERROR_ACCESS_DENIED; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 738de73..8014e14 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -476,6 +476,12 @@ static void test_reg_open_key(void) /* send in NULL hkResult */ ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", ret); + + /* beginning backslash character */ + ret = RegOpenKeyA(HKEY_CURRENT_USER, "\\Software\\Wine\\Test", &hkResult); + ok(ret == ERROR_BAD_PATHNAME || /* NT/2k/XP */ + ret == ERROR_FILE_NOT_FOUND /* Win9x,ME */ + , "expected ERROR_BAD_PATHNAME or ERROR_FILE_NOT_FOUND, got %ld\n", ret); } static void test_reg_create_key(void) @@ -492,6 +498,15 @@ static void test_reg_create_key(void) /* clean up */ RegDeleteKey(hkey2, NULL); RegDeleteKey(hkey1, NULL); + + /* beginning backslash character */ + ret = RegCreateKeyExA(hkey_main, "\\Subkey3", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL); + if (!(GetVersion() & 0x80000000)) + ok(ret == ERROR_BAD_PATHNAME, "expected ERROR_BAD_PATHNAME, got %ld\n", ret); + else { + ok(!ret, "RegCreateKeyExA failed with error %ld\n", ret); + RegDeleteKey(hkey1, NULL); + } } static void test_reg_close_key(void)

1 0

Robert Shearman : widl: Formatting cleanups.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: b86efe5d117a5b6f9b8558563fdd98226a07c0c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b86efe5d117a5b6f9b85585… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 13:48:46 2005 +0100 widl: Formatting cleanups. --- tools/widl/parser.y | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3d9afa7..86eac75 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -598,7 +598,8 @@ coclass: tCOCLASS aIDENTIFIER { $$ = coclasshdr: attributes coclass { $$ = $2; $$->attrs = $1; - if (!parse_only && do_header) write_coclass($$); + if (!parse_only && do_header) + write_coclass($$); } ; @@ -750,14 +751,15 @@ type: tVOID { $$ = make_tref(NULL, | tUNION aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsUNION)); } ; -typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); +typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); $4->tname = tref->name; tref->name = NULL; $$ = type_ref(tref); $$->attrs = $2; - if (!parse_only && do_header) write_typedef($$, $4); - if (in_typelib && $$->attrs) - add_typedef($$, $4); + if (!parse_only && do_header) + write_typedef($$, $4); + if (in_typelib && $$->attrs) + add_typedef($$, $4); reg_types($$, $4, 0); } ;

1 0

Robert Shearman : widl: Marshal and unmarshal basic types.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 92c568ab5d4d99e82282d38b407585c52279cfd4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92c568ab5d4d99e82282d38… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 12:53:58 2005 +0100 widl: Marshal and unmarshal basic types. --- tools/widl/typegen.c | 114 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 99 insertions(+), 15 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 01992b0..8883b3f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -53,6 +53,33 @@ static int print_file(FILE *file, int in return r; } +static void write_procformatstring_var(FILE *file, int indent, var_t *var) +{ + switch(var->type->type) + { +#define CASE_BASETYPE(fctype) \ + case RPC_##fctype: \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + break + + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_DOUBLE); +#undef CASE_BASETYPE + default: + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + } +} + void write_procformatstring(FILE *file, type_t *iface) { int indent = 0; @@ -76,12 +103,8 @@ void write_procformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - switch(var->type->type) - { - default: - error("Unknown/unsupported type\n"); - } - + print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + write_procformatstring_var(file, indent, var); var = PREV_LINK(var); } } @@ -95,11 +118,8 @@ void write_procformatstring(FILE *file, } else { - switch(var->type->type) - { - default: - error("Unknown/unsupported type\n"); - } + print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + write_procformatstring_var(file, indent, var); } func = PREV_LINK(func); @@ -144,13 +164,17 @@ unsigned int get_required_buffer_size(ty case RPC_FC_SHORT: case RPC_FC_ULONG: case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_IGNORE: + case RPC_FC_ERROR_STATUS_T: return 4; - case RPC_FC_HYPER: + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: return 8; default: - error("Unknown/unsupported type: %s\n", type->name); + error("Unknown/unsupported type: %s (0x%02x)\n", type->name, type->type); return 0; } } @@ -172,9 +196,39 @@ void marshall_arguments(FILE *file, int alignment = 0; switch (var->type->type) { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + default: size = 0; - error("Unknown/unsupported type!"); + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } if (alignment != 0) @@ -210,9 +264,39 @@ void unmarshall_arguments(FILE *file, in alignment = 0; switch (var->type->type) { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + default: size = 0; - error("Unknown/unsupported type!"); + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } if (alignment != 0)

1 0

Robert Shearman : widl: Add a type generator framework.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 35d327bd0dff4646a9cf3b45c0717926cbc7b8a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35d327bd0dff4646a9cf3b4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 12:52:13 2005 +0100 widl: Add a type generator framework. Add a framework for writing the strings for marshaling and unmarshaling parameters and make the client and server use it. --- tools/widl/Makefile.in | 1 tools/widl/client.c | 65 +------------ tools/widl/server.c | 89 +----------------- tools/widl/typegen.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 27 ++++++ 5 files changed, 271 insertions(+), 143 deletions(-) create mode 100644 tools/widl/typegen.c create mode 100644 tools/widl/typegen.h

1 0

Eric Kohl : widl: Write out argument lists in the server.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: ba39a874d4c36d6a2e3b569164f00fe39f8438b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba39a874d4c36d6a2e3b569… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Dec 8 12:48:44 2005 +0100 widl: Write out argument lists in the server. - Add framework for updating proc offsets. - Write out argument lists in the server. --- tools/widl/client.c | 54 ++++++++++++++++++++++-------- tools/widl/server.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 130 insertions(+), 17 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index c7d5d48..2523125 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -126,6 +126,7 @@ static void write_function_stubs(type_t { func_t *func = iface->funcs; char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + var_t *var; int method_count = 0; unsigned int proc_offset = 0; @@ -178,11 +179,16 @@ static void write_function_stubs(type_t fprintf(client, "\n"); if (implicit_handle) + { print_client("_Handle = %s;\n", implicit_handle); + fprintf(client, "\n"); + } + + /* emit the message buffer size */ + print_client("_StubMsg.BufferLength ="); + print_client("0"); /* FIXME */ + fprintf(client, ";\n"); - /* FIXME: marshal arguments */ - print_client("_StubMsg.BufferLength = 0UL;\n"); - /* print_client("NdrNsGetBuffer(\n"); */ print_client("NdrGetBuffer(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); @@ -206,11 +212,7 @@ static void write_function_stubs(type_t indent--; /* unmarshal return value */ - if (is_void(def->type, NULL)) - { - proc_offset += 2; - } - else + if (!is_void(def->type, NULL)) { fprintf(client, "\n"); @@ -219,17 +221,27 @@ static void write_function_stubs(type_t print_client("NdrConvert(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(PFORMAT_STRING)&__MIDL_ProcFormatString[%u]);\n", proc_offset); + print_client("(PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", proc_offset); indent -= 2; fprintf(client, "\n"); print_client("_RetVal = *(("); write_type(client, def->type, def, def->tname); fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); + } - /* FIXME: update proc_offset */ - proc_offset += 2; + /* update proc_offset */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + proc_offset += 2; /* FIXME */ + var = PREV_LINK(var); + } } + proc_offset += 2; /* FIXME */ indent--; print_client("}\n"); @@ -358,6 +370,7 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { func_t *func; + var_t *var; int byte_count = 1; print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ @@ -367,6 +380,19 @@ static void write_formatstringsdecl(type while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + byte_count += 2; /* FIXME: determine real size */ + var = PREV_LINK(var); + } + } + + /* return value size */ byte_count += 2; /* FIXME: determine real size */ func = PREV_LINK(func); } @@ -384,11 +410,11 @@ static void write_formatstringsdecl(type static void write_implicithandledecl(type_t *iface) { - char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - if (var) + if (implicit_handle) { - fprintf(client, "handle_t %s;\n", var); + fprintf(client, "handle_t %s;\n", implicit_handle); fprintf(client, "\n"); } } diff --git a/tools/widl/server.c b/tools/widl/server.c index 8629ef9..ee2a1c2 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -150,6 +150,9 @@ static unsigned int get_required_stack_s static void write_function_stubs(type_t *iface) { func_t *func = iface->funcs; + var_t *var; + unsigned int proc_offset = 0; + while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) { @@ -176,9 +179,28 @@ static void write_function_stubs(type_t fprintf(server, " _RetVal;\n"); } + /* declare arguments */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + print_server(""); + write_type(server, var->type, var, var->tname); + fprintf(server, " "); + write_name(server, var); + fprintf(server, ";\n"); + + var = PREV_LINK(var); + } + } + print_server("MIDL_STUB_MESSAGE _StubMsg;\n"); print_server("RPC_STATUS _Status;\n"); fprintf(server, "\n"); + + print_server("((void)(_Status));\n"); print_server("NdrServerInitializeNew(\n"); indent++; @@ -194,6 +216,21 @@ static void write_function_stubs(type_t print_server("RpcTryExcept\n"); print_server("{\n"); indent++; + + if (func->args) + { + print_server("if ((_pRpcMessage->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)\n"); + indent++; + print_server("NdrConvert(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(PFORMAT_STRING)&__MIDL_ProcFormatString.Format[%u]);\n", proc_offset); + indent -= 2; + fprintf(server, "\n"); + + /* FIXME: unmarshall arguments */ + } + print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); print_server("{\n"); indent++; @@ -219,10 +256,33 @@ static void write_function_stubs(type_t print_server(""); write_name(server, def); - /* FIXME: handle argument list */ - fprintf(server, "();\n"); + if (func->args) + { + int first_arg = 1; + + fprintf(server, "(\n"); + indent++; + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (first_arg) + first_arg = 0; + else + fprintf(server, ",\n"); + print_server(""); + write_name(server, var); + var = PREV_LINK(var); + } + fprintf(server, ");\n"); + indent--; + } + else + { + fprintf(server, "();\n"); + } - /* FIXME: Marshall the return value */ + /* marshall the return value */ if (!is_void(def->type, NULL)) { fprintf(server, "\n"); @@ -260,6 +320,19 @@ static void write_function_stubs(type_t fprintf(server, "}\n"); fprintf(server, "\n"); + /* update proc_offset */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + proc_offset += 2; /* FIXME */ + var = PREV_LINK(var); + } + } + proc_offset += 2; /* FIXME */ + func = PREV_LINK(func); } } @@ -383,6 +456,7 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { func_t *func; + var_t *var; int byte_count = 1; print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ @@ -392,6 +466,19 @@ static void write_formatstringsdecl(type while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + byte_count += 2; /* FIXME: determine real size */ + var = PREV_LINK(var); + } + } + + /* return value size */ byte_count += 2; /* FIXME: determine real size */ func = PREV_LINK(func); }

1 0

Eric Kohl : widl: Rename some variables.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 80e262202f1ed411be5c777937969be99ba0f1bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80e262202f1ed411be5c777… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Dec 8 12:45:45 2005 +0100 widl: Rename some variables. --- tools/widl/client.c | 50 +++++++++++++++++++++++++------------------------- tools/widl/server.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ce6eda4..c7d5d48 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -67,7 +67,7 @@ static int print_client( const char *for static void write_procformatstring(type_t *iface) { - func_t *cur = iface->funcs; + func_t *func = iface->funcs; print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_client("{\n"); @@ -76,10 +76,10 @@ static void write_procformatstring(type_ print_client("{\n"); indent++; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var_t *def = cur->def; + var_t *def = func->def; if (is_void(def->type, NULL)) { @@ -92,7 +92,7 @@ static void write_procformatstring(type_ print_client("0x%02x, /* <type> */\n", def->type->type); } - cur = PREV_LINK(cur); + func = PREV_LINK(func); } print_client("0x0\n"); @@ -124,23 +124,23 @@ static void write_typeformatstring(void) static void write_function_stubs(type_t *iface) { - func_t *cur = iface->funcs; - char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + func_t *func = iface->funcs; + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int method_count = 0; unsigned int proc_offset = 0; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var_t *def = cur->def; + var_t *def = func->def; write_type(client, def->type, def, def->tname); fprintf(client, " "); write_name(client, def); fprintf(client, "(\n"); indent++; - if (cur->args) - write_args(client, cur->args, iface->name, 0, TRUE); + if (func->args) + write_args(client, func->args, iface->name, 0, TRUE); else print_client("void"); fprintf(client, ")\n"); @@ -158,7 +158,7 @@ static void write_function_stubs(type_t fprintf(client, " _RetVal;\n"); } - if (handle_name) + if (implicit_handle) print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); @@ -177,8 +177,8 @@ static void write_function_stubs(type_t indent--; fprintf(client, "\n"); - if (handle_name) - print_client("_Handle = %s;\n", handle_name); + if (implicit_handle) + print_client("_Handle = %s;\n", implicit_handle); /* FIXME: marshal arguments */ print_client("_StubMsg.BufferLength = 0UL;\n"); @@ -187,7 +187,7 @@ static void write_function_stubs(type_t indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - if (handle_name) + if (implicit_handle) print_client("%_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); @@ -259,7 +259,7 @@ static void write_function_stubs(type_t fprintf(client, "\n"); method_count++; - cur = PREV_LINK(cur); + func = PREV_LINK(func); } } @@ -280,7 +280,7 @@ static void write_stubdescdecl(type_t *i static void write_stubdescriptor(type_t *iface) { - char *handle_name = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); @@ -288,8 +288,8 @@ static void write_stubdescriptor(type_t print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); - if (handle_name) - print_client("&%s,\n", handle_name); + if (implicit_handle) + print_client("&%s,\n", implicit_handle); else print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); print_client("0,\n"); @@ -357,18 +357,18 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - func_t *cur; + func_t *func; int byte_count = 1; print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ /* determine the proc format string size */ - cur = iface->funcs; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { byte_count += 2; /* FIXME: determine real size */ - cur = PREV_LINK(cur); + func = PREV_LINK(func); } print_client("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); diff --git a/tools/widl/server.c b/tools/widl/server.c index 1c48e25..8629ef9 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -69,7 +69,7 @@ static int print_server(const char *form static void write_procformatstring(type_t *iface) { - func_t *cur = iface->funcs; + func_t *func = iface->funcs; print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_server("{\n"); @@ -78,10 +78,10 @@ static void write_procformatstring(type_ print_server("{\n"); indent++; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var_t *def = cur->def; + var_t *def = func->def; if (is_void(def->type, NULL)) { @@ -94,7 +94,7 @@ static void write_procformatstring(type_ print_server("0x%02x, /* <type> */\n", def->type->type); } - cur = PREV_LINK(cur); + func = PREV_LINK(func); } print_server("0x0\n"); @@ -149,11 +149,11 @@ static unsigned int get_required_stack_s static void write_function_stubs(type_t *iface) { - func_t *cur = iface->funcs; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var_t *def = cur->def; + var_t *def = func->def; write_type(server, def->type, def, def->tname); fprintf(server, " __RPC_STUB\n"); @@ -260,7 +260,7 @@ static void write_function_stubs(type_t fprintf(server, "}\n"); fprintf(server, "\n"); - cur = PREV_LINK(cur); + func = PREV_LINK(func); } } @@ -269,22 +269,22 @@ static void write_dispatchtable(type_t * { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); unsigned long method_count = 0; - func_t *cur = iface->funcs; + func_t *func = iface->funcs; print_server("static RPC_DISPATCH_FUNCTION %s_table[] =\n", iface->name); print_server("{\n"); indent++; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var_t *def = cur->def; + var_t *def = func->def; print_server("%s_", iface->name); write_name(server, def); fprintf(server, ",\n"); method_count++; - cur = PREV_LINK(cur); + func = PREV_LINK(func); } print_server("0\n"); indent--; @@ -382,18 +382,18 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - func_t *cur; + func_t *func; int byte_count = 1; print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ /* determine the proc format string size */ - cur = iface->funcs; - while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); - while (cur) + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { byte_count += 2; /* FIXME: determine real size */ - cur = PREV_LINK(cur); + func = PREV_LINK(func); } print_server("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count);

1 0