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