December 2005 - Wine-Commits

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 13, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 12, 2005

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

1 0

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

Dec. 11, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 9, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

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

Dec. 8, 2005

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

1 0

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 1d4bec79ff54acf3eca6622399190ad03e77ccbe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d4bec79ff54acf3eca6622… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Thu Dec 8 12:45:19 2005 +0100 winecfg: Update German resource. --- programs/winecfg/De.rc | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index e8d58de..7fb6130 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -153,16 +153,14 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Audio Treiber: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Automatisch",IDC_AUDIO_AUTODETECT,170,20,49,14 - PUSHBUTTON "Konfigurieren",IDC_AUDIO_CONFIGURE,170,40,49,14 - PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,60,49,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - - LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 - + PUSHBUTTON "Automatisch",IDC_AUDIO_AUTODETECT,170,20,59,14 + PUSHBUTTON "Konfigurieren",IDC_AUDIO_CONFIGURE,170,40,59,14 + PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,60,59,14 + CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 + LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Raphael Junqueira : opengl: render_texture
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 1399edb0925966a802a6a39835025c22c22c18e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1399edb0925966a802a6a39… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 8 12:45:07 2005 +0100 opengl: render_texture - better render_texture emulation (using pbuffers) - support GLX_ATI_render_texture for render_texture --- dlls/opengl32/wgl.c | 51 +++++ dlls/opengl32/wgl_ext.c | 476 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 419 insertions(+), 108 deletions(-)

1 0

Aric Stewart : wininet: Handle HTTP_QUERY_CUSTOM.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 7bca41a739a1f1bfb4f83ebea46355ac94b902b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bca41a739a1f1bfb4f83eb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 12:44:45 2005 +0100 wininet: Handle HTTP_QUERY_CUSTOM. In HttpQueryInfo if dwInfoLevel includes HTTP_QUERY_CUSTOM then lpBuffer is In/Out because the header we are querying is there. Additionally standard headers can be queried in this manner as well (such as Set-Cookie). --- dlls/wininet/http.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ffa5414..f35e2ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -102,6 +102,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength); +static INT HTTP_GetStdHeaderIndex(LPCWSTR lpszField); /*********************************************************************** * HTTP_Tokenize (internal) @@ -1161,9 +1162,14 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( INT index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)lpBuffer); if (index < 0) - return bSuccess; + index = HTTP_GetStdHeaderIndex(lpBuffer); + else + lphttpHdr = &lpwhr->pCustHeaders[index]; - lphttpHdr = &lpwhr->pCustHeaders[index]; + if (index < 0) + return bSuccess; + else + lphttpHdr = &lpwhr->StdHeaders[index]; } else { @@ -1285,7 +1291,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( (*lpdwIndex)++; } } - else + else if (lphttpHdr->lpszValue) { DWORD len = (strlenW(lphttpHdr->lpszValue) + 1) * sizeof(WCHAR); @@ -1475,6 +1481,9 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHt len = (*lpdwBufferLength)*sizeof(WCHAR); bufferW = HeapAlloc( GetProcessHeap(), 0, len ); + /* buffer is in/out because of HTTP_QUERY_CUSTOM */ + if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) + MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); result = HttpQueryInfoW( hHttpRequest, dwInfoLevel, bufferW, &len, lpdwIndex ); if( result )

1 0

Robert Reif : wineoss: Fix device probing.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: c7a59d117a12d68c504e9486895f0720c0a46953 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7a59d117a12d68c504e948… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Dec 8 12:00:33 2005 +0100 wineoss: Fix device probing. - Fix device probing at driver load time. - Fix memory leaks at driver exit time. --- dlls/winmm/wineoss/audio.c | 29 ++++++++++++++++++++++++++++- dlls/winmm/wineoss/midi.c | 33 ++++++++++++++++++++++++++------- dlls/winmm/wineoss/mixer.c | 6 ++---- dlls/winmm/wineoss/mmaux.c | 15 +++++++++++---- dlls/winmm/wineoss/oss.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/winmm/wineoss/oss.h | 13 +++++++++++-- 6 files changed, 113 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 6cb9c5a..7df0bca 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -1078,7 +1078,7 @@ static char* StrDup(const char* str, con * * Initialize internal structures from OSS information */ -LONG OSS_WaveInit(void) +LRESULT OSS_WaveInit(void) { char* str; int i; @@ -1159,6 +1159,33 @@ LONG OSS_WaveInit(void) } /****************************************************************** + * OSS_WaveExit + * + * Delete/clear internal structures of OSS information + */ +LRESULT OSS_WaveExit(void) +{ + int i; + TRACE("()\n"); + + for (i = 0; i < MAX_WAVEDRV; ++i) + { + HeapFree(GetProcessHeap(), 0, OSS_Devices[i].dev_name); + HeapFree(GetProcessHeap(), 0, OSS_Devices[i].mixer_name); + HeapFree(GetProcessHeap(), 0, OSS_Devices[i].interface_name); + } + + ZeroMemory(OSS_Devices, sizeof(OSS_Devices)); + ZeroMemory(WOutDev, sizeof(WOutDev)); + ZeroMemory(WInDev, sizeof(WInDev)); + + numOutDev = 0; + numInDev = 0; + + return 0; +} + +/****************************************************************** * OSS_InitRingMessage * * Initialize the ring of messages for passing between driver's caller and playback/record diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 6dc9f7a..4ea5090 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -176,7 +176,7 @@ static int MIDI_UnixToWindowsDeviceType * * Initializes the MIDI devices information variables */ -BOOL OSS_MidiInit(void) +LRESULT OSS_MidiInit(void) { int i, status, numsynthdevs = 255, nummididevs = 255; struct synth_info sinfo; @@ -184,14 +184,14 @@ BOOL OSS_MidiInit(void) static BOOL bInitDone = FALSE; if (bInitDone) - return TRUE; + return 0; TRACE("Initializing the MIDI variables.\n"); - bInitDone = TRUE; + bInitDone = 0; /* try to open device */ if (midiOpenSeq() == -1) { - return TRUE; + return -1; } /* find how many Synth devices are there in the system */ @@ -200,7 +200,7 @@ BOOL OSS_MidiInit(void) if (status == -1) { ERR("ioctl for nr synth failed.\n"); midiCloseSeq(); - return TRUE; + return -1; } if (numsynthdevs > MAX_MIDIOUTDRV) { @@ -374,7 +374,26 @@ BOOL OSS_MidiInit(void) /* close file and exit */ midiCloseSeq(); - return TRUE; + return 0; +} + +/************************************************************************** + * OSS_MidiExit [internal] + * + * Release the MIDI devices information variables + */ +LRESULT OSS_MidiExit(void) +{ + TRACE("()\n"); + + ZeroMemory(MidiInDev, sizeof(MidiInDev)); + ZeroMemory(MidiOutDev, sizeof(MidiOutDev)); + + MODM_NumDevs = 0; + MODM_NumFMSynthDevs = 0; + MIDM_NumDevs = 0; + + return 0; } /************************************************************************** @@ -1657,7 +1676,7 @@ static DWORD modReset(WORD wDevID) #else /* HAVE_OSS_MIDI */ -BOOL OSS_MidiInit(void) +LRESULT OSS_MidiInit(void) { return FALSE; } diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c index 02d377c..82d586c 100644 --- a/dlls/winmm/wineoss/mixer.c +++ b/dlls/winmm/wineoss/mixer.c @@ -1437,7 +1437,7 @@ static DWORD MIX_SetControlDetails(WORD /************************************************************************** * MIX_Init [internal] */ -static DWORD MIX_Init(void) +LRESULT OSS_MixerInit(void) { int i, mixer; @@ -1489,7 +1489,7 @@ static DWORD MIX_Init(void) /************************************************************************** * MIX_Exit [internal] */ -static DWORD MIX_Exit(void) +LRESULT OSS_MixerExit(void) { int i; @@ -1528,9 +1528,7 @@ DWORD WINAPI OSS_mxdMessage(UINT wDevID, switch (wMsg) { case DRVM_INIT: - return MIX_Init(); case DRVM_EXIT: - return MIX_Exit(); case DRVM_ENABLE: case DRVM_DISABLE: /* FIXME: Pretend this is supported */ diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c index 4406634..0841e6f 100644 --- a/dlls/winmm/wineoss/mmaux.c +++ b/dlls/winmm/wineoss/mmaux.c @@ -49,9 +49,10 @@ static int NumDev = 6; /*-----------------------------------------------------------------------*/ -static int AUXDRV_Init(void) +LRESULT OSS_AuxInit(void) { int mixer; + TRACE("()\n"); if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); @@ -60,7 +61,15 @@ static int AUXDRV_Init(void) close(mixer); NumDev = 6; } - return NumDev; + return 0; +} + +/*-----------------------------------------------------------------------*/ + +LRESULT OSS_AuxExit(void) +{ + TRACE("()\n"); + return 0; } /************************************************************************** @@ -219,8 +228,6 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, #ifdef HAVE_OSS switch (wMsg) { case DRVM_INIT: - AUXDRV_Init(); - /* fall through */ case DRVM_EXIT: case DRVM_ENABLE: case DRVM_DISABLE: diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index 8526f42..a8a07a7 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -29,14 +29,44 @@ #include "winuser.h" #include "mmddk.h" #include "oss.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wave); #ifdef HAVE_OSS /************************************************************************** + * OSS_drvLoad [internal] + */ +static LRESULT OSS_drvLoad(void) +{ + TRACE("()\n"); + OSS_WaveInit(); + OSS_MidiInit(); + OSS_MixerInit(); + OSS_AuxInit(); + return 1; +} + +/************************************************************************** + * OSS_drvFree [internal] + */ +static LRESULT OSS_drvFree(void) +{ + TRACE("()\n"); + OSS_WaveExit(); + OSS_MidiExit(); + OSS_MixerExit(); + OSS_AuxExit(); + return 1; +} + +/************************************************************************** * OSS_drvOpen [internal] */ static LRESULT OSS_drvOpen(LPSTR str) { + TRACE("(%s)\n", str); return 1; } @@ -45,6 +75,7 @@ static LRESULT OSS_drvOpen(LPSTR str) */ static LRESULT OSS_drvClose(DWORD_PTR dwDevID) { + TRACE("(%08lx)\n", dwDevID); return 1; } @@ -57,15 +88,13 @@ static LRESULT OSS_drvClose(DWORD_PTR dw LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { -/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ -/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ + TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch(wMsg) { #ifdef HAVE_OSS - case DRV_LOAD: OSS_WaveInit(); - OSS_MidiInit(); - return 1; - case DRV_FREE: return 1; + case DRV_LOAD: return OSS_drvLoad(); + case DRV_FREE: return OSS_drvFree(); case DRV_OPEN: return OSS_drvOpen((LPSTR)dwParam1); case DRV_CLOSE: return OSS_drvClose(dwDevID); case DRV_ENABLE: return 1; diff --git a/dlls/winmm/wineoss/oss.h b/dlls/winmm/wineoss/oss.h index 84450eb..555fbdb 100644 --- a/dlls/winmm/wineoss/oss.h +++ b/dlls/winmm/wineoss/oss.h @@ -38,5 +38,14 @@ # define HAVE_OSS #endif -extern LONG OSS_WaveInit(void); -extern BOOL OSS_MidiInit(void); +LRESULT OSS_WaveInit(void); +LRESULT OSS_WaveExit(void); + +LRESULT OSS_MidiInit(void); +LRESULT OSS_MidiExit(void); + +LRESULT OSS_MixerInit(void); +LRESULT OSS_MixerExit(void); + +LRESULT OSS_AuxInit(void); +LRESULT OSS_AuxExit(void);

1 0

Raphael Junqueira : dplay: dx8/dx9 support (missing includes).
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: db50e2d997b7cf808fd38b6d5f7202df1f7755fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=db50e2d997b7cf808fd38b6… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 8 12:00:14 2005 +0100 dplay: dx8/dx9 support (missing includes). - add directx9 support for dplay8.h and dpaddr.h - new file dplobby8.h --- include/Makefile.in | 1 include/dpaddr.h | 25 ++++ include/dplay8.h | 300 +++++++++++++++++++++++++++++++++++++++++---------- include/dplobby8.h | 259 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 522 insertions(+), 63 deletions(-) create mode 100644 include/dplobby8.h

1 0

Robert Shearman : comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: c75d0cdc8cb0974344c5e9e680a35572c21ffff9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c75d0cdc8cb0974344c5e9e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 11:59:36 2005 +0100 comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked. --- dlls/commdlg/printdlg.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index cf36ef0..30e769e 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -2096,14 +2096,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, lpdm->dmSize + lpdm->dmDriverExtra); } else { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) { - WARN("hDevMode has %d locks on it. Unlocking it now\n", locks); - while(locks--) { - GlobalUnlock(lppd->hDevMode); - TRACE("Now got %d locks\n", locks); - } - } lppd->hDevMode = GlobalReAlloc(lppd->hDevMode, lpdm->dmSize + lpdm->dmDriverExtra, GMEM_MOVEABLE); @@ -2111,14 +2103,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) lpdmReturn = GlobalLock(lppd->hDevMode); memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra); - if (lppd->hDevNames != 0) { - WORD locks; - if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) { - WARN("hDevNames has %d locks on it. Unlocking it now\n", locks); - while(locks--) - GlobalUnlock(lppd->hDevNames); - } - } PRINTDLG_CreateDevNames(&(lppd->hDevNames), di->pDriverPath, pi->pPrinterName,

1 0

Eric Pouech : winealsa: Fixed returned string in capabilities.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: fa1d997ddc35d2452874bd077d8fc9f2ee3f4a6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa1d997ddc35d2452874bd0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 8 11:58:48 2005 +0100 winealsa: Fixed returned string in capabilities. --- dlls/winmm/winealsa/audio.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index a8d35b0..a64d70e 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -1091,7 +1091,6 @@ static int ALSA_AddDeviceToArray(WINE_WA static int ALSA_AddPlaybackDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcmname, int isdefault) { WINE_WAVEDEV wwo; - WCHAR nameW[MAXPNAMELEN * 2]; int rc; memset(&wwo, '\0', sizeof(wwo)); @@ -1100,8 +1099,9 @@ static int ALSA_AddPlaybackDevice(snd_ct if (rc) return(rc); - MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR)); - strcpyW(wwo.outcaps.szPname, nameW); + MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1, + wwo.outcaps.szPname, sizeof(wwo.outcaps.szPname)/sizeof(WCHAR)); + wwo.outcaps.szPname[sizeof(wwo.outcaps.szPname)/sizeof(WCHAR) - 1] = '\0'; wwo.outcaps.wMid = MM_CREATIVE; wwo.outcaps.wPid = MM_CREATIVE_SBP16_WAVEOUT; @@ -1131,7 +1131,6 @@ static int ALSA_AddPlaybackDevice(snd_ct static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcmname, int isdefault) { WINE_WAVEDEV wwi; - WCHAR nameW[MAXPNAMELEN * 2]; int rc; memset(&wwi, '\0', sizeof(wwi)); @@ -1140,8 +1139,9 @@ static int ALSA_AddCaptureDevice(snd_ctl if (rc) return(rc); - MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1, nameW, sizeof(nameW)/sizeof(WCHAR)); - strcpyW(wwi.incaps.szPname, nameW); + MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1, + wwi.incaps.szPname, sizeof(wwi.incaps.szPname) / sizeof(WCHAR)); + wwi.incaps.szPname[sizeof(wwi.incaps.szPname)/sizeof(WCHAR) - 1] = '\0'; wwi.incaps.wMid = MM_CREATIVE; wwi.incaps.wPid = MM_CREATIVE_SBP16_WAVEOUT;

1 0

H. Verbeet : d3d8/d3d9: Define D3D_SDK_VERSION.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 51862d440c128feb215151c52b71eddea89b56d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51862d440c128feb215151c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Dec 8 11:58:11 2005 +0100 d3d8/d3d9: Define D3D_SDK_VERSION. --- include/d3d8.h | 1 + include/d3d9.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index 5a8b1c6..ca46eab 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -41,6 +41,7 @@ /***************************************************************************** * #defines and error codes */ +#define D3D_SDK_VERSION 220 #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 2 diff --git a/include/d3d9.h b/include/d3d9.h index b4e23ce..e7abb54 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -50,6 +50,7 @@ /***************************************************************************** * #defines and error codes */ +#define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 0x00000002L #define D3DPRESENT_BACK_BUFFERS_MAX 3L

1 0

Eric Pouech : winenas: fix crash.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 65a1796bc7fa1bd136c01222ef58198b4662839a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65a1796bc7fa1bd136c0122… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 8 11:58:35 2005 +0100 winenas: fix crash. - return correct MM error code when no connection to server has been opened - don't close the AU driver if it hasn't been opened --- dlls/winmm/winenas/audio.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c index 95be4c3..248a42e 100644 --- a/dlls/winmm/winenas/audio.c +++ b/dlls/winmm/winenas/audio.c @@ -407,7 +407,7 @@ LONG NAS_WaveClose(void) LONG NAS_WaveInit(void) { int i; - nas_init(); + if (!nas_init()) return MMSYSERR_ERROR; /* initialize all device handles to -1 */ for (i = 0; i < MAX_WAVEOUTDRV; ++i) @@ -1475,8 +1475,11 @@ static int nas_close(WINE_WAVEOUT* wwo) static int nas_end(void) { - AuCloseServer(AuServ); - AuServ = 0; + if (AuServ) + { + AuCloseServer(AuServ); + AuServ = 0; + } return 1; }

1 0

Robert Shearman : notepad: Remember options selected in the print setup dialog.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 8be66cb30e61b6ff6657a4522ec2ecc45a5ecd2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8be66cb30e61b6ff6657a45… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Dec 8 11:57:58 2005 +0100 notepad: Remember options selected in the print setup dialog. --- programs/notepad/dialog.c | 10 ++++++++++ programs/notepad/main.c | 2 ++ programs/notepad/main.h | 2 ++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index f5e74e2..28d1b6d 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -407,6 +407,8 @@ VOID DIALOG_FilePrint(VOID) ZeroMemory(&printer, sizeof(printer)); printer.lStructSize = sizeof(printer); printer.hwndOwner = Globals.hMainWnd; + printer.hDevMode = Globals.hDevMode; + printer.hDevNames = Globals.hDevNames; printer.hInstance = Globals.hInstance; /* Set some default flags */ @@ -422,6 +424,9 @@ VOID DIALOG_FilePrint(VOID) if (!PrintDlg(&printer)) return; + Globals.hDevMode = printer.hDevMode; + Globals.hDevNames = printer.hDevNames; + assert(printer.hDC != 0); /* initialize DOCINFO */ @@ -519,11 +524,16 @@ VOID DIALOG_FilePrinterSetup(VOID) ZeroMemory(&printer, sizeof(printer)); printer.lStructSize = sizeof(printer); printer.hwndOwner = Globals.hMainWnd; + printer.hDevMode = Globals.hDevMode; + printer.hDevNames = Globals.hDevNames; printer.hInstance = Globals.hInstance; printer.Flags = PD_PRINTSETUP; printer.nCopies = 1; PrintDlg(&printer); + + Globals.hDevMode = printer.hDevMode; + Globals.hDevNames = printer.hDevNames; } VOID DIALOG_FileExit(VOID) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 403fd96..4d7e39c 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -141,6 +141,8 @@ static VOID NOTEPAD_InitData(VOID) lstrcpy(p, all_files); p += lstrlen(p) + 1; *p = '\0'; + Globals.hDevMode = NULL; + Globals.hDevNames = NULL; } /*********************************************************************** diff --git a/programs/notepad/main.h b/programs/notepad/main.h index 06517d0..3a40c09 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -46,6 +46,8 @@ typedef struct WCHAR szFooter[MAX_PATH]; FINDREPLACE find; + HGLOBAL hDevMode; /* printer mode */ + HGLOBAL hDevNames; /* printer names */ } NOTEPAD_GLOBALS; extern NOTEPAD_GLOBALS Globals;

1 0

Mike McCormack : winecfg: Fix compilation on gcc 2.95 (no nameless unions).
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: b555e91e80fc160944e94f230ca9d351fc97eb97 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b555e91e80fc160944e94f2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Dec 8 11:57:44 2005 +0100 winecfg: Fix compilation on gcc 2.95 (no nameless unions). --- programs/winecfg/audio.c | 83 ++++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 40 deletions(-)

1 0

Alexandre Julliard : ntdll: Check for failure to get the user path in RtlOpenCurrentUser.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: 0603559de28a43a63df66b6d00eb84f78cf7483d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0603559de28a43a63df66b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 11:53:42 2005 +0100 ntdll: Check for failure to get the user path in RtlOpenCurrentUser. Fixed the return value type. --- dlls/ntdll/reg.c | 4 ++-- include/winternl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index e30051f..5ade8bd 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -843,7 +843,7 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyP * If we return just HKEY_CURRENT_USER the advapi tries to find a remote * registry (odd handle) and fails. */ -DWORD WINAPI RtlOpenCurrentUser( +NTSTATUS WINAPI RtlOpenCurrentUser( IN ACCESS_MASK DesiredAccess, /* [in] */ OUT PHANDLE KeyHandle) /* [out] handle of HKEY_CURRENT_USER */ { @@ -853,7 +853,7 @@ DWORD WINAPI RtlOpenCurrentUser( TRACE("(0x%08lx, %p)\n",DesiredAccess, KeyHandle); - RtlFormatCurrentUserKeyPath(&ObjectName); + if ((ret = RtlFormatCurrentUserKeyPath(&ObjectName))) return ret; InitializeObjectAttributes(&ObjectAttributes,&ObjectName,OBJ_CASE_INSENSITIVE,0, NULL); ret = NtCreateKey(KeyHandle, DesiredAccess, &ObjectAttributes, 0, NULL, 0, NULL); RtlFreeUnicodeString(&ObjectName); diff --git a/include/winternl.h b/include/winternl.h index 060f8a7..2be14d3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2120,7 +2120,7 @@ ULONG WINAPI RtlNumberOfClearBits(PC UINT WINAPI RtlOemStringToUnicodeSize(const STRING*); NTSTATUS WINAPI RtlOemStringToUnicodeString(UNICODE_STRING*,const STRING*,BOOLEAN); NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); -DWORD WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); +NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN);

1 0

Aric Stewart : wininet: A->W bugfix.
by Alexandre Julliard Dec. 8, 2005

Dec. 8, 2005

Module: wine Branch: refs/heads/master Commit: d30cec77d3c56ab62dce3ce4117b1ecd342ba7ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d30cec77d3c56ab62dce3ce… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 8 11:54:24 2005 +0100 wininet: A->W bugfix. When converting SendRequestExA -> W we need to set the lpcszHeader parameter to NULL if the original one is NULL. --- dlls/wininet/http.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f234530..ffa5414 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1532,6 +1532,8 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET lpBuffersIn->lpcszHeader, lpBuffersIn->dwHeadersLength, (LPWSTR)BuffersInW.lpcszHeader, headerlen); } + else + BuffersInW.lpcszHeader = NULL; BuffersInW.dwHeadersTotal = lpBuffersIn->dwHeadersTotal; BuffersInW.lpvBuffer = lpBuffersIn->lpvBuffer; BuffersInW.dwBufferLength = lpBuffersIn->dwBufferLength;

1 0

lostwages/wwn wn20051202_300.xml
by Jeremy Newman Dec. 7, 2005

Dec. 7, 2005

ChangeSet ID: 21719 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/07 11:25:40 Modified files: wwn : wn20051202_300.xml Log message: Francois Gouget <fgouget(a)free.fr> Spelling fixes. Patch: http://cvs.winehq.org/patch.py?id=21719 Old revision New revision Changes Path 1.2 1.3 +5 -5 lostwages/wwn/wn20051202_300.xml Index: lostwages/wwn/wn20051202_300.xml diff -u -p lostwages/wwn/wn20051202_300.xml:1.2 lostwages/wwn/wn20051202_300.xml:1.3 --- lostwages/wwn/wn20051202_300.xml:1.2 7 Dec 2005 17:25:40 -0000 +++ lostwages/wwn/wn20051202_300.xml 7 Dec 2005 17:25:40 -0000 @@ -182,16 +182,16 @@ and would be shared by all, applications various glX revisions (recently discussed glx 1.2, 1.3, etc) would also be localized to a single dll. -Of course, on the down side, we take a hit of one extra layer of indirection by +Of course, on the downside, we take a hit of one extra layer of indirection by going through WGL. However as WGL/glX functions are rarely called, this should be a minimal of a performance hit. -All in all I think it would be worth while, but I'd still like to hear from +All in all I think it would be worthwhile, but I'd still like to hear from others so as not to waste (a lot!) of my time.</quote> Oliver Stieber wrote back: <quote who="Oliver Stieber"> -If wines WGL implementation is fully implemented then it may be a good idea +If wine's WGL implementation is fully implemented then it may be a good idea switching to wgl, a wgl implemenatation would also make debugging much easier because wined3d can be run under windows to isolate problems. @@ -408,11 +408,11 @@ Wine and try to fix it.</li></ol> > <topic>Web/HTML</topic> The Mozilla ActiveX control is currently used when an application -requires a <tt>WebBrowser</tt> control to embed OLE documnents, namely HTML, +requires a <tt>WebBrowser</tt> control to embed OLE documents, namely HTML, within an application. Ongoing work by Jacek Caban to implement MSHTML.DLL and SHDOCVW.DLL will hopefully obviate the need for it, but that work isn't complete enough yet (although Jacek sent about a -bizillion patches last week.) That led David Hagood to ask this week: +bazillion patches last week.) That led David Hagood to ask this week: <quote who="David Hagood"> Does the Windows version of Mozilla need to be in place for the Mozilla Active X control to work, or is there a way to point the control at my

1 0

Jacek Caban : mshtml: Added config key to specify Gecko path.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: b586f6face74f39921b9618a0431e5d6fb30514a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b586f6face74f39921b9618… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 13:07:42 2005 +0100 mshtml: Added config key to specify Gecko path. --- dlls/mshtml/nsembed.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 079e18f..6380c48 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -186,6 +186,29 @@ static BOOL get_mozctl_path(PRUnichar *g return TRUE; } +static BOOL get_wine_gecko_path(PRUnichar *gre_path) +{ + HKEY hkey; + DWORD res, type, size = MAX_PATH; + + static const WCHAR wszMshtmlKey[] = { + 'S','o','f','t','w','a','r','e','\\','W','i','n','e', + '\\','M','S','H','T','M','L',0}; + static const WCHAR wszGeckoPath[] = + {'G','e','c','k','o','P','a','t','h',0}; + + /* @@ Wine registry key: HKCU\Software\Wine\MSHTML */ + res = RegOpenKeyW(HKEY_CURRENT_USER, wszMshtmlKey, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + res = RegQueryValueExW(hkey, wszGeckoPath, NULL, &type, (LPBYTE)gre_path, &size); + if(res != ERROR_SUCCESS || type != REG_SZ) + return FALSE; + + return TRUE; +} + static BOOL load_gecko() { nsresult nsres; @@ -206,7 +229,8 @@ static BOOL load_gecko() return pCompMgr != NULL; tried_load = TRUE; - if(!get_mozctl_path(gre_path) && !get_mozilla_path(gre_path)) { + if(!get_wine_gecko_path(gre_path) && !get_mozctl_path(gre_path) + && !get_mozilla_path(gre_path)) { MESSAGE("Could not load Mozilla. HTML rendering will be disabled.\n"); return FALSE; }

1 0

Robert Reif : winecfg: Added support for auto detecting all drivers by attempting to
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: f6a7b6b59ab259968fae7f02f9484aa14e12e069 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6a7b6b59ab259968fae7f0… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Dec 7 13:07:30 2005 +0100 winecfg: Added support for auto detecting all drivers by attempting to open them. --- programs/winecfg/audio.c | 84 +++++++++++++--------------------------------- 1 files changed, 24 insertions(+), 60 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 87f3899..6f0cb5f 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -426,68 +426,32 @@ static void initAudioDlg (HWND hDlg) static const char *audioAutoDetect(void) { - struct stat buf; - const char *argv_new[4]; - int fd; - - const char *driversFound[10]; - const char *name[10]; - int numFound = 0,i; - - argv_new[0] = "/bin/sh"; - argv_new[1] = "-c"; - argv_new[3] = NULL; - - /* try to detect oss */ - fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK); - if(fd) - { - close(fd); - driversFound[numFound] = "oss"; - name[numFound] = "OSS"; - numFound++; - } - - /* try to detect alsa */ - if(!stat("/proc/asound", &buf)) - { - driversFound[numFound] = "alsa"; - name[numFound] = "ALSA"; - numFound++; - } + const char *driversFound[10]; + const char *name[10]; + int numFound = 0; + const AUDIO_DRIVER *pAudioDrv = NULL; + int i; - /* try to detect arts */ - argv_new[2] = "ps awx|grep artsd|grep -v grep|grep artsd > /dev/null"; - if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) - { - driversFound[numFound] = "arts"; - name[numFound] = "aRts"; - numFound++; - } + pAudioDrv = getAudioDrivers(); - /* try to detect jack */ - argv_new[2] = "ps awx|grep jackd|grep -v grep|grep jackd > /dev/null"; - if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) - { - driversFound[numFound] = "jack"; - name[numFound] = "JACK"; - numFound++; - } - - /* try to detect EsounD */ - argv_new[2] = "ps awx|grep esd|grep -v grep|grep esd > /dev/null"; - if(!spawnvp(_P_WAIT, "/bin/sh", argv_new)) - { - driversFound[numFound] = "esd"; - name[numFound] = "EsounD"; - numFound++; - } - - /* try to detect nas */ - /* TODO */ - - /* try to detect audioIO (solaris) */ - /* TODO */ + for (i = 0; *pAudioDrv->szName; i++, pAudioDrv++) + { + if (strlen(pAudioDrv->szDriver)) + { + HDRVR hdrv; + char driver[MAX_PATH]; + + sprintf(driver, "wine%s.drv", pAudioDrv->szDriver); + + if ((hdrv = OpenDriverA(driver, 0, 0))) + { + CloseDriver(hdrv, 0, 0); + driversFound[numFound] = pAudioDrv->szDriver; + name[numFound] = pAudioDrv->szName; + numFound++; + } + } + } if(numFound == 0) {

1 0

Vincent Béron : Add a few missing #includes.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: d52dafb5ccd006616b14aeb5539c82610ad4ba6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d52dafb5ccd006616b14aeb… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Wed Dec 7 12:51:39 2005 +0100 Add a few missing #includes. --- dlls/dpnhpast/main.c | 1 + dlls/mapi32/imalloc.c | 1 + dlls/msisys/msisys.c | 1 + dlls/netapi32/browsr.c | 1 + dlls/rsaenh/rsaenh.c | 5 +++-- dlls/wintrust/wintrust_main.c | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 93ba422..69fbb08 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dpnhpast); diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index ffe20ed..1ea9442 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -31,6 +31,7 @@ #include "winternl.h" #include "objbase.h" #include "shlwapi.h" +#include "mapiutil.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); diff --git a/dlls/msisys/msisys.c b/dlls/msisys/msisys.c index 62d1238..dbcb52f 100644 --- a/dlls/msisys/msisys.c +++ b/dlls/msisys/msisys.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "objbase.h" #include "wine/debug.h" diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c index 3cda17e..b0ed893 100644 --- a/dlls/netapi32/browsr.c +++ b/dlls/netapi32/browsr.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "lmcons.h" #include "lmbrowsr.h" +#include "lmshare.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4db2826..2e9b701 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -36,6 +36,7 @@ #include "lmcons.h" #include "handle.h" #include "implglue.h" +#include "objbase.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -3632,7 +3633,7 @@ static const WCHAR szDefaultKeys[2][65] * Microsoft Strong Cryptographpic Provider * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider Types\Type 001 */ -HRESULT WINAPI DllRegisterServer() +HRESULT WINAPI DllRegisterServer(void) { HKEY key; DWORD dp; @@ -3709,7 +3710,7 @@ HRESULT WINAPI DllRegisterServer() * NOTES * For the relevant keys see DllRegisterServer. */ -HRESULT WINAPI DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer(void) { RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[0]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[1]); diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 76912b3..30bb992 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -26,6 +26,7 @@ #include "guiddef.h" #include "wintrust.h" #include "mscat.h" +#include "objbase.h" #include "wine/debug.h"

1 0

Kai Blin : secur32: Implement InitializeSecurityContext(A|W) for the NTLM
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: d1a2dd79cc960b21a38ce7e486f115f149636110 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1a2dd79cc960b21a38ce7e… Author: Kai Blin <blin(a)gmx.net> Date: Wed Dec 7 12:51:05 2005 +0100 secur32: Implement InitializeSecurityContext(A|W) for the NTLM security provider. --- dlls/secur32/ntlm.c | 309 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 299 insertions(+), 10 deletions(-)

1 0

Robert Reif : winecfg: Show all sound card drivers and their devices.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: 1758ba6c6dbcba3173e4e99e77cd7c33f067d46c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1758ba6c6dbcba3173e4e99… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Dec 7 12:50:52 2005 +0100 winecfg: Show all sound card drivers and their devices. --- programs/winecfg/En.rc | 18 +-- programs/winecfg/audio.c | 264 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/resource.h | 1 3 files changed, 273 insertions(+), 10 deletions(-)

1 0

Vincent Béron : Add an error() function to fnt2fon and sfnt2fnt.
by Alexandre Julliard Dec. 7, 2005

Dec. 7, 2005

Module: wine Branch: refs/heads/master Commit: 2e5da5f4214b075e85e4e26b21f418b34c60e179 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e5da5f4214b075e85e4e26… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Wed Dec 7 12:44:17 2005 +0100 Add an error() function to fnt2fon and sfnt2fnt. --- tools/fnt2fon.c | 20 ++++++++++++++++++-- tools/sfnt2fnt.c | 47 +++++++++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c index 77a1f31..88c93ad 100644 --- a/tools/fnt2fon.c +++ b/tools/fnt2fon.c @@ -61,6 +61,23 @@ static void usage(char **argv) return; } +#ifndef __GNUC__ +#define __attribute__(X) +#endif + +static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); + +static void error(const char *s, ...) +{ + va_list ap; + va_start(ap, s); + fprintf(stderr, "Error: "); + vfprintf(stderr, s, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} + int main(int argc, char **argv) { int i, j; @@ -99,8 +116,7 @@ int main(int argc, char **argv) } fread(&ver, sizeof(short), 1, fp); if(ver != 0x200 && ver != 0x300) { - fprintf(stderr, "invalid fnt file %s ver %d\n", argv[i+1], ver); - exit(1); + error("invalid fnt file %s ver %d", argv[i+1], ver); } fread(file_lens + i, sizeof(int), 1, fp); fseek(fp, 0x44, SEEK_SET); diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 974f222..4d894e6 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -61,6 +61,23 @@ static void usage(char **argv) return; } +#ifndef __GNUC__ +#define __attribute__(X) +#endif + +static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); + +static void error(const char *s, ...) +{ + va_list ap; + va_start(ap, s); + fprintf(stderr, "Error: "); + vfprintf(stderr, s, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} + static int lookup_charset(int enc) { /* FIXME: make winelib app and use TranslateCharsetInfo */ @@ -130,33 +147,25 @@ static void fill_fontinfo(FT_Face face, FT_SfntName sfntname; TT_OS2 *os2; cptable = wine_cp_get_table(enc); - if(!cptable) { - fprintf(stderr, "Can't find codepage %d\n", enc); - exit(1); - } + if(!cptable) + error("Can't find codepage %d\n", enc); if(cptable->info.char_size != 1) { /* for double byte charsets we actually want to use cp1252 */ cptable = wine_cp_get_table(1252); - if(!cptable) { - fprintf(stderr, "Can't find codepage 1252\n"); - exit(1); - } + if(!cptable) + error("Can't find codepage 1252\n"); } ppem = face->size->metrics.y_ppem; start = sizeof(FNT_HEADER) + sizeof(FONTINFO16); - if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) { - fprintf(stderr, "Can't find Aring\n"); - exit(1); - } + if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) + error("Can't find Aring\n"); ascent = face->glyph->metrics.height >> 6; descent = ppem - ascent; - if(FT_Load_Char(face, 'M', FT_LOAD_DEFAULT)) { - fprintf(stderr, "Can't find M\n"); - exit(1); - } + if(FT_Load_Char(face, 'M', FT_LOAD_DEFAULT)) + error("Can't find M\n"); il = ascent - (face->glyph->metrics.height >> 6); /* Hack: Courier has no internal leading, nor do any Chinese fonts */ @@ -344,10 +353,8 @@ int main(int argc, char **argv) def_char = atoi(argv[5]); avg_width = atoi(argv[6]); - if(FT_Init_FreeType(&lib)) { - fprintf(stderr, "ft init failure\n"); - exit(1); - } + if(FT_Init_FreeType(&lib)) + error("ft init failure\n"); if(FT_New_Face(lib, argv[1], 0, &face)) { fprintf(stderr, "Can't open face\n");

1 0

appdb/xinha dialog.js htmlarea.css htmlarea.js ...
by WineHQ Dec. 7, 2005

Dec. 7, 2005

ChangeSet ID: 21712 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/12/06 21:37:40 Modified files: xinha : dialog.js htmlarea.css htmlarea.js inline-dialog.js panel-dialog.js popupwin.js xinha/contrib : lc_parse_strings.php xinha/examples : custom.css dynamic.css full_example-body.html full_example-menu.html full_example.css full_example.html full_example.js stylist.css xinha/lang : de.js fr.js no.js xinha/plugins/CSS: css.js xinha/plugins/CharCounter: char-counter.js xinha/plugins/CharCounter/lang: de.js fr.js no.js xinha/plugins/CharacterMap: character-map.js xinha/plugins/CharacterMap/lang: de.js fr.js it.js nl.js no.js xinha/plugins/CharacterMap/popups: select_character.html xinha/plugins/ContextMenu: context-menu.js xinha/plugins/ContextMenu/lang: de.js el.js fr.js he.js nl.js no.js pl.js xinha/plugins/DoubleClick: double-click.js xinha/plugins/DynamicCSS: dynamiccss.js xinha/plugins/DynamicCSS/lang: de.js fr.js nl.js no.js xinha/plugins/EnterParagraphs: enter-paragraphs.js xinha/plugins/FindReplace: find-replace.js fr_engine.js xinha/plugins/FindReplace/lang: de.js fr.js no.js pl.js pt_br.js xinha/plugins/FindReplace/popups: find_replace.html xinha/plugins/Forms: forms.js xinha/plugins/Forms/popups: fieldset.html form.html input.html label.html select.html textarea.html xinha/plugins/FullPage: full-page.js xinha/plugins/FullPage/lang: de.js fr.js he.js nl.js no.js pl.js ro.js xinha/plugins/FullPage/popups: docprop.html xinha/plugins/FullScreen: full-screen.js xinha/plugins/FullScreen/lang: de.js fr.js no.js pl.js xinha/plugins/HtmlTidy: html-tidy-logic.php html-tidy.js xinha/plugins/HtmlTidy/lang: de.js fr.js nl.js no.js xinha/plugins/InsertAnchor: insert-anchor.js xinha/plugins/InsertAnchor/lang: de.js fr.js no.js xinha/plugins/InsertAnchor/popups: insert_anchor.html xinha/plugins/InsertPicture: InsertPicture.php insert-picture.js viewpicture.html xinha/plugins/InsertPicture/lang: de.js xinha/plugins/InsertWords: insert-words.js xinha/plugins/Linker: linker.js xinha/plugins/Linker/dTree: dtree.js xinha/plugins/Linker/lang: de.js fr.js no.js pl.js xinha/plugins/ListType: list-type.js xinha/plugins/ListType/lang: de.js fr.js nl.js pl.js xinha/plugins/QuickTag: quick-tag.js xinha/plugins/QuickTag/lang: no.js pt_br.js xinha/plugins/QuickTag/popups: quicktag.html xinha/plugins/SpellChecker: aspell_setup.php spell-check-logic.cgi spell-check-logic.php spell-check-ui.html spell-check-ui.js spell-checker.js xinha/plugins/SpellChecker/lang: cz.js da.js de.js fr.js he.js hu.js nl.js no.js ro.js xinha/plugins/Stylist: stylist.js xinha/plugins/Stylist/lang: de.js no.js xinha/plugins/SuperClean: dialog.html super-clean.js xinha/plugins/SuperClean/img: ed_superclean.gif xinha/plugins/SuperClean/lang: de.js fr.js no.js xinha/plugins/TableOperations: table-operations.js xinha/plugins/TableOperations/lang: cz.js da.js de.js el.js fi.js fr.js he.js it.js nl.js no.js ro.js xinha/plugins/UnFormat: un-format.js xinha/plugins/UnFormat/lang: de.js nl.js no.js xinha/plugins/UnFormat/popups: unformat.html xinha/popups : about.html color_picker.js editor_help.html insert_image.html insert_table.html link.html popup.js xinha/skins/blue-look: skin.css xinha/skins/blue-metallic: skin.css xinha/skins/green-look: skin.css xinha/skins/inditreuse: skin.css xinha/skins/titan: skin.css xinha/skins/xp-blue: skin.css xinha/skins/xp-green: skin.css Added files: xinha/examples : Extended.html ext_example-body.html ext_example-dest.php ext_example-menu.php ext_example.html xinha/plugins/InsertAnchor/lang: pl.js xinha/plugins/InsertPicture/lang: fr.js no.js xinha/plugins/ListType/lang: no.js xinha/plugins/QuickTag/lang: fr.js pl.js xinha/plugins/Stylist/lang: fr.js pl.js xinha/plugins/TableOperations/lang: pl.js xinha/plugins/UnFormat/lang: fr.js Removed files: xinha : popupdiv.js Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Upgrade to xinha svn head to fix issues with xinha editors not appearing in Firefox 1.5 Patch: http://cvs.winehq.org/patch.py?id=21712 Old revision New revision Changes Path 1.1 1.2 +5 -5 appdb/xinha/dialog.js 1.1 1.2 +1 -6 appdb/xinha/htmlarea.css 1.1 1.2 +245 -175 appdb/xinha/htmlarea.js 1.1 1.2 +11 -11 appdb/xinha/inline-dialog.js 1.1 1.2 +6 -6 appdb/xinha/panel-dialog.js 1.1 1.2 +3 -3 appdb/xinha/popupwin.js 1.1 Removed +0 -0 appdb/xinha/popupdiv.js 1.1 1.2 +15 -12 appdb/xinha/contrib/lc_parse_strings.php 1.1 1.2 +1 -1 appdb/xinha/examples/custom.css 1.1 1.2 +1 -1 appdb/xinha/examples/dynamic.css 1.1 1.2 +1 -1 appdb/xinha/examples/full_example-body.html 1.1 1.2 +29 -3 appdb/xinha/examples/full_example-menu.html 1.1 1.2 +1 -1 appdb/xinha/examples/full_example.css 1.1 1.2 +1 -1 appdb/xinha/examples/full_example.html 1.1 1.2 +10 -5 appdb/xinha/examples/full_example.js 1.1 1.2 +1 -1 appdb/xinha/examples/stylist.css Added 1.1 +0 -0 appdb/xinha/examples/Extended.html Added 1.1 +0 -0 appdb/xinha/examples/ext_example-body.html Added 1.1 +0 -0 appdb/xinha/examples/ext_example-dest.php Added 1.1 +0 -0 appdb/xinha/examples/ext_example-menu.php Added 1.1 +0 -0 appdb/xinha/examples/ext_example.html 1.1 1.2 +145 -135 appdb/xinha/lang/de.js 1.1 1.2 +3 -2 appdb/xinha/lang/fr.js 1.1 1.2 +10 -2 appdb/xinha/lang/no.js 1.1 1.2 +3 -3 appdb/xinha/plugins/CSS/css.js 1.1 1.2 +8 -6 appdb/xinha/plugins/CharCounter/char-counter.js 1.1 1.2 +2 -8 appdb/xinha/plugins/CharCounter/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharCounter/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/CharCounter/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/CharacterMap/character-map.js 1.1 1.2 +0 -3 appdb/xinha/plugins/CharacterMap/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/CharacterMap/lang/fr.js 1.1 1.2 +3 -7 appdb/xinha/plugins/CharacterMap/lang/it.js 1.1 1.2 +1 -4 appdb/xinha/plugins/CharacterMap/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/CharacterMap/lang/no.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharacterMap/popups/select_character.html 1.1 1.2 +9 -9 appdb/xinha/plugins/ContextMenu/context-menu.js 1.1 1.2 +2 -6 appdb/xinha/plugins/ContextMenu/lang/de.js 1.1 1.2 +1 -3 appdb/xinha/plugins/ContextMenu/lang/el.js 1.1 1.2 +1 -1 appdb/xinha/plugins/ContextMenu/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ContextMenu/lang/he.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ContextMenu/lang/nl.js 1.1 1.2 +1 -3 appdb/xinha/plugins/ContextMenu/lang/no.js 1.1 1.2 +1 -2 appdb/xinha/plugins/ContextMenu/lang/pl.js 1.1 1.2 +2 -2 appdb/xinha/plugins/DoubleClick/double-click.js 1.1 1.2 +6 -6 appdb/xinha/plugins/DynamicCSS/dynamiccss.js 1.1 1.2 +1 -4 appdb/xinha/plugins/DynamicCSS/lang/de.js 1.1 1.2 +1 -9 appdb/xinha/plugins/DynamicCSS/lang/fr.js 1.1 1.2 +1 -4 appdb/xinha/plugins/DynamicCSS/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/DynamicCSS/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/EnterParagraphs/enter-paragraphs.js 1.1 1.2 +2 -2 appdb/xinha/plugins/FindReplace/find-replace.js 1.1 1.2 +8 -8 appdb/xinha/plugins/FindReplace/fr_engine.js 1.1 1.2 +21 -32 appdb/xinha/plugins/FindReplace/lang/de.js 1.1 1.2 +20 -20 appdb/xinha/plugins/FindReplace/lang/fr.js 1.1 1.2 +20 -21 appdb/xinha/plugins/FindReplace/lang/no.js 1.1 1.2 +21 -32 appdb/xinha/plugins/FindReplace/lang/pl.js 1.1 1.2 +24 -32 appdb/xinha/plugins/FindReplace/lang/pt_br.js 1.1 1.2 +5 -5 appdb/xinha/plugins/FindReplace/popups/find_replace.html 1.1 1.2 +6 -6 appdb/xinha/plugins/Forms/forms.js 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/fieldset.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/form.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/input.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/label.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/select.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/textarea.html 1.1 1.2 +11 -10 appdb/xinha/plugins/FullPage/full-page.js 1.1 1.2 +4 -15 appdb/xinha/plugins/FullPage/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/FullPage/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/he.js 1.1 1.2 +10 -21 appdb/xinha/plugins/FullPage/lang/nl.js 1.1 1.2 +4 -2 appdb/xinha/plugins/FullPage/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/pl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/ro.js 1.1 1.2 +3 -3 appdb/xinha/plugins/FullPage/popups/docprop.html 1.1 1.2 +2 -2 appdb/xinha/plugins/FullScreen/full-screen.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullScreen/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/FullScreen/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/FullScreen/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullScreen/lang/pl.js 1.1 1.2 +16 -5 appdb/xinha/plugins/HtmlTidy/html-tidy-logic.php 1.1 1.2 +3 -3 appdb/xinha/plugins/HtmlTidy/html-tidy.js 1.1 1.2 +3 -13 appdb/xinha/plugins/HtmlTidy/lang/de.js 1.1 1.2 +5 -14 appdb/xinha/plugins/HtmlTidy/lang/fr.js 1.1 1.2 +2 -13 appdb/xinha/plugins/HtmlTidy/lang/nl.js 1.1 1.2 +3 -3 appdb/xinha/plugins/HtmlTidy/lang/no.js 1.1 1.2 +97 -97 appdb/xinha/plugins/InsertAnchor/insert-anchor.js 1.1 1.2 +1 -3 appdb/xinha/plugins/InsertAnchor/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/InsertAnchor/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/InsertAnchor/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertAnchor/lang/pl.js 1.1 1.2 +5 -6 appdb/xinha/plugins/InsertAnchor/popups/insert_anchor.html 1.1 1.2 +7 -7 appdb/xinha/plugins/InsertPicture/InsertPicture.php 1.1 1.2 +1 -1 appdb/xinha/plugins/InsertPicture/insert-picture.js 1.1 1.2 +10 -10 appdb/xinha/plugins/InsertPicture/viewpicture.html 1.1 1.2 +6 -11 appdb/xinha/plugins/InsertPicture/lang/de.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/no.js 1.1 1.2 +2 -3 appdb/xinha/plugins/InsertWords/insert-words.js 1.1 1.2 +13 -14 appdb/xinha/plugins/Linker/linker.js 1.1 1.2 +8 -9 appdb/xinha/plugins/Linker/dTree/dtree.js 1.1 1.2 +3 -4 appdb/xinha/plugins/Linker/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Linker/lang/no.js 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/lang/pl.js 1.1 1.2 +1 -1 appdb/xinha/plugins/ListType/list-type.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/ListType/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/nl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/pl.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/QuickTag/quick-tag.js 1.1 1.2 +1 -2 appdb/xinha/plugins/QuickTag/lang/no.js 1.1 1.2 +11 -11 appdb/xinha/plugins/QuickTag/lang/pt_br.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/pl.js 1.1 1.2 +13 -13 appdb/xinha/plugins/QuickTag/popups/quicktag.html 1.1 1.2 +44 -11 appdb/xinha/plugins/SpellChecker/aspell_setup.php 1.1 1.2 +0 -0 appdb/xinha/plugins/SpellChecker/spell-check-logic.cgi 1.1 1.2 +1 -1 appdb/xinha/plugins/SpellChecker/spell-check-logic.php 1.1 1.2 +2 -2 appdb/xinha/plugins/SpellChecker/spell-check-ui.html 1.1 1.2 +21 -21 appdb/xinha/plugins/SpellChecker/spell-check-ui.js 1.1 1.2 +4 -4 appdb/xinha/plugins/SpellChecker/spell-checker.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/cz.js 1.1 1.2 +1 -11 appdb/xinha/plugins/SpellChecker/lang/da.js 1.1 1.2 +2 -4 appdb/xinha/plugins/SpellChecker/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/SpellChecker/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/he.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/hu.js 1.1 1.2 +2 -14 appdb/xinha/plugins/SpellChecker/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/SpellChecker/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/ro.js 1.1 1.2 +12 -12 appdb/xinha/plugins/Stylist/stylist.js 1.1 1.2 +1 -12 appdb/xinha/plugins/Stylist/lang/de.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Stylist/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/pl.js 1.1 1.2 +1 -25 appdb/xinha/plugins/SuperClean/dialog.html 1.1 1.2 +147 -43 appdb/xinha/plugins/SuperClean/super-clean.js 1.1 1.2 +1 -3 appdb/xinha/plugins/SuperClean/img/ed_superclean.gif 1.1 1.2 +3 -13 appdb/xinha/plugins/SuperClean/lang/de.js 1.1 1.2 +4 -15 appdb/xinha/plugins/SuperClean/lang/fr.js 1.1 1.2 +3 -3 appdb/xinha/plugins/SuperClean/lang/no.js 1.1 1.2 +38 -28 appdb/xinha/plugins/TableOperations/table-operations.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/cz.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/da.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/de.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/el.js 1.1 1.2 +1 -2 appdb/xinha/plugins/TableOperations/lang/fi.js 1.1 1.2 +1 -13 appdb/xinha/plugins/TableOperations/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/he.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/it.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/nl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/ro.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/pl.js 1.1 1.2 +4 -4 appdb/xinha/plugins/UnFormat/un-format.js 1.1 1.2 +9 -7 appdb/xinha/plugins/UnFormat/lang/de.js 1.1 1.2 +9 -7 appdb/xinha/plugins/UnFormat/lang/nl.js 1.1 1.2 +8 -9 appdb/xinha/plugins/UnFormat/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/UnFormat/lang/fr.js 1.1 1.2 +4 -4 appdb/xinha/plugins/UnFormat/popups/unformat.html 1.1 1.2 +1 -0 appdb/xinha/popups/about.html 1.1 1.2 +4 -4 appdb/xinha/popups/color_picker.js 1.1 1.2 +52 -7 appdb/xinha/popups/editor_help.html 1.1 1.2 +5 -5 appdb/xinha/popups/insert_image.html 1.1 1.2 +4 -4 appdb/xinha/popups/insert_table.html 1.1 1.2 +6 -6 appdb/xinha/popups/link.html 1.1 1.2 +8 -8 appdb/xinha/popups/popup.js 1.1 1.2 +1 -0 appdb/xinha/skins/blue-look/skin.css 1.1 1.2 +3 -2 appdb/xinha/skins/blue-metallic/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/green-look/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/inditreuse/skin.css 1.1 1.2 +11 -5 appdb/xinha/skins/titan/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/xp-blue/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/xp-green/skin.css

1 0

Robert Shearman : OLE: Implement ITypeInfo_AddressOfMember.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1f68feeef11f4c64cc55b4ceb3a9040fdf8ac551 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f68feeef11f4c64cc55b4c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:24:45 2005 +0100 OLE: Implement ITypeInfo_AddressOfMember. --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ebf1903..5ed9a82 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5671,7 +5671,53 @@ static HRESULT WINAPI ITypeInfo_fnAddres MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - FIXME("(%p) stub!\n", This); + HRESULT hr; + BSTR dll, entry; + WORD ordinal; + HMODULE module; + + TRACE("(%p)->(0x%lx, 0x%x, %p)\n", This, memid, invKind, ppv); + + hr = ITypeInfo_GetDllEntry(iface, memid, invKind, &dll, &entry, &ordinal); + if (FAILED(hr)) + return hr; + + module = LoadLibraryW(dll); + if (!module) + { + ERR("couldn't load %s\n", debugstr_w(dll)); + SysFreeString(dll); + if (entry) SysFreeString(entry); + return STG_E_FILENOTFOUND; + } + /* FIXME: store library somewhere where we can free it */ + + if (entry) + { + LPSTR entryA; + INT len = WideCharToMultiByte(CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL); + entryA = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, entry, -1, entryA, len, NULL, NULL); + + *ppv = GetProcAddress(module, entryA); + if (!*ppv) + ERR("function not found %s\n", debugstr_a(entryA)); + + HeapFree(GetProcessHeap(), 0, entryA); + } + else + { + *ppv = GetProcAddress(module, MAKEINTRESOURCEA(ordinal)); + if (!*ppv) + ERR("function not found %d\n", ordinal); + } + + SysFreeString(dll); + if (entry) SysFreeString(entry); + + if (!*ppv) + return TYPE_E_DLLFUNCTIONNOTFOUND; + return S_OK; }

1 0

Robert Shearman : OLE: Implement undocumented behaviour in DispCallFunc.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: a056a9a89cc42fc445fc8c5bf24ac73dbf71b81e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a056a9a89cc42fc445fc8c5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:25:51 2005 +0100 OLE: Implement undocumented behaviour in DispCallFunc. Fix DispCallFunc to work with MSDN-undocumented behaviour used by Office 2003 and document the function. --- dlls/oleaut32/typelib.c | 68 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5ed9a82..a6e2495 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5173,6 +5173,45 @@ static HRESULT typedescvt_to_variantvt(I /*********************************************************************** * DispCallFunc (OLEAUT32.@) + * + * Invokes a function of the specifed calling convention, passing the + * specified arguments and returns the result. + * + * PARAMS + * pvInstance [I] Optional pointer to the instance whose function to invoke. + * oVft [I] The offset in the vtable. See notes. + * cc [I] Calling convention of the function to call. + * vtReturn [I] The return type of the function. + * cActuals [I] Number of parameters. + * prgvt [I] The types of the parameters to pass. This is used for sizing only. + * prgpvarg [I] The arguments to pass. + * pvargResult [O] The return value of the function. Can be NULL. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * NOTES + * The HRESULT return value of this function is not affected by the return + * value of the user supplied function, which is returned in pvargResult. + * + * If pvInstance is NULL then a non-object function is to be called and oVft + * is the address of the function to call. + * + * The cc parameter can be one of the following values: + *|CC_FASTCALL + *|CC_CDECL + *|CC_PASCAL + *|CC_STDCALL + *|CC_FPFASTCALL + *|CC_SYSCALL + *|CC_MPWCDECL + *|CC_MPWPASCAL + * + * BUGS + * Native accepts arguments in the reverse order. I.e. the first item in the + * prgpvarg array is the last argument in the C/C++ declaration of the + * function to be called. */ HRESULT WINAPI DispCallFunc( @@ -5187,10 +5226,10 @@ DispCallFunc( pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); - /* DispCallFunc is only used to invoke methods belonging to an - * IDispatch-derived COM interface. So we need to add a first parameter - * to the list of arguments, to supply the interface pointer */ - argsize = 1; + argsize = 0; + if (pvInstance) + argsize++; /* for This pointer */ + for (i=0;i<cActuals;i++) { TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); @@ -5198,8 +5237,14 @@ DispCallFunc( argsize += _argsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); - args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */ - argspos = 1; + + argspos = 0; + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + argspos++; + } + for (i=0;i<cActuals;i++) { VARIANT *arg = prgpvarg[i]; @@ -5208,7 +5253,16 @@ DispCallFunc( argspos += _argsize(prgvt[i]); } - hres = _invoke((*(FARPROC**)pvInstance)[oVft/sizeof(void *)],cc,argsize,args); + if (pvInstance) + { + FARPROC *vtable = *(FARPROC**)pvInstance; + hres = _invoke(vtable[oVft/sizeof(void *)], cc, argsize, args); + } + else + /* if we aren't invoking an object then the function pointer is stored + * in oVft */ + hres = _invoke((FARPROC)oVft, cc, argsize, args); + if (pvargResult && (vtReturn != VT_EMPTY)) { TRACE("Method returned 0x%08lx\n",hres);

1 0

Robert Shearman : OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: b0d8e06caf47a8e7aee32b89575f6740d1a39d7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0d8e06caf47a8e7aee32b8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:24:19 2005 +0100 OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix. Fix more fallout from dispinterface retval patch: make typelib marshaler use the internal function description so that it calls dispinterface functions with the correct number of parameters again. Also fixes some memory leaks caused by the fact that a corresponding ReleaseXDesc function has to be called for each GetXDesc. --- dlls/oleaut32/tmarshal.c | 16 +++++++++------- dlls/oleaut32/typelib.c | 38 +++++++++++++++++++++++++++----------- dlls/oleaut32/typelib.h | 2 ++ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0886fc3..50a9135 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -304,12 +304,12 @@ _get_typeinfo_for_iid(REFIID riid, IType */ static int _nroffuncs(ITypeInfo *tinfo) { int n, max = 0; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; n=0; while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo,n,&fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,n,&fdesc); if (hres) return max+1; if (fdesc->oVft/4 > max) @@ -1053,6 +1053,7 @@ deserialize_param( (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), buf ); + ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc); if (debugout && (i<tattr->cVars-1)) TRACE_(olerelay)(","); } if (debugout) TRACE_(olerelay)("}"); @@ -1108,7 +1109,7 @@ deserialize_param( /* Searches function, also in inherited interfaces */ static HRESULT _get_funcdesc( - ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, FUNCDESC **fdesc, BSTR *iname, BSTR *fname) + ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, BSTR *iname, BSTR *fname) { int i = 0, j = 0; HRESULT hres; @@ -1120,7 +1121,8 @@ _get_funcdesc( ITypeInfo_AddRef(*tactual); while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo, i, fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc); + if (hres) { ITypeInfo *tinfo2; HREFTYPE href; @@ -1164,7 +1166,7 @@ static DWORD xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) { DWORD *args = ((DWORD*)&tpinfo)+1, *xargs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; int i, relaydeb = TRACE_ON(olerelay); marshal_state buf; @@ -1451,7 +1453,7 @@ PSFacBuf_CreateProxy( HRESULT hres; ITypeInfo *tinfo; int i, nroffuncs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMProxyImpl *proxy; TYPEATTR *typeattr; @@ -1647,7 +1649,7 @@ TMStubImpl_Invoke( LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf) { int i; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMStubImpl *This = (TMStubImpl *)iface; HRESULT hres; DWORD *args, res, *xargs, nrofargs; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b2f417e..ebf1903 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4489,6 +4489,24 @@ static HRESULT TLB_AllocAndInitFuncDesc( return S_OK; } +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const TLBFuncDesc *pFDesc; + int i; + + for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) + ; + + if (pFDesc) + { + *ppFuncDesc = &pFDesc->funcdesc; + return S_OK; + } + + return E_INVALIDARG; +} + /* ITypeInfo::GetFuncDesc * * Retrieves the FUNCDESC structure that contains information about a @@ -4499,21 +4517,19 @@ static HRESULT WINAPI ITypeInfo_fnGetFun LPFUNCDESC *ppFuncDesc) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; - const TLBFuncDesc *pFDesc; + const FUNCDESC *internal_funcdesc; + HRESULT hr; TRACE("(%p) index %d\n", This, index); - for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) - ; - - if(pFDesc) - return TLB_AllocAndInitFuncDesc( - &pFDesc->funcdesc, - ppFuncDesc, - This->TypeAttr.typekind == TKIND_DISPATCH); + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc); + if (FAILED(hr)) + return hr; - return E_INVALIDARG; + return TLB_AllocAndInitFuncDesc( + internal_funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); } static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 3bb6811..c286fae 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -600,6 +600,8 @@ WORD typeofarray #include "poppack.h" +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ); + extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); extern void dump_Variant(const VARIANT * pvar);

1 0

Robert Shearman : OLE: Add tests for the typelib version of ITypeComp_Bind.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 36f112973e0eb08204e984f03f3656002f8416b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36f112973e0eb08204e984f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:23:19 2005 +0100 OLE: Add tests for the typelib version of ITypeComp_Bind. --- dlls/oleaut32/tests/typelib.c | 158 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5e48ece..e70538c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "oleauto.h" +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", hr) + static void ref_count_test(LPCWSTR type_lib) { ITypeLib *iface; @@ -56,8 +58,164 @@ static void ref_count_test(LPCWSTR type_ ok(ITypeLib_Release(iface) == 0, "ITypeLib should be destroyed here.\n"); } +static void test_TypeComp(void) +{ + ITypeLib *pTypeLib; + ITypeComp *pTypeComp; + HRESULT hr; + ULONG ulHash; + DESCKIND desckind; + BINDPTR bindptr; + ITypeInfo *pTypeInfo; + static WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + static WCHAR wszStdFunctions[] = {'S','t','d','F','u','n','c','t','i','o','n','s',0}; + static WCHAR wszSavePicture[] = {'S','a','v','e','P','i','c','t','u','r','e',0}; + static WCHAR wszOLE_TRISTATE[] = {'O','L','E','_','T','R','I','S','T','A','T','E',0}; + static WCHAR wszUnchecked[] = {'U','n','c','h','e','c','k','e','d',0}; + static WCHAR wszIUnknown[] = {'I','U','n','k','n','o','w','n',0}; + static WCHAR wszFont[] = {'F','o','n','t',0}; + static WCHAR wszGUID[] = {'G','U','I','D',0}; + static WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; + static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; + + hr = LoadTypeLib(wszStdOle2, &pTypeLib); + ok_ole_success(hr, LoadTypeLib); + + hr = ITypeLib_GetTypeComp(pTypeLib, &pTypeComp); + ok_ole_success(hr, ITypeLib_GetTypeComp); + + /* test getting a TKIND_MODULE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdFunctions); + hr = ITypeComp_Bind(pTypeComp, wszStdFunctions, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + ITypeComp_Release(bindptr.lptcomp); + + /* test getting a TKIND_MODULE with INVOKE_PROPERTYGET */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdFunctions); + hr = ITypeComp_Bind(pTypeComp, wszStdFunctions, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + /* test getting a function within a TKIND_MODULE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); + hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_FUNCDESC, + "desckind should have been DESCKIND_FUNCDESC instead of %d\n", + desckind); + ok(bindptr.lpfuncdesc != NULL, "bindptr.lpfuncdesc should not have been set to NULL\n"); + ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); + ITypeInfo_Release(pTypeInfo); + + /* test getting a function within a TKIND_MODULE with INVOKE_PROPERTYGET */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); + hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); + todo_wine ok(hr == TYPE_E_TYPEMISMATCH, + "ITypeComp_Bind should have failed with TYPE_E_TYPEMISMATCH instead of 0x%08lx\n", + hr); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_ENUM */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszOLE_TRISTATE); + hr = ITypeComp_Bind(pTypeComp, wszOLE_TRISTATE, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + ITypeComp_Release(bindptr.lptcomp); + + /* test getting a value within a TKIND_ENUM */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszUnchecked); + hr = ITypeComp_Bind(pTypeComp, wszUnchecked, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_VARDESC, + "desckind should have been DESCKIND_VARDESC instead of %d\n", + desckind); + ITypeInfo_ReleaseVarDesc(pTypeInfo, bindptr.lpvardesc); + ITypeInfo_Release(pTypeInfo); + + /* test getting a TKIND_INTERFACE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszIUnknown); + hr = ITypeComp_Bind(pTypeComp, wszIUnknown, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_DISPATCH */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszFont); + hr = ITypeComp_Bind(pTypeComp, wszFont, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_RECORD/TKIND_ALIAS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + hr = ITypeComp_Bind(pTypeComp, wszGUID, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_ALIAS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszOLE_COLOR); + hr = ITypeComp_Bind(pTypeComp, wszOLE_COLOR, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_COCLASS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdPicture); + hr = ITypeComp_Bind(pTypeComp, wszStdPicture, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + ITypeComp_Release(pTypeComp); + ITypeLib_Release(pTypeLib); +} + START_TEST(typelib) { static const WCHAR type_lib_stdole32[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0}; ref_count_test(type_lib_stdole32); + test_TypeComp(); }

1 0

Robert Shearman : OLE: Update the type of the oVft parameter for DispCallFunc.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 806cdce355428b2cbdb8e926fab06d9288e2323e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=806cdce355428b2cbdb8e92… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:23:09 2005 +0100 OLE: Update the type of the oVft parameter for DispCallFunc. --- dlls/oleaut32/typelib.c | 2 +- include/oleauto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5c1d6c8..b2f417e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5160,7 +5160,7 @@ static HRESULT typedescvt_to_variantvt(I */ HRESULT WINAPI DispCallFunc( - void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, + void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { int i, argsize, argspos; diff --git a/include/oleauto.h b/include/oleauto.h index 3317b81..e74882b 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -715,7 +715,7 @@ HRESULT WINAPI DispInvoke(void*,ITypeInf EXCEPINFO*,UINT*); HRESULT WINAPI CreateDispTypeInfo(INTERFACEDATA*,LCID,ITypeInfo**); HRESULT WINAPI CreateStdDispatch(IUnknown*,void*,ITypeInfo*,IUnknown**); -HRESULT WINAPI DispCallFunc(void*,ULONG,CALLCONV,VARTYPE,UINT,VARTYPE*, +HRESULT WINAPI DispCallFunc(void*,ULONG_PTR,CALLCONV,VARTYPE,UINT,VARTYPE*, VARIANTARG**,VARIANT*);

1 0

Detlef Riekenberg : c2man: Remove HTML warnings.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 2c5fee9c582ebb7d80ff0fc4f7fb516ca411f8d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c5fee9c582ebb7d80ff0fc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 21:22:28 2005 +0100 c2man: Remove HTML warnings. --- tools/c2man.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 8d11d1c..7797e0c 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1388,7 +1388,7 @@ sub output_api_section_start($$) if ($opt_output_format eq "h") { - print OUTPUT "\n<h2 class=\"section\">",$section_name,"</h2>\n"; + print OUTPUT "\n<h2 class=\"section\">",$section_name,"</h2>\n"; } elsif ($opt_output_format eq "s") { @@ -1447,7 +1447,7 @@ sub output_api_synopsis($) if ($opt_output_format eq "h") { - print OUTPUT "<pre class=\"proto\">\n ", $comment->{RETURNS}," ",$comment->{COMMENT_NAME},"\n (\n"; + print OUTPUT "<pre class=\"proto\">\n ", $comment->{RETURNS}," ",$comment->{COMMENT_NAME},"\n (\n"; @fmt = ("", "\n", "<tt class=\"param\">", "</tt>"); } elsif ($opt_output_format eq "s") @@ -1502,7 +1502,7 @@ sub output_api_synopsis($) if ($opt_output_format eq "h") { - print OUTPUT " )\n\n</pre>\n"; + print OUTPUT " )\n</pre>\n"; } elsif ($opt_output_format eq "s") {

1 0

Kai Blin : secur32: Implementing AcquireCredentialsHandle(A|W) for the NTLM
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 79aff338a3e32313502daf2487f9da81c83d3934 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79aff338a3e32313502daf2… Author: Kai Blin <blin(a)gmx.net> Date: Tue Dec 6 21:22:57 2005 +0100 secur32: Implementing AcquireCredentialsHandle(A|W) for the NTLM security provider. --- dlls/secur32/Makefile.in | 2 dlls/secur32/ntlm.c | 445 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 366 insertions(+), 81 deletions(-)

1 0

Robert Reif : winejack: Fix driver load and initialization.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 18441ac0273247e8f837be840c166023b2853cbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18441ac0273247e8f837be8… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 21:22:08 2005 +0100 winejack: Fix driver load and initialization. Move wave in/out initialization from wave out to driver. Add index number to device names. Fix memset bug where only first wave in caps was zeroed. --- dlls/winmm/winejack/audio.c | 25 ++++++++----------------- dlls/winmm/winejack/jack.c | 4 +++- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c index 2ef0acb..146d0bc 100644 --- a/dlls/winmm/winejack/audio.c +++ b/dlls/winmm/winejack/audio.c @@ -890,9 +890,7 @@ LONG JACK_WaveRelease(void) LONG JACK_WaveInit(void) { int i; - - static const WCHAR ini_out[] = {'J','A','C','K',' ','W','a','v','e','O','u','t',' ','D','r','i','v','e','r',0}; - static const WCHAR ini_in [] = {'J','A','C','K',' ','W','a','v','e','I','n',' ',' ','D','r','i','v','e','r',0}; + CHAR szPname[MAXPNAMELEN]; TRACE("called\n"); @@ -930,8 +928,8 @@ LONG JACK_WaveInit(void) WOutDev[i].caps.wMid = 0x00FF; /* Manufac ID */ WOutDev[i].caps.wPid = 0x0001; /* Product ID */ - strcpyW(WOutDev[i].caps.szPname, ini_out); - + snprintf(szPname, sizeof(szPname), "JACK WaveOut %d", i); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, WOutDev[i].caps.szPname, sizeof(WOutDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "winejack: %d", i); WOutDev[i].caps.vDriverVersion = 0x0100; @@ -959,12 +957,13 @@ LONG JACK_WaveInit(void) /* then do input device */ for (i = 0; i < MAX_WAVEINDRV; ++i) { - /* TODO: we should initialize read stuff here */ - memset(&WInDev[0].caps, 0, sizeof(WInDev[0].caps)); + /* TODO: we should initialize read stuff here */ + memset(&WInDev[i].caps, 0, sizeof(WInDev[i].caps)); WInDev[i].caps.wMid = 0x00FF; WInDev[i].caps.wPid = 0x0001; - strcpyW(WInDev[i].caps.szPname, ini_in); + snprintf(szPname, sizeof(szPname), "JACK WaveIn %d", i); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winejack: %d", i); WInDev[i].caps.vDriverVersion = 0x0100; @@ -1666,18 +1665,10 @@ DWORD WINAPI JACK_wodMessage(UINT wDevID switch (wMsg) { case DRVM_INIT: - TRACE("DRVM_INIT\n"); - return JACK_WaveInit(); case DRVM_EXIT: - TRACE("DRVM_EXIT\n"); - return JACK_WaveRelease(); case DRVM_ENABLE: - /* FIXME: Pretend this is supported */ - TRACE("DRVM_ENABLE\n"); - return 0; case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - TRACE("DRVM_DISABLE\n"); + /* FIXME: Pretend this is supported */ return 0; case WODM_OPEN: return wodOpen(wDevID, (LPWAVEOPENDESC)dwParam1, dwParam2); case WODM_CLOSE: return wodClose(wDevID); diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c index d5e12ba..c712634 100644 --- a/dlls/winmm/winejack/jack.c +++ b/dlls/winmm/winejack/jack.c @@ -66,7 +66,7 @@ static LRESULT JACK_drvLoad(void) } } - return 1; + return JACK_WaveInit(); } /************************************************************************** @@ -79,6 +79,8 @@ static LRESULT JACK_drvFree(void) if(jackhandle && (jackhandle != (void*)-1)) { + JACK_WaveRelease(); + TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL;

1 0

Eric Pouech : mciwave: save/record.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 9cba6ceacddcab2afd264a8c9c1c82c1bf73af17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cba6ceacddcab2afd264a8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 21:21:48 2005 +0100 mciwave: save/record. - fix for playback after a sound has been recorded - shall fix also opening the mci device without name - bug reported (and fix tested) by Peter Astrand --- dlls/winmm/mciwave/mciwave.c | 272 +++++++++++++++++++++--------------------- 1 files changed, 138 insertions(+), 134 deletions(-)

1 0

Eric Pouech : dbghelp: Final touch on StackWalk64 so that it works.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 7b11aacbae2aca90f8b1059795ee849c69b43523 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b11aacbae2aca90f8b1059… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 21:21:31 2005 +0100 dbghelp: Final touch on StackWalk64 so that it works. --- dlls/dbghelp/stack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index b393e89..3719542 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -492,6 +492,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_64to32(&frame64->AddrPC, &frame32.AddrPC); addr_64to32(&frame64->AddrReturn, &frame32.AddrReturn); + addr_64to32(&frame64->AddrFrame, &frame32.AddrFrame); addr_64to32(&frame64->AddrStack, &frame32.AddrStack); addr_64to32(&frame64->AddrBStore, &frame32.AddrBStore); frame32.FuncTableEntry = frame64->FuncTableEntry; /* FIXME */ @@ -513,6 +514,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_32to64(&frame32.AddrPC, &frame64->AddrPC); addr_32to64(&frame32.AddrReturn, &frame64->AddrReturn); + addr_32to64(&frame32.AddrFrame, &frame64->AddrFrame); addr_32to64(&frame32.AddrStack, &frame64->AddrStack); addr_32to64(&frame32.AddrBStore, &frame64->AddrBStore); frame64->FuncTableEntry = frame32.FuncTableEntry; /* FIXME */ @@ -523,7 +525,7 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp frame64->Reserved[2] = (ULONG)frame32.Reserved[2]; /* we don't handle KdHelp */ - return FALSE; + return ret; } /******************************************************************

1 0

Detlef Riekenberg : winspool: Document the monitor functions.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: a521947e3dc37e461ecc317bd75be400a405dc60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a521947e3dc37e461ecc317… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 11:33:52 2005 +0100 winspool: Document the monitor functions. --- dlls/winspool/info.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index a54fe32..f1d05c1 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1119,6 +1119,8 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinte /****************************************************************** * AddMonitorA [WINSPOOL.@] * + * See AddMonitorW. + * */ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) { @@ -1129,6 +1131,24 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWO /****************************************************************************** * AddMonitorW [WINSPOOL.@] + * + * Install a Printmonitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (Must be 2) + * pMonitors [I] PTR to MONITOR_INFO_2 + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) { @@ -1166,6 +1186,8 @@ DeletePrinterDriverW (LPWSTR pName, LPWS /****************************************************************** * DeleteMonitorA [WINSPOOL.@] * + * See DeleteMonitorW. + * */ BOOL WINAPI DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) @@ -1179,6 +1201,20 @@ DeleteMonitorA (LPSTR pName, LPSTR pEnvi /****************************************************************** * DeleteMonitorW [WINSPOOL.@] * + * Delete a specific Printmonitor from a Printing-Environment + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment of the Monitor or NULL (Default) + * pMonitorName [I] Name of the Monitor, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI DeleteMonitorW (LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) @@ -4837,6 +4873,8 @@ BOOL WINAPI EnumFormsW( HANDLE hPrinter, /***************************************************************************** * EnumMonitorsA [WINSPOOL.@] * + * See EnumMonitorsW. + * */ BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) @@ -4850,6 +4888,23 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, D /***************************************************************************** * EnumMonitorsW [WINSPOOL.@] * + * Enumerate available Monitors + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1:Win9x+NT or 2:NT only) + * pMonitors [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pMonitors + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pMonitors + * pcReturned [O] PTR to DWORD that receives the number of Monitors in pMonitors + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * + * BUGS + * only a Stub + * */ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)

1 0

Vincent Béron : Sort entries in win16.api and win32.api
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: e78997a7f9a7e80c551605cb6793d53837b3d033 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e78997a7f9a7e80c551605c… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Tue Dec 6 11:33:42 2005 +0100 Sort entries in win16.api and win32.api --- tools/winapi/win16.api | 221 +++++++++++++++++----------------- tools/winapi/win32.api | 314 ++++++++++++++++++++++++------------------------ 2 files changed, 267 insertions(+), 268 deletions(-)

1 0

Raphael Junqueira : x11drv: cleanup not longer used data on X11DRV_PDEVICE.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 7b5571cc8c3de9107f14e7406485dfe222fffcb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b5571cc8c3de9107f14e74… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Tue Dec 6 11:33:12 2005 +0100 x11drv: cleanup not longer used data on X11DRV_PDEVICE. --- dlls/x11drv/init.c | 2 -- dlls/x11drv/x11drv.h | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 9524c9b..69cfa02 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -164,8 +164,6 @@ BOOL X11DRV_DeleteDC( X11DRV_PDEVICE *ph DeleteObject( physDev->region ); wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); - while (physDev->used_visuals-- > 0) - XFree(physDev->visuals[physDev->used_visuals]); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index df6ed32..21b28d5 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -140,8 +140,6 @@ typedef struct int depth; /* bit depth of the DC */ int exposures; /* count of graphics exposures operations */ struct dce *dce; /* opaque pointer to DCE */ - XVisualInfo *visuals[MAX_PIXELFORMATS]; - int used_visuals; int current_pf; XRENDERINFO xrender; } X11DRV_PDEVICE;

1 0

Raphael Junqueira : x11drv: Add more useful traces on SetPixelFormat (and no more FIXME).
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 88cda5643d0a1278780843d865ba46ad35bb00a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88cda5643d0a1278780843d… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Tue Dec 6 11:33:33 2005 +0100 x11drv: Add more useful traces on SetPixelFormat (and no more FIXME). --- dlls/x11drv/opengl.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 8c49aa0..7660b0e 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -124,6 +124,7 @@ MAKE_FUNCPTR(glXChooseFBConfig) MAKE_FUNCPTR(glXGetFBConfigAttrib) MAKE_FUNCPTR(glXCreateGLXPixmap) MAKE_FUNCPTR(glXDestroyGLXPixmap) +/* MAKE_FUNCPTR(glXQueryDrawable) */ #undef MAKE_FUNCPTR static BOOL has_opengl(void) @@ -491,14 +492,35 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC GLXFBConfig cur_cfg; int value; int gl_test = 0; - + + /* + * How to test if hdc current drawable is compatible (visual/FBConfig) ? + * + * in case of root window created HDCs we crash here :( + * + Drawable drawable = get_drawable( physDev->hdc ); + TRACE(" drawable (%p,%p) have :\n", drawable, root_window); + pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &value); + TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_VISUAL_ID, (unsigned int*) &value); + TRACE(" - VISUAL_ID as 0x%x\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &value); + TRACE(" - WIDTH as %d\n", tmp); + pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &value); + TRACE(" - HEIGHT as %d\n", tmp); + */ cfgs_fmt = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &nCfgs_fmt); cur_cfg = cfgs_fmt[iPixelFormat - 1]; gl_test = pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_FBCONFIG_ID, &value); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); } else { - FIXME("have FBCONFIG_ID %x\n", value); + TRACE(" FBConfig have :\n"); + TRACE(" - FBCONFIG_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_VISUAL_ID, &value); + TRACE(" - VISUAL_ID 0x%x\n", value); + pglXGetFBConfigAttrib(gdi_display, cur_cfg, GLX_DRAWABLE_TYPE, &value); + TRACE(" - DRAWABLE_TYPE 0x%x\n", value); } XFree(cfgs_fmt); }

1 0

Louis Lenders : gdi: Added stub for AddFontMemResourceEx.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ca1c26b9d3afaa32437b09ed0d95e42c99ec0c2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca1c26b9d3afaa32437b09e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Dec 6 11:32:41 2005 +0100 gdi: Added stub for AddFontMemResourceEx. --- dlls/gdi/font.c | 9 +++++++++ dlls/gdi/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index 1b10ad9..f94bda1 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2883,6 +2883,15 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR } /*********************************************************************** + * AddFontMemResourceEx (GDI32.@) + */ +HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) +{ + FIXME("(%p,%08lx,%p,%p): stub\n", pbFont, cbFont, pdv, pcFonts); + return NULL; +} + +/*********************************************************************** * RemoveFontResourceExA (GDI32.@) */ BOOL WINAPI RemoveFontResourceExA( LPCSTR str, DWORD fl, PVOID pdv ) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index c52c458..c71adc6 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -7,7 +7,7 @@ @ stdcall AbortDoc(long) @ stdcall AbortPath(long) -# @ stub AddFontMemResourceEx +@ stdcall AddFontMemResourceEx(ptr long ptr ptr) @ stdcall AddFontResourceA(str) @ stdcall AddFontResourceExA(str long ptr) @ stdcall AddFontResourceExW(wstr long ptr)

1 0

Alexandre Julliard : mlang: Properly declare the interface uuids.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 9f55a518a20a0604d287a1038b6c95ea992d4d0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f55a518a20a0604d287a10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 11:32:17 2005 +0100 mlang: Properly declare the interface uuids. --- include/mlang.idl | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/mlang.idl b/include/mlang.idl index 397baa5..698d2e1 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -27,6 +27,7 @@ cpp_quote("#endif") [ object, + uuid(359f3443-bd4a-11d0-b188-00aa0038c969), pointer_default(unique) ] interface IMLangCodePages : IUnknown @@ -51,6 +52,7 @@ interface IMLangCodePages : IUnknown [ object, + uuid(359f3441-bd4a-11d0-b188-00aa0038c969), pointer_default(unique) ] interface IMLangFontLink : IMLangCodePages @@ -74,6 +76,7 @@ interface IMLangFontLink : IMLangCodePag [ object, + uuid(ae5f1430-388b-11d2-8380-00c04f8f5da1), pointer_default(unique) ] interface IEnumScript : IUnknown @@ -171,6 +174,7 @@ interface IEnumScript : IUnknown [ object, + uuid(275c23e3-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] interface IEnumCodePage : IUnknown @@ -270,6 +274,7 @@ interface IMLangConvertCharset : IUnknow [ object, + uuid(3dc39d1d-c030-11d0-b81b-00c04fc9b31f), pointer_default(unique) ] interface IEnumRfc1766 : IUnknown @@ -300,6 +305,7 @@ interface IEnumRfc1766 : IUnknown [ object, + uuid(275c23e1-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] interface IMultiLanguage : IUnknown @@ -379,6 +385,7 @@ interface IMultiLanguage : IUnknown [ object, + uuid(dccfc164-2b38-11d2-b7ec-00c04f8f5d9a), pointer_default(unique) ] interface IMultiLanguage2 : IUnknown @@ -564,11 +571,3 @@ cpp_quote("STDAPI IsConvertINetStringAva cpp_quote("STDAPI ConvertINetString(LPDWORD, DWORD, DWORD, LPCSTR, LPINT, LPSTR, LPINT);") cpp_quote("STDAPI ConvertINetMultiByteToUnicode(LPDWORD, DWORD, LPCSTR, LPINT, LPWSTR, LPINT);") cpp_quote("STDAPI ConvertINetUnicodeToMultiByte(LPDWORD, DWORD, LPCWSTR, LPINT, LPSTR, LPINT);") - -cpp_quote("DEFINE_GUID(IID_IMLangCodePages, 0x359F3443,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") -cpp_quote("DEFINE_GUID(IID_IMLangFontLink, 0x359F3441,0xBD4A,0x11D0,0xB1,0x88,0x00,0xAA,0x00,0x38,0xC9,0x69);") -cpp_quote("DEFINE_GUID(IID_IMultiLanguage2, 0xDCCFC164,0x2B38,0x11d2,0xB7,0xEC,0x00,0xC0,0x4F,0x8F,0x5D,0x9A);") -cpp_quote("DEFINE_GUID(IID_IMultiLanguage, 0x275c23e1,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") -cpp_quote("DEFINE_GUID(IID_IEnumCodePage, 0x275c23e3,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46);") -cpp_quote("DEFINE_GUID(IID_IEnumScript, 0xae5f1430,0x388b,0x11d2,0x83,0x80,0x00,0xc0,0x4f,0x8f,0x5d,0xa1);") -cpp_quote("DEFINE_GUID(IID_IEnumRfc1766, 0x3dc39d1d,0xc030,0x11d0,0xb8,0x1b,0x00,0xc0,0x4f,0xc9,0xb3,0x1f);")

1 0

Dmitry Timoshkov : mlang: Implement IEnumRfc1766 interface.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ef35d28999c330d746a95c57b6e5798554b75ba9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef35d28999c330d746a95c5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 6 10:58:57 2005 +0100 mlang: Implement IEnumRfc1766 interface. --- dlls/mlang/mlang.c | 246 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/mlang/tests/mlang.c | 29 +++++ include/mlang.idl | 4 + 3 files changed, 266 insertions(+), 13 deletions(-)

1 0

Robert Reif : winmm: Allow sound card driver to be opened more than once.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 3020d1a4ca442e9299dd2652912e96f1c2f3845f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3020d1a4ca442e9299dd265… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 10:58:38 2005 +0100 winmm: Allow sound card driver to be opened more than once. TRACE cleanups. --- dlls/winmm/winejack/jack.c | 84 ++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 54 deletions(-) diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c index 363c9fb..d5e12ba 100644 --- a/dlls/winmm/winejack/jack.c +++ b/dlls/winmm/winejack/jack.c @@ -38,9 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jack); #ifdef HAVE_JACK_JACK_H -static int jack = 0; - -/* set this to zero or one to enable or disable tracing in here */ #ifndef SONAME_LIBJACK #define SONAME_LIBJACK "libjack.so" @@ -53,17 +50,17 @@ void *jackhandle = NULL; */ static LRESULT JACK_drvLoad(void) { - TRACE("JACK_drvLoad()\n"); + TRACE("()\n"); /* dynamically load the jack library if not already loaded */ if(!jackhandle) { jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0); - TRACE("JACK_drvLoad: SONAME_LIBJACK == %s\n", SONAME_LIBJACK); - TRACE("JACK_drvLoad: jackhandle == %p\n", jackhandle); + TRACE("SONAME_LIBJACK == %s\n", SONAME_LIBJACK); + TRACE("jackhandle == %p\n", jackhandle); if(!jackhandle) { - FIXME("JACK_drvLoad: error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK); + FIXME("error loading the jack library %s, please install this library to use jack\n", SONAME_LIBJACK); jackhandle = (void*)-1; return 0; } @@ -78,11 +75,11 @@ static LRESULT JACK_drvLoad(void) /* unload the jack library on driver free */ static LRESULT JACK_drvFree(void) { - TRACE("JACK_drvFree()\n"); + TRACE("()\n"); if(jackhandle && (jackhandle != (void*)-1)) { - TRACE("JACK_drvFree: calling wine_dlclose() on jackhandle\n"); + TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL; } @@ -95,23 +92,15 @@ static LRESULT JACK_drvFree(void) */ static LRESULT JACK_drvOpen(LPSTR str) { + TRACE("(%s)\n", str); /* if we were unable to load the jack library then fail the */ /* driver open */ if(!jackhandle) { - FIXME("JACK_drvOpen: unable to open the jack library, returning 0\n"); + FIXME("unable to open the jack library, returning 0\n"); return 0; } - if (jack) - { - FIXME("JACK_drvOpen: jack != 0 (already open), returning 0\n"); - return 0; - } - - /* I know, this is ugly, but who cares... */ - TRACE("JACK_drvOpen: opened jack(set jack = 1), returning 1\n"); - jack = 1; return 1; } @@ -120,15 +109,8 @@ static LRESULT JACK_drvOpen(LPSTR str) */ static LRESULT JACK_drvClose(DWORD_PTR dwDevID) { - if (jack) - { - TRACE("JACK_drvClose: jack is nonzero, setting jack to 0 and returning 1\n"); - jack = 0; - return 1; - } - - TRACE("JACK_drvClose: jack is zero(closed), returning 0\n"); - return 0; + TRACE("(%08lx)\n", dwDevID); + return 1; } #endif /* #ifdef HAVE_JACK_JACK_H */ @@ -139,37 +121,31 @@ static LRESULT JACK_drvClose(DWORD_PTR d LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { -/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ -/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ + TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); switch(wMsg) { #ifdef HAVE_JACK_JACK_H - case DRV_LOAD: - TRACE("JACK_DriverProc: DRV_LOAD\n"); - return JACK_drvLoad(); - case DRV_FREE: - TRACE("JACK_DriverProc: DRV_FREE\n"); - return JACK_drvFree(); - case DRV_OPEN: - TRACE("JACK_DriverProc: DRV_OPEN\n"); - return JACK_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: - TRACE("JACK_DriverProc: DRV_CLOSE\n"); - return JACK_drvClose(dwDevID); - case DRV_ENABLE: - TRACE("JACK_DriverProc: DRV_ENABLE\n"); - return 1; - case DRV_DISABLE: - TRACE("JACK_DriverProc: DRV_DISABLE\n"); - return 1; + case DRV_LOAD: return JACK_drvLoad(); + case DRV_FREE: return JACK_drvFree(); + case DRV_OPEN: return JACK_drvOpen((LPSTR)dwParam1); + case DRV_CLOSE: return JACK_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; case DRV_QUERYCONFIGURE: return 1; case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1; - case DRV_INSTALL: - TRACE("JACK_DriverProc: DRV_INSTALL\n"); - return DRVCNF_RESTART; - case DRV_REMOVE: - TRACE("JACK_DriverProc: DRV_REMOVE\n"); - return DRVCNF_RESTART; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; #endif default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);

1 0

Robert Reif : winmm: Allow sound card drivers to be opened more than once.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ce4fdfdbcd8c502b17687085605a0d6641ef988c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce4fdfdbcd8c502b1768708… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 10:58:25 2005 +0100 winmm: Allow sound card drivers to be opened more than once. --- dlls/winmm/winealsa/alsa.c | 13 +------------ dlls/winmm/winearts/arts.c | 12 +----------- dlls/winmm/wineaudioio/audioio.c | 13 +------------ dlls/winmm/wineesd/esound.c | 12 +----------- dlls/winmm/winenas/nas.c | 12 +----------- dlls/winmm/wineoss/oss.c | 13 +------------ 6 files changed, 6 insertions(+), 69 deletions(-) diff --git a/dlls/winmm/winealsa/alsa.c b/dlls/winmm/winealsa/alsa.c index 06dc4bc..781d43c 100644 --- a/dlls/winmm/winealsa/alsa.c +++ b/dlls/winmm/winealsa/alsa.c @@ -32,18 +32,11 @@ #ifdef HAVE_ALSA -static struct WINE_ALSA* alsa = NULL; - /************************************************************************** * ALSA_drvOpen [internal] */ static LRESULT ALSA_drvOpen(LPSTR str) { - if (alsa) - return 0; - - /* I know, this is ugly, but who cares... */ - alsa = (struct WINE_ALSA*)1; return 1; } @@ -52,11 +45,7 @@ static LRESULT ALSA_drvOpen(LPSTR str) */ static LRESULT ALSA_drvClose(DWORD_PTR dwDevID) { - if (alsa) { - alsa = NULL; - return 1; - } - return 0; + return 1; } #endif diff --git a/dlls/winmm/winearts/arts.c b/dlls/winmm/winearts/arts.c index 36506db..7f9d1ac 100644 --- a/dlls/winmm/winearts/arts.c +++ b/dlls/winmm/winearts/arts.c @@ -33,18 +33,12 @@ #include "arts.h" #ifdef HAVE_ARTS -static int arts = 0; /************************************************************************** * ARTS_drvOpen [internal] */ static LRESULT ARTS_drvOpen(LPSTR str) { - if (arts) - return 0; - - /* I know, this is ugly, but who cares... */ - arts = 1; return 1; } @@ -53,11 +47,7 @@ static LRESULT ARTS_drvOpen(LPSTR str) */ static LRESULT ARTS_drvClose(DWORD_PTR dwDevID) { - if (arts) { - arts = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_ARTS */ diff --git a/dlls/winmm/wineaudioio/audioio.c b/dlls/winmm/wineaudioio/audioio.c index f946710..aa43c69 100644 --- a/dlls/winmm/wineaudioio/audioio.c +++ b/dlls/winmm/wineaudioio/audioio.c @@ -32,8 +32,6 @@ #ifdef HAVE_LIBAUDIOIO -static struct WINE_LIBAUDIOIO* audioio = NULL; - extern LONG LIBAUDIOIO_WaveInit(void); /************************************************************************** @@ -41,11 +39,6 @@ extern LONG LIBAUDIOIO_WaveInit(void); */ static LRESULT LIBAUDIOIO_drvOpen(LPSTR str) { - if (audioio) - return 0; - - /* I know, this is ugly, but who cares... */ - audioio = (struct WINE_LIBAUDIOIO*)1; return 1; } @@ -54,11 +47,7 @@ static LRESULT LIBAUDIOIO_drvOpen(LPSTR */ static LRESULT LIBAUDIOIO_drvClose(DWORD_PTR dwDevID) { - if (audioio) { - audioio = NULL; - return 1; - } - return 0; + return 1; } #endif diff --git a/dlls/winmm/wineesd/esound.c b/dlls/winmm/wineesd/esound.c index 702dbe5..091a8e4 100644 --- a/dlls/winmm/wineesd/esound.c +++ b/dlls/winmm/wineesd/esound.c @@ -34,18 +34,12 @@ #include "esound.h" #ifdef HAVE_ESD -static int esd = 0; /************************************************************************** * ESD_drvOpen [internal] */ static LRESULT ESD_drvOpen(LPSTR str) { - if (esd) - return 0; - - /* I know, this is ugly, but who cares... */ - esd = 1; return 1; } @@ -54,11 +48,7 @@ static LRESULT ESD_drvOpen(LPSTR str) */ static LRESULT ESD_drvClose(DWORD_PTR dwDevID) { - if (esd) { - esd = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_ESD */ diff --git a/dlls/winmm/winenas/nas.c b/dlls/winmm/winenas/nas.c index 9b7b026..02f3474 100644 --- a/dlls/winmm/winenas/nas.c +++ b/dlls/winmm/winenas/nas.c @@ -36,18 +36,12 @@ #include "nas.h" #ifdef HAVE_NAS -static int nas = 0; /************************************************************************** * NAS_drvOpen [internal] */ static LRESULT NAS_drvOpen(LPSTR str) { - if (nas) - return 0; - - /* I know, this is ugly, but who cares... */ - nas = 1; return 1; } @@ -56,11 +50,7 @@ static LRESULT NAS_drvOpen(LPSTR str) */ static LRESULT NAS_drvClose(DWORD_PTR dwDevID) { - if (nas) { - nas = 0; - return 1; - } - return 0; + return 1; } #endif /* #ifdef HAVE_NAS */ diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index d1437b5..8526f42 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -32,18 +32,11 @@ #ifdef HAVE_OSS -static struct WINE_OSS* oss = NULL; - /************************************************************************** * OSS_drvOpen [internal] */ static LRESULT OSS_drvOpen(LPSTR str) { - if (oss) - return 0; - - /* I know, this is ugly, but who cares... */ - oss = (struct WINE_OSS*)1; return 1; } @@ -52,11 +45,7 @@ static LRESULT OSS_drvOpen(LPSTR str) */ static LRESULT OSS_drvClose(DWORD_PTR dwDevID) { - if (oss) { - oss = NULL; - return 1; - } - return 0; + return 1; } #endif

1 0

Vincent Béron : Update win32.api to current git.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1f9fd44c3abb240e76bdcc6c6f86352085551aa3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f9fd44c3abb240e76bdcc6… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Tue Dec 6 10:58:07 2005 +0100 Update win32.api to current git. --- tools/winapi/win32.api | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9f81c13..f17edf1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3460,10 +3460,6 @@ IUnknown * IUnknown ** void * -%void - -void - %%riched32.dll %long

1 0

Robert Shearman : OLE: ITypeInfo_Invoke parameter naming change.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 3dd7ba394c8f4b9540ddf735c10ca36aa77619bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dd7ba394c8f4b9540ddf73… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 10:57:45 2005 +0100 OLE: ITypeInfo_Invoke parameter naming change. Rename the dwFlags parameter of ITypeInfo_Invoke since it is not a DWORD, but an unsigned short. --- dlls/oleaut32/typelib.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4d8a736..5c1d6c8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5208,7 +5208,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke ITypeInfo2 *iface, VOID *pIUnk, MEMBERID memid, - UINT16 dwFlags, + UINT16 wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, @@ -5221,15 +5221,15 @@ static HRESULT WINAPI ITypeInfo_fnInvoke HRESULT hres; const TLBFuncDesc *pFuncInfo; - TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", - This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr + TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p)\n", + This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); dump_DispParms(pDispParams); /* we do this instead of using GetFuncDesc since it will return a fake * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) - if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) + if (memid == pFuncInfo->funcdesc.memid && (wFlags & pFuncInfo->funcdesc.invkind)) break; if (pFuncInfo) { @@ -5395,7 +5395,7 @@ func_fail: if (SUCCEEDED(hres)) { FIXME("Calling Invoke in IDispatch iface. untested!\n"); hres = IDispatch_Invoke( - disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,dwFlags,pDispParams, + disp,memid,&IID_NULL,LOCALE_USER_DEFAULT,wFlags,pDispParams, pVarResult,pExcepInfo,pArgErr ); if (FAILED(hres)) @@ -5435,14 +5435,14 @@ func_fail: ITypeInfo *pTInfo; hres = ITypeInfo_GetRefTypeInfo(iface, ref_type, &pTInfo); if(SUCCEEDED(hres)){ - hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); + hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); ITypeInfo_Release(pTInfo); return hres; } WARN("Could not search inherited interface!\n"); } } - ERR("did not find member id %08lx, flags %d!\n", memid, dwFlags); + ERR("did not find member id %ld, flags 0x%x!\n", memid, wFlags); return DISP_E_MEMBERNOTFOUND; }

1 0

Robert Shearman : OLE: Fix a typo where brackets were missing.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: ef8ae2d763bbaadc3d4a43471a5e12e5943bc56a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef8ae2d763bbaadc3d4a434… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 10:57:58 2005 +0100 OLE: Fix a typo where brackets were missing. --- dlls/ole32/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index b50c594..d87b478 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -624,7 +624,7 @@ static HRESULT create_server(REFCLSID rc HKEY key; HRESULT hres; WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; - DWORD size = MAX_PATH+1 * sizeof(WCHAR); + DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo;

1 0

Jacek Caban : shdocvw: Added get_Document implementation.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 5ba7b1778c1b42a5ea7f5c250d6f530117971e41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ba7b1778c1b42a5ea7f5c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:57:29 2005 +0100 shdocvw: Added get_Document implementation. --- dlls/shdocvw/webbrowser.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 9907e5b..8110950 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -260,8 +260,14 @@ static HRESULT WINAPI WebBrowser_get_Con static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = NULL; + if(This->document) + IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)ppDisp); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Eric Pouech : winedbg: Fixed broken code about type management for binary operator.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 4d7f9f7c65343179709cfd201f0250d2cb236d36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d7f9f7c65343179709cfd2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 10:57:17 2005 +0100 winedbg: Fixed broken code about type management for binary operator. --- programs/winedbg/expr.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 5eb4d49..5815298 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -482,16 +482,18 @@ struct dbg_lvalue expr_eval(struct expr* rtn.type.id = dbg_itype_signed_int; rtn.type.module = 0; rtn.addr.Offset = (unsigned int)&exp->un.binop.result; + type1 = exp1.type; + type2 = exp2.type; switch (exp->un.binop.binop_type) { case EXP_OP_ADD: if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp1.type, TI_GET_TYPE, &type1)) + !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id)) type1.id = dbg_itype_none; if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp2.type, TI_GET_TYPE, &type2)) + !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id)) type2.id = dbg_itype_none; scale1 = 1; scale2 = 1; @@ -513,11 +515,11 @@ struct dbg_lvalue expr_eval(struct expr* case EXP_OP_SUB: if (!types_get_info(&exp1.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp1.type, TI_GET_TYPE, &type1)) + !types_get_info(&exp1.type, TI_GET_TYPE, &type1.id)) type1.id = dbg_itype_none; if (!types_get_info(&exp2.type, TI_GET_SYMTAG, &tag) || tag != SymTagPointerType || - !types_get_info(&exp2.type, TI_GET_TYPE, &type2)) + !types_get_info(&exp2.type, TI_GET_TYPE, &type2.id)) type2.id = dbg_itype_none; scale1 = 1; scale2 = 1;

1 0

Detlef Riekenberg : winspool: Add documentation for the port functions.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1395d14507f18aa2eb73653a2b5c358d5023eea3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1395d14507f18aa2eb73653… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 10:57:01 2005 +0100 winspool: Add documentation for the port functions. --- dlls/winspool/info.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 3bdd01d..a54fe32 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -1192,6 +1192,8 @@ DeleteMonitorW (LPWSTR pName, LPWSTR pEn /****************************************************************** * DeletePortA [WINSPOOL.@] * + * See DeletePortW. + * */ BOOL WINAPI DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) @@ -1205,6 +1207,20 @@ DeletePortA (LPSTR pName, HWND hWnd, LPS /****************************************************************** * DeletePortW [WINSPOOL.@] * + * Delete a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) @@ -3733,6 +3749,12 @@ static DWORD WINSPOOL_CountSerialPorts(v /****************************************************************************** * EnumPortsA (WINSPOOL.@) + * + * See EnumPortsW. + * + * BUGS + * ANSI-Version did not call the UNICODE-Version + * */ BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, LPDWORD bufneeded,LPDWORD bufreturned) @@ -3850,6 +3872,24 @@ BOOL WINAPI EnumPortsA(LPSTR name,DWORD /****************************************************************************** * EnumPortsW (WINSPOOL.@) + * + * Enumerate available Ports + * + * PARAMS + * name [I] Servername or NULL (local Computer) + * level [I] Structure-Level (1 or 2) + * buffer [O] PTR to Buffer that receives the Result + * bufsize [I] Size of Buffer at buffer + * bufneeded [O] PTR to DWORD that receives the size in Bytes used / required for buffer + * bufreturned [O] PTR to DWORD that receives the number of Ports in buffer + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * + * BUGS + * UNICODE-Version is a stub + * */ BOOL WINAPI EnumPortsW(LPWSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, LPDWORD bufneeded,LPDWORD bufreturned) @@ -4511,6 +4551,9 @@ BOOL WINAPI AbortPrinter( HANDLE hPrinte /****************************************************************************** * AddPortA (WINSPOOL.@) + * + * See AddPortW. + * */ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName) { @@ -4520,6 +4563,21 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND h /****************************************************************************** * AddPortW (WINSPOOL.@) + * + * Add a Port for a specific Monitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { @@ -4530,7 +4588,8 @@ BOOL WINAPI AddPortW(LPWSTR pName, HWND /****************************************************************************** * AddPortExA (WINSPOOL.@) * - * Adds a print spooler port without presenting a user interface. + * See AddPortExW. + * */ BOOL WINAPI AddPortExA(HANDLE hMonitor, LPSTR pName, DWORD Level, LPBYTE lpBuffer, LPSTR lpMonitorName) { @@ -4542,7 +4601,22 @@ BOOL WINAPI AddPortExA(HANDLE hMonitor, /****************************************************************************** * AddPortExW (WINSPOOL.@) * - * See AddPortExW. + * Add a Port for a specific Monitor, without presenting a user interface + * + * PARAMS + * hMonitor [I] Handle from InitializePrintMonitor2() + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (1 or 2) for lpBuffer + * lpBuffer [I] PTR to: PORT_INFO_1 or PORT_INFO_2 + * lpMonitorName [I] Name of the Monitor that manage the Port or NULL + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI AddPortExW(HANDLE hMonitor, LPWSTR pName, DWORD Level, LPBYTE lpBuffer, LPWSTR lpMonitorName) { @@ -4595,6 +4669,9 @@ BOOL WINAPI AddPrinterDriverExA( LPSTR p /****************************************************************************** * ConfigurePortA (WINSPOOL.@) + * + * See ConfigurePortW. + * */ BOOL WINAPI ConfigurePortA(LPSTR pName, HWND hWnd, LPSTR pPortName) { @@ -4604,6 +4681,21 @@ BOOL WINAPI ConfigurePortA(LPSTR pName, /****************************************************************************** * ConfigurePortW (WINSPOOL.@) + * + * Display the Configuration-Dialog for a specific Port + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pPortName [I] Name of the Port, that should be configured + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * only a Stub + * */ BOOL WINAPI ConfigurePortW(LPWSTR pName, HWND hWnd, LPWSTR pPortName) {

1 0

Alexandre Julliard : kernel: Added a basic test for exception handling in threads.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 45693738e69d056bd9102b407c9388599450d8ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45693738e69d056bd9102b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:43:33 2005 +0100 kernel: Added a basic test for exception handling in threads. --- dlls/kernel/tests/thread.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 200cdf6..444217d 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -119,6 +119,10 @@ static DWORD WINAPI threadFunc1(LPVOID p for(i=0;i<NUM_THREADS;i++) { while(tstruct->threadmem[i]==0) ; } + + /* lstrlenA contains an exception handler so this makes sure exceptions work in threads */ + ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); + /* Check that noone changed our tls memory */ ok((int)TlsGetValue(tlsIndex)-1==tstruct->threadnum, "TlsGetValue failed\n"); @@ -180,6 +184,9 @@ static VOID test_CreateThread_basic(void DWORD i,j; DWORD GLE, ret; + /* lstrlenA contains an exception handler so this makes sure exceptions work in the main thread */ + ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); + /* Retrieve current Thread ID for later comparisons */ curthreadId=GetCurrentThreadId(); /* Allocate some local storage */

1 0

Alexandre Julliard : user: Fixed copy/paste bug in CURSORICON_GetResIconEntry.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: ef4dfd4b7ab43b1587778fb8f19ee1454149e447 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef4dfd4b7ab43b1587778fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 20:41:24 2005 +0100 user: Fixed copy/paste bug in CURSORICON_GetResIconEntry. --- dlls/user/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index c47a1ee..2e64d4a 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -540,7 +540,7 @@ static BOOL CURSORICON_GetResIconEntry( return FALSE; icon = &resdir->idEntries[n].ResInfo.icon; *width = icon->bWidth; - *height = icon->bWidth; + *height = icon->bHeight; *bits = resdir->idEntries[n].wBitCount; return TRUE; }

1 0

Rein Klazes : ddraw: Catch access violations when calling DirectDrawEnumerateProc.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 72caaad6cc3a2eaebf884d751368f9768924c00f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72caaad6cc3a2eaebf884d7… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 5 20:40:42 2005 +0100 ddraw: Catch access violations when calling DirectDrawEnumerateProc. --- dlls/ddraw/Makefile.in | 2 +- dlls/ddraw/main.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 361d0d0..88a7ff4 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ddraw.dll IMPORTLIB = libddraw.$(IMPLIBEXT) -IMPORTS = ole32 user32 gdi32 advapi32 kernel32 +IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e2912b6..25c3e05 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -39,6 +39,8 @@ #include "winnls.h" #include "winerror.h" #include "wingdi.h" +#include "wine/exception.h" +#include "excpt.h" #include "ddraw.h" #include "d3d.h" @@ -62,6 +64,14 @@ void (*wine_tsx11_unlock_ptr)(void) = NU WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +/* filter for page-fault exceptions */ +static WINE_EXCEPTION_FILTER(page_fault) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + /**********************************************************************/ typedef struct { @@ -180,6 +190,7 @@ HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags) { int i; + BOOL stop = FALSE; TRACE("(%p,%p, %08lx)\n", lpCallback, lpContext, dwFlags); if (TRACE_ON(ddraw)) { @@ -201,12 +212,21 @@ HRESULT WINAPI DirectDrawEnumerateExA( /* We have to pass NULL from the primary display device. * RoadRage chapter 6's enumeration routine expects it. */ - if (!lpCallback((DDRAW_default_driver == i) ? NULL - :(LPGUID)&DDRAW_drivers[i]->info->guidDeviceIdentifier, - (LPSTR)DDRAW_drivers[i]->info->szDescription, - (LPSTR)DDRAW_drivers[i]->info->szDriver, - lpContext, 0)) - return DD_OK; + __TRY + { + if (!lpCallback((DDRAW_default_driver == i) ? NULL + :(LPGUID)&DDRAW_drivers[i]->info->guidDeviceIdentifier, + (LPSTR)DDRAW_drivers[i]->info->szDescription, + (LPSTR)DDRAW_drivers[i]->info->szDriver, + lpContext, 0)) + stop = TRUE; + } + __EXCEPT(page_fault) + { + return E_INVALIDARG; + } + __ENDTRY + if (stop) return DD_OK; } /* Unsupported flags */

1 0

Thomas Weidenmueller : devenum: Don't leak key handle creating a category registry key.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: ae4eafbeccbf03a2659cf9d9ccfab008340d2721 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae4eafbeccbf03a2659cf9d… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Mon Dec 5 20:39:47 2005 +0100 devenum: Don't leak key handle creating a category registry key. --- dlls/devenum/createdevenum.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 15948cf..416c238 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -202,8 +202,10 @@ static HRESULT DEVENUM_CreateAMCategoryK res = E_INVALIDARG; if (SUCCEEDED(res)) - res = HRESULT_FROM_WIN32( - RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy)); + { + LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); + res = HRESULT_FROM_WIN32(lRes); + } if (hkeyDummy) RegCloseKey(hkeyDummy);

1 0

Christian Gmeiner : msi: Implemented DllCanUnloadNow.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: e02e539c1e91cffe4f29281c8a120ba60c041ba2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e02e539c1e91cffe4f29281… Author: Christian Gmeiner <christian.gmeiner(a)students.fh-vorarlberg.ac.at> Date: Mon Dec 5 20:39:33 2005 +0100 msi: Implemented DllCanUnloadNow. --- dlls/msi/msi.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 625b16c..0591a42 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -53,8 +53,24 @@ LPVOID gUIContext = NULL; WCHAR gszLogFile[MAX_PATH]; HINSTANCE msi_hInstance; +static LONG dll_count; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; +/********************************************************************** + * Dll lifetime tracking declaration + */ +static void LockModule(void) +{ + InterlockedIncrement(&dll_count); +} + +static void UnlockModule(void) +{ + InterlockedDecrement(&dll_count); +} + + UINT WINAPI MsiOpenProductA(LPCSTR szProduct, MSIHANDLE *phProduct) { UINT r; @@ -1285,11 +1301,13 @@ static HRESULT WINAPI MsiCF_QueryInterfa static ULONG WINAPI MsiCF_AddRef(LPCLASSFACTORY iface) { + LockModule(); return 2; } static ULONG WINAPI MsiCF_Release(LPCLASSFACTORY iface) { + UnlockModule(); return 1; } @@ -1304,9 +1322,13 @@ static HRESULT WINAPI MsiCF_CreateInstan static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p)->(%d)\n", iface, dolock); + + if(dolock) + LockModule(); + else + UnlockModule(); - FIXME("%p %d\n", This, dolock); return S_OK; } @@ -1363,7 +1385,7 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONI */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_FALSE; + return dll_count == 0 ? S_OK : S_FALSE; } /***********************************************************************

1 0

Wojciech Migda : imagehlp: fixed typo in SymSetOptions entry.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: c8c52d79790f79f6cce6160c935e13e9c0560d19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8c52d79790f79f6cce6160… Author: Wojciech Migda <migda(a)chemia.uj.edu.pl> Date: Mon Dec 5 20:38:45 2005 +0100 imagehlp: fixed typo in SymSetOptions entry. --- dlls/imagehlp/imagehlp.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index fce953b..ac5a2ae 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -95,7 +95,7 @@ @ stub SymRegisterFunctionEntryCallback64 @ stub SymRegisterFunctionEntryCallback @ stdcall SymSetContext(long ptr ptr) dbghelp.SymSetContext -@ stdcall SymSetOptions(long) dbghelp.SymGetOptions +@ stdcall SymSetOptions(long) dbghelp.SymSetOptions @ stdcall SymSetSearchPath(long str) dbghelp.SymSetSearchPath @ stub SymUnDName64 @ stdcall SymUnDName(ptr str long) dbghelp.SymUnDName

1 0

Huw Davies : msi: Fix MsiProvideQualifiedComponentW spec file entry.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 0d13aeb26e17a592d34e20b49bea3e4f870d5ab0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d13aeb26e17a592d34e20b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 5 20:38:18 2005 +0100 msi: Fix MsiProvideQualifiedComponentW spec file entry. --- dlls/msi/msi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 28b2628..ee28694 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -102,7 +102,7 @@ 106 stdcall MsiProvideComponentFromDescriptorW(wstr ptr ptr ptr) 107 stub MsiProvideComponentW 108 stdcall MsiProvideQualifiedComponentA(str str long ptr ptr) -109 stdcall MsiProvideQualifiedComponentW(str str long ptr ptr) +109 stdcall MsiProvideQualifiedComponentW(wstr wstr long ptr ptr) 110 stdcall MsiQueryFeatureStateA(str str) 111 stdcall MsiQueryFeatureStateW(wstr wstr) 112 stdcall MsiQueryProductStateA(str)

1 0

lostwages/wwn wn20051202_300.xml
by Jeremy Newman Dec. 5, 2005

Dec. 5, 2005

ChangeSet ID: 21679 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/05 10:42:52 Modified files: wwn : wn20051202_300.xml Log message: Francois Gouget <fgouget(a)free.fr> Two <section> tags were prematurely closed. Remove the duplicate 'Installing the Mozilla ActiveX Control' Patch: http://cvs.winehq.org/patch.py?id=21679 Old revision New revision Changes Path 1.1 1.2 +2 -39 lostwages/wwn/wn20051202_300.xml Index: lostwages/wwn/wn20051202_300.xml diff -u -p lostwages/wwn/wn20051202_300.xml:1.1 lostwages/wwn/wn20051202_300.xml:1.2 --- lostwages/wwn/wn20051202_300.xml:1.1 5 Dec 2005 16:42:52 -0000 +++ lostwages/wwn/wn20051202_300.xml 5 Dec 2005 16:42:52 -0000 @@ -128,7 +128,7 @@ since I can publish it there directly. <section title="wine.git" subject="Git" - archive="http://wiki.winehq.org/GitWine"> + archive="http://wiki.winehq.org/GitWine" posts="1" > <topic>Project Management</topic> @@ -485,46 +485,9 @@ http://www.blastwave.org/wine</a> ?< </section> <section - title="Installing the Mozilla ActiveX Control" - subject="Does the Windows version of Mozilla need to be installed to use the Mozilla ActiveX plugin?" - archive="http://www.winehq.com/pipermail/wine-devel/2005-November/042878.html" - posts="5" -> -<topic>Web/HTML</topic> -The Mozilla ActiveX control is currently used when an application -requires a <tt>WebBrowser</tt> control to embed OLE documnents, namely HTML, -within an application. Ongoing work by Jacek Caban to implement -MSHTML.DLL and SHDOCVW.DLL will hopefully obviate the need for it, but -that work isn't complete enough yet (although Jacek sent about a -bizillion patches last week.) That led David Hagood to ask this week: -<quote who="David Hagood"> -Does the Windows version of Mozilla need to be in place for the Mozilla -Active X control to work, or is there a way to point the control at my -Linux install of Mozilla?</quote> - -Aric Cyr replied: -<quote who="Aric Cyr"> -Yup, you'll need to install a win32 version of mozilla. There is a decent -little Mozilla ActiveX HOWTO at:<ul> -<a href="http://gentoo-wiki.com/HOWTO_Install_and_update_World_Of_Warcraft_with_wine"> -http://gentoo-wiki.com/HOWTO_Install_and_update_World_Of_Warcraft_with_wine</a> -</ul> - -(Installing Active X for the new Patchsystem) - -</quote> - -Jacek pointed out that was actually incorrect and it was easier, -<quote who="Jacek Caban"> -Mozilla ActiveX Control doesn't need any version of Mozilla. It just uses -Gecko (Mozilla's engine), which is provided with it, so you don't have -to install anything else.</quote> - -</section> -<section title="Quake 2 Evolved & Winelib" subject="A working winelib application" - archive="http://www.winehq.com/pipermail/wine-devel/2005-December/042975.html"> + archive="http://www.winehq.com/pipermail/wine-devel/2005-December/042975.html" posts="1" > <topic>Winelib</topic>

1 0

lostwages/wwn wn20011212_110.xml wn20051125_29 ...
by Jeremy Newman Dec. 5, 2005

Dec. 5, 2005

ChangeSet ID: 21678 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/05 10:41:54 Modified files: wwn : wn20011212_110.xml wn20051125_299.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes Patch: http://cvs.winehq.org/patch.py?id=21678 Old revision New revision Changes Path 1.10 1.11 +1 -1 lostwages/wwn/wn20011212_110.xml 1.1 1.2 +17 -17 lostwages/wwn/wn20051125_299.xml Index: lostwages/wwn/wn20011212_110.xml diff -u -p lostwages/wwn/wn20011212_110.xml:1.10 lostwages/wwn/wn20011212_110.xml:1.11 --- lostwages/wwn/wn20011212_110.xml:1.10 5 Dec 2005 16:41:54 -0000 +++ lostwages/wwn/wn20011212_110.xml 5 Dec 2005 16:41:54 -0000 @@ -164,7 +164,7 @@ replied with some concerns: Patrik Stridvall had some thoughts as well: <quote who="Patrik Stridvall"> What is perhaps more realistic to require IMHO that Office and other - Microsoft applications shouldn't crash or behave in an inconsistant + Microsoft applications shouldn't crash or behave in an inconsistent way just because some odd feature in some API call is not available. Instead it should say, sorry can't do that not supported in the OS. Index: lostwages/wwn/wn20051125_299.xml diff -u -p lostwages/wwn/wn20051125_299.xml:1.1 lostwages/wwn/wn20051125_299.xml:1.2 --- lostwages/wwn/wn20051125_299.xml:1.1 5 Dec 2005 16:41:54 -0000 +++ lostwages/wwn/wn20051125_299.xml 5 Dec 2005 16:41:54 -0000 @@ -193,7 +193,7 @@ For those of you who don't speak italian They included some technical bits to illustrate using Wine. Steven J. Vaughan-Nichols -<a href="http://www.eweek.com/article2/0,1895,1886920,00.asp">reviewed</a> u +<a href="http://www.eweek.com/article2/0,1895,1886920,00.asp">reviewed</a> CrossOver Office 5 for eWeek and had a lot of positive comments. Interestingly, Steven included a link to a CrossOver mailing list post which shows he's more familiar with the product than just being a casual reviewer. From his @@ -257,8 +257,8 @@ support for permanent objects. There wil for ntoskrnl for that to work. I'm just about finished integrating new OM into ntoskrnl tree and almost ready to give it a try. -As far as OM goes it's mostly finished and passes all but two of om -tests. Also it don't see any side-affects from it either. All the +As far as OM goes it's mostly finished and passes all but two om +tests. Also it don't see any side-effects from it either. All the programs I've tested work in the same way as they were before. All named object moved to directories and using RootDirectory part of OBJECT_ATTRIBUTES for create/open. @@ -310,7 +310,7 @@ can mail the current code too). himself: <quote who="Stephan Dosinger"> -I have sorted that texture problem out now(Incorrect Loading and the +I have sorted out that texture problem out now(Incorrect Loading and the TEXTUREHANDLE render state was missing), and to my eyes Tomb Raider 3 runs correct now with WineD3D. @@ -336,7 +336,7 @@ what he was doing: <quote who="Oliver Stieber"> I've put together a Direct3D 8 wrapper for wined3d which should hopefully replace the current Direct3D 8 code. The patch needs a little bit of tidying, -some work of vertex declarations and a hell of a lot of testing before it +some work on vertex declarations and a hell of a lot of testing before it can go into Wine. So far I've tested Rail Road Tycoon 3, Celebrity Death match, Madden NFL 2004 @@ -376,7 +376,7 @@ https://sourceforge.net/project/shownote posts="7" > <topic>Documentation</topic> -Wine has documented the Win32 similar to how Microsoft has done with +Wine has documented the Win32 similarly to how Microsoft has done with MSDN. While it's definitely a work in progress, it does provide an alternative source of information for various API's. Robert Shearman mentioned WineHQ was out of date regarding it: @@ -448,7 +448,7 @@ screen. Next time I booted with grub-floppy and then restored the MBR with grub-install /dev/hda. Please let me know what additional information you need. -It's happend on Slackware 10.2 system, 2.6.14 kernel with ck-3 patches. +It's happened on Slackware 10.2 system, 2.6.14 kernel with ck-3 patches. </quote> A bunch of people asked for different output to try to figure out @@ -567,7 +567,7 @@ Also part of the problem, though I don't far as its impact, is that our architectures are different. For example, the code obfuscation tools (securom, safedisk et al) depend on device drivers being loaded by ntoskrnl.exe. This is related to the hidden -assumpmtions problem I described already, but sometimes we have to +assumptions problem I described already, but sometimes we have to implement a large amount of silliness that we didn't anticipate having to do, or reimplement stuff that was already working for some apps. ReactOS can potentially avoid some of these issues, since they're copying much @@ -618,7 +618,7 @@ deep interwoven dependencies. So, to summarize, the punishment to Microsoft for illegally pushing IE and destroying Netscape is...the continued -use of IE as an monopolistic lever. Nice.</quote> +use of IE as a monopolistic lever. Nice.</quote> From there the thread went in different directions. </section> @@ -632,10 +632,10 @@ use of IE as an monopolistic lever. Nic Charles A wanted to know how to go about using Wine on a machine without X running, specifically running a cron job: <quote who="Charles A"> - I'm not able to use wine command in crontab it giving following error + I'm not able to use wine command in crontab due to it giving the following error <tt>"Error opening terminal: unknown"</tt> -I'm using wine 0.9, i have added following command in crontab +I'm using wine 0.9, i have added the following command in crontab <ul><code> 20 10 * * * /home/Maven/test.sh </code></ul> @@ -762,7 +762,7 @@ winebrowser to handle sending email: <quote who="Hans Leidekker"> Modeled after winebrowser. Local testing found that thunderbird (know as mozilla-thunderbird on Debian-based systems) and evolution -accept a mailto: url on the command line. kmail however has it's +accept a mailto: url on the command line. kmail however has its own interface. Any other GUI-based mail client of interest that handles these urls? Test it like so: <ul><code> @@ -945,7 +945,7 @@ out of FD.O scope (and for which work-ar <=> one context rule).</li> <li> GLX extension that would export the 'clip-list' functionnalities of cards - (or at lest the one which is in the X code itself). Would help on + (or at least the one which is in the X code itself). Would help on applications (like Wine) that do their own in-window clipping.</li> <li> same point as before but for Xv the day we will re-add this code for @@ -958,14 +958,14 @@ Some 'misc' stuff that is really in the X setting (resolution, mouse acceleration, ...), as soon as this client exits, restore the previous configuration. Would be useful to prevent having people restarting X because Wine crashed after having changed the - resolution using XRand.</li> + resolution using XRandR.</li> <li> have a non-connection limited mouse-grab. To explain better, this would enable one to grab the pointer into a window (i.e. the mouse would never leave this window) while still sending events to all connections and not only to the connection which started the grab. This could be nice to simulate 'full-screen desktop mode' or for DXGrab. No idea if with Wine's - current event model this is still usefull though.</li></ul> + current event model this is still useful though.</li></ul> Another 'let's dream' possibilities: <ul> @@ -1079,10 +1079,10 @@ explained what some of the likely proble I do not know what special needs the VB database apps have but for sure they need a good oleaut32.dll. At least the variant arithmetic functions -aren't good enough for your requirements. With good enough I mean is +aren't good enough for your requirements. With good enough what I mean is that they do not handle all the input variants that native oleaut32 are handling. That isn't hard to implement but requires a lot of tests as -this functions are very poorly documented and are designed specificaly +these functions are very poorly documented and are designed specifically to support only the variants they get passed down by the VB runtime. Good examples of such tests and implementation are VarMul, VarAdd and 1-2 other functions (from which I adapted the tests for VarMul and

1 0

Vitaliy Margolen : server: Remove sync_namespace.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 4e3652491600f1d434eaa1b67fe83277b7ff7101 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e3652491600f1d434eaa1b… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 5 14:52:18 2005 +0100 server: Remove sync_namespace. --- server/main.c | 4 ---- server/object.h | 3 --- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/server/main.c b/server/main.c index 7f07aac..43d3cf7 100644 --- a/server/main.c +++ b/server/main.c @@ -40,9 +40,6 @@ int master_socket_timeout = 3; /* maste int foreground = 0; const char *server_argv0; -/* name space for synchronization objects */ -struct namespace *sync_namespace; - /* parse-line args */ /* FIXME: should probably use getopt, and add a (more complete?) help option */ @@ -130,7 +127,6 @@ int main( int argc, char *argv[] ) sock_init(); open_master_socket(); - sync_namespace = create_namespace( 37 ); setvbuf( stderr, NULL, _IOLBF, 0 ); if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() ); diff --git a/server/object.h b/server/object.h index ba7ca90..62c0015 100644 --- a/server/object.h +++ b/server/object.h @@ -214,7 +214,4 @@ extern const char *server_argv0; /* server start time used for GetTickCount() */ extern time_t server_start_time; -/* name space for synchronization objects */ -extern struct namespace *sync_namespace; - #endif /* __WINE_SERVER_OBJECT_H */

1 0

Alexandre Julliard : server: Let the directory code handle device names.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: d13095bc8476ce8259ffad4ff732da915398d458 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d13095bc8476ce8259ffad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 14:52:02 2005 +0100 server: Let the directory code handle device names. --- server/directory.c | 16 +++++++++++----- server/mailslot.c | 6 ++---- server/named_pipe.c | 9 +++------ server/object.h | 6 ++++-- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/server/directory.c b/server/directory.c index 14ed4cc..21dec3a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -283,7 +283,7 @@ void *open_object_dir( struct directory /* Global initialization */ -static struct directory *dir_driver; +static struct directory *dir_driver, *dir_device; static struct symlink *link_dosdev, *link_global1, *link_global2, *link_local; static struct named_pipe_device *dev_named_pipe; static struct mailslot_device *dev_mailslot; @@ -308,7 +308,13 @@ void init_directories(void) static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_local_str = {link_localW, sizeof(link_localW)}; - struct directory *dir_global, *dir_basenamed, *dir_device; + /* devices */ + static const WCHAR pipeW[] = {'P','I','P','E'}; + static const WCHAR mailslotW[] = {'M','A','I','L','S','L','O','T'}; + static const struct unicode_str pipe_str = {pipeW, sizeof(pipeW)}; + static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; + + struct directory *dir_global, *dir_basenamed; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); @@ -325,11 +331,10 @@ void init_directories(void) link_local = create_symlink( dir_basenamed, &link_local_str, 0, &dir_basenamed_str ); /* devices */ - dev_named_pipe = create_named_pipe_device(); - dev_mailslot = create_mailslot_device(); + dev_named_pipe = create_named_pipe_device( dir_global, &pipe_str ); + dev_mailslot = create_mailslot_device( dir_global, &mailslot_str ); /* the symlinks or devices hold references so we can release these */ - release_object( dir_device ); release_object( dir_global ); release_object( dir_basenamed ); } @@ -344,6 +349,7 @@ void close_directories(void) release_object( link_global2 ); release_object( link_local ); + release_object( dir_device ); release_object( dir_driver ); release_object( root_directory ); } diff --git a/server/mailslot.c b/server/mailslot.c index 7d2d0b0..c882896 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -269,13 +269,11 @@ static void mailslot_device_destroy( str free( device->mailslots ); } -struct mailslot_device *create_mailslot_device( void ) +struct mailslot_device *create_mailslot_device( struct directory *root, const struct unicode_str *name ) { - static const WCHAR mailslotW[] = {'\\','?','?','\\','M','A','I','L','S','L','O','T'}; - static struct unicode_str mailslot = {mailslotW, sizeof(mailslotW)}; struct mailslot_device *dev; - if ((dev = create_named_object_dir( NULL, &mailslot, 0, &mailslot_device_ops )) && + if ((dev = create_named_object_dir( root, name, 0, &mailslot_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { if (!(dev->mailslots = create_namespace( 7 ))) diff --git a/server/named_pipe.c b/server/named_pipe.c index ac6aaab..2917d7b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -379,8 +379,6 @@ static struct object *named_pipe_device_ assert( obj->ops == &named_pipe_device_ops ); assert( device->pipes ); - if (!name->len) return NULL; - if ((found = find_object( device->pipes, name, attr | OBJ_CASE_INSENSITIVE ))) name->len = 0; @@ -397,13 +395,12 @@ static void named_pipe_device_destroy( s /* this will be deleted as soon an we fix wait_named_pipe */ static struct named_pipe_device *named_pipe_device; -struct named_pipe_device *create_named_pipe_device( void ) +struct named_pipe_device *create_named_pipe_device( struct directory *root, + const struct unicode_str *name ) { - static const WCHAR pipeW[] = {'\\','?','?','\\','P','I','P','E'}; - static struct unicode_str pipe = {pipeW, sizeof(pipeW)}; struct named_pipe_device *dev; - if ((dev = create_named_object_dir( NULL, &pipe, 0, &named_pipe_device_ops )) && + 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 ))) diff --git a/server/object.h b/server/object.h index 06ce443..ba7ca90 100644 --- a/server/object.h +++ b/server/object.h @@ -198,8 +198,10 @@ extern struct symlink *create_symlink( s unsigned int attr, const struct unicode_str *target ); /* devices */ -extern struct named_pipe_device *create_named_pipe_device( void ); -extern struct mailslot_device *create_mailslot_device( void ); +extern struct named_pipe_device *create_named_pipe_device( struct directory *root, + const struct unicode_str *name ); +extern struct mailslot_device *create_mailslot_device( struct directory *root, + const struct unicode_str *name ); /* global variables */

1 0

Vitaliy Margolen : Move mailslot devices into directory name space.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: cf21d4d7ca7184dfb42583a39a830f96037b1e6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf21d4d7ca7184dfb42583a… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 5 13:30:26 2005 +0100 Move mailslot devices into directory name space. --- dlls/ntdll/file.c | 22 +++--- include/wine/server_protocol.h | 4 + server/directory.c | 3 + server/mailslot.c | 148 +++++++++++++++++++++++++++++++--------- server/object.h | 1 server/protocol.def | 2 + server/trace.c | 2 + 7 files changed, 136 insertions(+), 46 deletions(-)

1 0

Vitaliy Margolen : Move named pipe objects into directory name space.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: babfa79436e1d745886ead360bee402bfd46074a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=babfa79436e1d745886ead3… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 5 13:09:35 2005 +0100 Move named pipe objects into directory name space. Change tests accordingly. Add small test for WaitNamedPipe. --- dlls/kernel/sync.c | 3 + dlls/kernel/tests/pipe.c | 4 + dlls/ntdll/file.c | 21 +++--- dlls/ntdll/tests/om.c | 4 + include/wine/server_protocol.h | 4 + server/directory.c | 14 +++- server/named_pipe.c | 151 ++++++++++++++++++++++++++++++++++------ server/object.h | 2 + server/protocol.def | 2 + server/trace.c | 2 + 10 files changed, 165 insertions(+), 42 deletions(-)

1 0

Alexandre Julliard : server: Move handle allocation out of open_object_dir.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 3764da68deb43bcda87283b58ae1e1287aabc816 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3764da68deb43bcda87283b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 12:52:05 2005 +0100 server: Move handle allocation out of open_object_dir. --- server/directory.c | 19 +++++++++++-------- server/event.c | 8 +++++++- server/mapping.c | 8 +++++++- server/mutex.c | 8 +++++++- server/object.h | 5 ++--- server/semaphore.c | 8 +++++++- server/symlink.c | 9 +++++++-- server/timer.c | 8 +++++++- 8 files changed, 55 insertions(+), 18 deletions(-) diff --git a/server/directory.c b/server/directory.c index 052de10..c5de986 100644 --- a/server/directory.c +++ b/server/directory.c @@ -260,11 +260,9 @@ void *create_named_object_dir( struct di } /* open a new handle to an existing object */ -obj_handle_t open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops, - unsigned int access ) +void *open_object_dir( struct directory *root, const struct unicode_str *name, + unsigned int attr, const struct object_ops *ops ) { - obj_handle_t handle = 0; struct unicode_str name_left; struct object *obj; @@ -275,11 +273,11 @@ obj_handle_t open_object_dir( struct dir else if (ops && obj->ops != ops) set_error( STATUS_OBJECT_TYPE_MISMATCH ); else - handle = alloc_handle( current->process, obj, access, attr & OBJ_INHERIT ); + return obj; release_object( obj ); } - return handle; + return NULL; } @@ -367,13 +365,18 @@ DECL_HANDLER(create_directory) DECL_HANDLER(open_directory) { struct unicode_str name; - struct directory *root = NULL; + struct directory *dir, *root = NULL; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &directory_ops, req->access ); + if ((dir = open_object_dir( root, &name, req->attributes, &directory_ops ))) + { + reply->handle = alloc_handle( current->process, &dir->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( dir ); + } if (root) release_object( root ); } diff --git a/server/event.c b/server/event.c index 8443837..7464e18 100644 --- a/server/event.c +++ b/server/event.c @@ -172,12 +172,18 @@ DECL_HANDLER(open_event) { struct unicode_str name; struct directory *root = NULL; + struct event *event; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &event_ops, req->access ); + if ((event = open_object_dir( root, &name, req->attributes, &event_ops ))) + { + reply->handle = alloc_handle( current->process, &event->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( event ); + } if (root) release_object( root ); } diff --git a/server/mapping.c b/server/mapping.c index cf87361..cc81e37 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -402,12 +402,18 @@ DECL_HANDLER(open_mapping) { struct unicode_str name; struct directory *root = NULL; + struct mapping *mapping; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &mapping_ops, req->access ); + if ((mapping = open_object_dir( root, &name, req->attributes, &mapping_ops ))) + { + reply->handle = alloc_handle( current->process, &mapping->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( mapping ); + } if (root) release_object( root ); } diff --git a/server/mutex.c b/server/mutex.c index 9e3bdc3..18c194e 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -198,12 +198,18 @@ DECL_HANDLER(open_mutex) { struct unicode_str name; struct directory *root = NULL; + struct mutex *mutex; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &mutex_ops, req->access ); + if ((mutex = open_object_dir( root, &name, req->attributes, &mutex_ops ))) + { + reply->handle = alloc_handle( current->process, &mutex->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( mutex ); + } if (root) release_object( root ); } diff --git a/server/object.h b/server/object.h index d138729..2beb148 100644 --- a/server/object.h +++ b/server/object.h @@ -187,9 +187,8 @@ extern struct object *find_object_dir( s unsigned int attr, struct unicode_str *name_left ); extern void *create_named_object_dir( struct directory *root, const struct unicode_str *name, unsigned int attr, const struct object_ops *ops ); -extern obj_handle_t open_object_dir( struct directory *root, const struct unicode_str *name, - unsigned int attr, const struct object_ops *ops, - unsigned int access ); +extern void *open_object_dir( struct directory *root, const struct unicode_str *name, + unsigned int attr, const struct object_ops *ops ); extern void init_directories(void); extern void close_directories(void); diff --git a/server/semaphore.c b/server/semaphore.c index e8d9cbb..2dd6beb 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -172,12 +172,18 @@ DECL_HANDLER(open_semaphore) { struct unicode_str name; struct directory *root = NULL; + struct semaphore *sem; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &semaphore_ops, req->access ); + if ((sem = open_object_dir( root, &name, req->attributes, &semaphore_ops ))) + { + reply->handle = alloc_handle( current->process, &sem->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( sem ); + } if (root) release_object( root ); } diff --git a/server/symlink.c b/server/symlink.c index 7f28cc8..cf805a7 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -168,13 +168,18 @@ DECL_HANDLER(open_symlink) { struct unicode_str name; struct directory *root = NULL; + struct symlink *symlink; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes | OBJ_OPENLINK, - &symlink_ops, req->access ); + if ((symlink = open_object_dir( root, &name, req->attributes | OBJ_OPENLINK, &symlink_ops ))) + { + reply->handle = alloc_handle( current->process, &symlink->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( symlink ); + } if (root) release_object( root ); } diff --git a/server/timer.c b/server/timer.c index 74419e5..436ed7c 100644 --- a/server/timer.c +++ b/server/timer.c @@ -231,12 +231,18 @@ DECL_HANDLER(open_timer) { struct unicode_str name; struct directory *root = NULL; + struct timer *timer; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return; - reply->handle = open_object_dir( root, &name, req->attributes, &timer_ops, req->access ); + if ((timer = open_object_dir( root, &name, req->attributes, &timer_ops ))) + { + reply->handle = alloc_handle( current->process, &timer->obj, req->access, + req->attributes & OBJ_INHERIT ); + release_object( timer ); + } if (root) release_object( root ); }

1 0

Eric Pouech : dbghelp: Implemented StackWalk64.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 1f872df26c2781fd274d8e3d10f46610933e9a06 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f872df26c2781fd274d8e3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:50:10 2005 +0100 dbghelp: Implemented StackWalk64. --- dlls/dbghelp/stack.c | 239 ++++++++++++++++++++++++++++++++++++-------------- include/dbghelp.h | 4 - 2 files changed, 175 insertions(+), 68 deletions(-)

1 0

Francois Gouget : Update win32.api to match the current sources.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 5193c8565f5c07a37f52068ca2b06151a9091bc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5193c8565f5c07a37f52068… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 5 12:49:30 2005 +0100 Update win32.api to match the current sources. --- tools/winapi/win32.api | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5d14faf..9f81c13 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -604,7 +604,6 @@ ALG_ID BOOL DWORD HANDLE -HCERTSTORE HCRYPTPROV HMODULE LONG @@ -620,7 +619,9 @@ CRYPT_OID_FUNC_ENTRY[] DATA_BLOB * DWORD * GUID * +HCERTSTORE HCRYPTKEY * +HCRYPTOIDFUNCADDR HCRYPTOIDFUNCADDR * HCRYPTOIDFUNCSET HLRUCACHE @@ -3301,7 +3302,7 @@ GLvoid * GLvoid ** LPGLYPHMETRICSFLOAT LPLAYERPLANEDESCRIPTOR -void * +PROC %str

1 0

Francois Gouget : msvidc32: Add a comment for DllMain() to stop winapi_check from
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 6e7d8a7271b5f81cb1a508cabb6d2c5b8ddb8226 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e7d8a7271b5f81cb1a508c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 5 12:49:51 2005 +0100 msvidc32: Add a comment for DllMain() to stop winapi_check from complaining about it. --- dlls/msvidc32/msvideo1.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 0932978..f971d4f 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -561,6 +561,9 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT return r; } +/*********************************************************************** + * DllMain + */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);

1 0

Cihan Altinay : riched20: register ListBox & ComboBox classes
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 2a1a0cf22dbef9b4acc2d76b339e16f2b141d554 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a1a0cf22dbef9b4acc2d76… Author: Cihan Altinay <cihan(a)uq.edu.au> Date: Mon Dec 5 12:48:45 2005 +0100 riched20: register ListBox & ComboBox classes Partially implement REExtendedRegisterClass() to register missing window classes so that applications relying on them don't get confused. --- dlls/riched20/editor.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a25a90d..1383bcf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2,6 +2,7 @@ * RichEdit - functions dealing with editor object * * Copyright 2004 by Krzysztof Foltman + * Copyright 2005 by Cihan Altinay * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -208,6 +209,7 @@ * - full justification * - hyphenation * - tables + * - ListBox & ComboBox not implemented * * Bugs that are probably fixed, but not so easy to verify: * - EN_UPDATE/EN_CHANGE are handled very incorrectly (should be OK now) @@ -235,6 +237,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); int me_debug = 0; HANDLE me_heap = NULL; +static BOOL ME_ListBoxRegistered = FALSE; +static BOOL ME_ComboBoxRegistered = FALSE; + static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -934,6 +939,8 @@ void ME_DestroyEditor(ME_TextEditor *edi static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; +static WCHAR wszClassNameListBox[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; +static WCHAR wszClassNameComboBox[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -951,6 +958,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, UnregisterClassW(wszClassName50, 0); UnregisterClassA("RichEdit20A", 0); UnregisterClassA("RichEdit50A", 0); + if (ME_ListBoxRegistered) + UnregisterClassW(wszClassNameListBox, 0); + if (ME_ComboBoxRegistered) + UnregisterClassW(wszClassNameComboBox, 0); HeapDestroy (me_heap); me_heap = NULL; break; @@ -2167,12 +2178,62 @@ HRESULT WINAPI CreateTextServices(IUnkno return E_FAIL; /* E_NOTIMPL isn't allowed by MSDN */ } +LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + /****************************************************************** * REExtendedRegisterClass (RICHED20.8) * * FIXME undocumented + * Need to check for errors and implement controls and callbacks */ -void WINAPI REExtendedRegisterClass(void) +LRESULT WINAPI REExtendedRegisterClass(void) { - FIXME("stub\n"); + WNDCLASSW wcW; + UINT result; + + FIXME("semi stub\n"); + + wcW.cbClsExtra = 0; + wcW.cbWndExtra = 4; + wcW.hInstance = NULL; + wcW.hIcon = NULL; + wcW.hCursor = NULL; + wcW.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcW.lpszMenuName = NULL; + + if (!ME_ListBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; + wcW.lpfnWndProc = REListWndProc; + wcW.lpszClassName = wszClassNameListBox; + if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; + } + + if (!ME_ComboBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; + wcW.lpfnWndProc = REComboWndProc; + wcW.lpszClassName = wszClassNameComboBox; + if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; + } + + result = 0; + if (ME_ListBoxRegistered) + result += 1; + if (ME_ComboBoxRegistered) + result += 2; + + return result; }

1 0

Pavel Roskin : notepad: Russian translation for Font... menu item.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 83f2069b6dabb6ad50244e01facadb1dd9b55787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83f2069b6dabb6ad50244e0… Author: Pavel Roskin <proski(a)gnu.org> Date: Mon Dec 5 12:48:58 2005 +0100 notepad: Russian translation for "Font..." menu item. --- programs/notepad/Ru.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index deea89b..bb98229 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -44,6 +44,7 @@ POPUP "&��" { MENUITEM "��&� � ��\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&�� ", CMD_WRAP + MENUITEM "&��...", CMD_FONT } POPUP "�&��" { MENUITEM "&��", CMD_SEARCH

1 0

YunSong Hwang : winefile: Fix an incorrect translation.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 38dbf09da2eee8155fca383b48bcc95e97d95482 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38dbf09da2eee8155fca383… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Mon Dec 5 12:48:33 2005 +0100 winefile: Fix an incorrect translation. --- programs/winefile/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Ko.rc b/programs/winefile/Ko.rc index 13150de..602f4f0 100644 --- a/programs/winefile/Ko.rc +++ b/programs/winefile/Ko.rc @@ -29,7 +29,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_WINEFILE MENU FIXED IMPURE { POPUP "��(&F)" { - MENUITEM "��(&O)\OCtEnter", ID_ACTIVATE + MENUITEM "��(&O)\tEnter", ID_ACTIVATE MENUITEM "�̵�(&M)...\tF7", ID_FILE_MOVE MENUITEM "��(&C)...\tF8", ID_FILE_COPY MENUITEM "Ŭ��(&I)...\tF9", 118

1 0

Alexander N. Sørnes : Update Norwegian Bokmaal resources.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: f33d726276c5f13eec0ebd7d291d0d8992400971 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f33d726276c5f13eec0ebd7… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 5 12:02:38 2005 +0100 Update Norwegian Bokmaal resources. --- dlls/commdlg/cdlg_No.rc | 6 ++--- dlls/iccvid/iccvid_No.rc | 25 +++++++++++++++++++++ dlls/iccvid/rsrc.rc | 1 + dlls/msvidc32/msvidc32_No.rc | 25 +++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + dlls/msvideo/msvfw32_No.rc | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvideo/rsrc.rc | 1 + programs/notepad/No.rc | 2 +- programs/regedit/No.rc | 41 ++++++++++++++++++++++++++++++++-- programs/winecfg/No.rc | 4 +++ 10 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 dlls/iccvid/iccvid_No.rc create mode 100644 dlls/msvidc32/msvidc32_No.rc create mode 100644 dlls/msvideo/msvfw32_No.rc

1 0

Patrick Ammann : wininet: compilation fix
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: d437f37f5840cec798fa80f87450f6ae09a4ada0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d437f37f5840cec798fa80f… Author: Patrick Ammann <pammann(a)aro.ch> Date: Mon Dec 5 12:01:56 2005 +0100 wininet: compilation fix - make netconnection.c compile when HAVE_OPENSSL_SSL_H or HAVE_OPENSSL_ERR_H are not defined. --- dlls/wininet/netconnection.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3c13818..f488d69 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -36,6 +36,8 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <stdio.h> +#include <errno.h> #include "wine/library.h" #include "windef.h" @@ -317,13 +319,13 @@ BOOL NETCON_close(WININET_NETCONNECTION } return TRUE; } - +#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H static BOOL check_hostname(X509 *cert, char *hostname) { /* FIXME: implement */ return TRUE; } - +#endif /****************************************************************************** * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection.

1 0

Eric Pouech : winmm: driver unloading.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 60884fc3b33a152277a15568dcccd5abe99ac530 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60884fc3b33a152277a1556… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:01:26 2005 +0100 winmm: driver unloading. - properly handle drivers unloading when no session instance of the driver has been created --- dlls/winmm/driver.c | 8 ++++++-- dlls/winmm/winemm.h | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index dabce42..717ba47 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -291,6 +291,7 @@ LPWINE_DRIVER DRIVER_TryOpenDriver32(LPC cause = "load1 failed"; goto exit; } + lpDrv->dwFlags |= WINE_GDF_SESSION; return ret; } @@ -416,8 +417,11 @@ LRESULT WINAPI CloseDriver(HDRVR hDrvr, { LPWINE_DRIVER lpDrv0; + if (lpDrv->dwFlags & WINE_GDF_SESSION) + FIXME("Shouldn't happen (%p)\n", lpDrv); /* if driver has an opened session instance, we have to close it too */ - if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1) + if (DRIVER_GetNumberOfModuleRefs(lpDrv->d.d32.hModule, &lpDrv0) == 1 && + (lpDrv0->dwFlags & WINE_GDF_SESSION)) { DRIVER_SendMessage(lpDrv0, DRV_CLOSE, 0L, 0L); lpDrv0->d.d32.dwDriverID = 0; @@ -456,7 +460,7 @@ DWORD WINAPI GetDriverFlags(HDRVR hDrvr) TRACE("(%p)\n", hDrvr); if ((lpDrv = DRIVER_FindFromHDrvr(hDrvr)) != NULL) { - ret = WINE_GDF_EXIST | lpDrv->dwFlags; + ret = WINE_GDF_EXIST | (lpDrv->dwFlags & WINE_GDF_EXTERNAL_MASK); } return ret; } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 4725359..3295199 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -306,8 +306,11 @@ extern unsigned (*pFnLoadMMDrvFu extern LRESULT (*pFnMmioCallback16)(DWORD,LPMMIOINFO,UINT,LPARAM,LPARAM); extern void (WINAPI *pFnReleaseThunkLock)(DWORD*); extern void (WINAPI *pFnRestoreThunkLock)(DWORD); + /* GetDriverFlags() returned bits is not documented (nor the call itself) * Here are Wine only definitions of the bits */ -#define WINE_GDF_EXIST 0x80000000 -#define WINE_GDF_16BIT 0x10000000 +#define WINE_GDF_EXIST 0x80000000 +#define WINE_GDF_16BIT 0x10000000 +#define WINE_GDF_EXTERNAL_MASK 0xF0000000 +#define WINE_GDF_SESSION 0x00000001

1 0

Eric Pouech : dbghelp,winedbg: SYMBOL_INFO fix.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 34db4856ae0431dd0c6e14ee6e35729271070052 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34db4856ae0431dd0c6e14e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 5 12:00:54 2005 +0100 dbghelp,winedbg: SYMBOL_INFO fix. - native dbghelp returns in SYMBOL_INFO.TypeIndex the index of the type of the symbol (we were returning the symbol index instead) - fixed winedbg accordingly --- dlls/dbghelp/symbol.c | 5 +++-- dlls/dbghelp/type.c | 1 + programs/winedbg/expr.c | 6 ++---- programs/winedbg/symbol.c | 13 +++++-------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0dfa606..c47c04c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -443,8 +443,9 @@ static void symt_fill_sym_info(const str const char* name; DWORD64 size; - sym_info->TypeIndex = (DWORD)sym; - sym_info->info = 0; /* TBD */ + if (!symt_get_info(sym, TI_GET_TYPE, &sym_info->TypeIndex)) + sym_info->TypeIndex = 0; + sym_info->info = (DWORD)sym; symt_get_info(sym, TI_GET_LENGTH, &size); sym_info->Size = (DWORD)size; sym_info->ModBase = module->module.BaseOfImage; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 7617be8..fba6942 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -718,6 +718,7 @@ BOOL symt_get_info(const struct symt* ty default: FIXME("Unsupported sym-tag %s for get-type\n", symt_get_tag_str(type->tag)); + case SymTagPublicSymbol: case SymTagThunk: return FALSE; } diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 848eb91..5eb4d49 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -461,10 +461,8 @@ struct dbg_lvalue expr_eval(struct expr* exp->un.call.result = 0; #endif rtn.cookie = DLV_HOST; - /* get function signature type */ - types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type); - /* and now, return type */ - types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type); + /* get return type from function signature tupe */ + types_get_info(&rtn.type, TI_GET_TYPE, &rtn.type.id); rtn.addr.Offset = (unsigned int)&exp->un.call.result; break; case EXPR_TYPE_INTVAR: diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 61ef3dc..f7dcfce 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -40,6 +40,7 @@ static BOOL symbol_get_debug_start(DWORD int i; struct dbg_type type; + if (!typeid) return FALSE; /* native dbghelp not always fills the info field */ type.module = mod_base; type.id = typeid; @@ -134,7 +135,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* if (sgv->lineno == -1) { if (!sgv->bp_disp || - !symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &addr)) + !symbol_get_debug_start(sym->ModBase, sym->info, &addr)) addr = sym->Address; } else @@ -185,9 +186,7 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sgv->syms[insp].lvalue.addr.Mode = AddrModeFlat; sgv->syms[insp].lvalue.addr.Offset = addr; sgv->syms[insp].lvalue.type.module = sym->ModBase; - sgv->syms[insp].lvalue.type.id = sym->TypeIndex; - types_get_info(&sgv->syms[insp].lvalue.type, TI_GET_TYPE, - &sgv->syms[insp].lvalue.type.id); + sgv->syms[insp].lvalue.type.id = sym->TypeIndex; sgv->syms[insp].flags = sym->Flags; sgv->num++; @@ -463,7 +462,7 @@ enum dbg_line_status symbol_get_function if (!SymGetLineFromAddr(dbg_curr_process->handle, lin, &disp, &il)) return dbg_no_line_info; - if (symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &start) && lin < start) + if (symbol_get_debug_start(sym->ModBase, sym->info, &start) && lin < start) return dbg_not_on_a_line_number; if (!sym->Size) sym->Size = 0x100000; if (il.FileName && il.FileName[0] && disp < sym->Size) @@ -545,7 +544,6 @@ static BOOL CALLBACK info_locals_cb(SYMB dbg_printf("\t"); type.module = sym->ModBase; type.id = sym->TypeIndex; - types_get_info(&type, TI_GET_TYPE, &type.id); types_print_type(&type, FALSE); if (sym->Flags & SYMFLAG_PARAMETER) explain = "parameter"; @@ -624,8 +622,7 @@ static BOOL CALLBACK symbols_info_cb(SYM type.id = sym->TypeIndex; type.module = sym->ModBase; - if (sym->TypeIndex != dbg_itype_none && sym->TypeIndex != 0 && - types_get_info(&type, TI_GET_TYPE, &type.id)) + if (sym->TypeIndex != dbg_itype_none && sym->TypeIndex != 0) { dbg_printf(" "); types_print_type(&type, FALSE);

1 0

Michael Stefaniuc : Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong).
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 8ec390676890a64e4c32a060a3340fed7350d5eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ec390676890a64e4c32a06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 5 12:00:24 2005 +0100 Fix VarBstrCmp for NULL input BSTRs (MSDN is wrong). --- dlls/oleaut32/tests/vartype.c | 32 ++++++++++++++++++++++++++++++++ dlls/oleaut32/vartype.c | 18 ++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 9beaa35..d77655c 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -516,6 +516,7 @@ static HRESULT (WINAPI *pVarBoolFromUI8) static HRESULT (WINAPI *pVarBstrFromR4)(FLOAT,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); +static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); static HRESULT (WINAPI *pVarCmp)(LPVARIANT,LPVARIANT,LCID,ULONG); @@ -4960,6 +4961,36 @@ static void test_VarBstrFromDec(void) #undef BSTR_DEC #undef BSTR_DEC64 +#define _VARBSTRCMP(left,right,lcid,flags,result) \ + hres = pVarBstrCmp(left,right,lcid,flags); \ + ok(hres == result, "VarBstrCmp: expected " #result ", got hres=0x%lx\n", hres) +#define VARBSTRCMP(left,right,result) \ + _VARBSTRCMP(left,right,lcid,0,result) + +static void test_VarBstrCmp(void) +{ + LCID lcid; + HRESULT hres; + static const WCHAR sz[] = {'W','u','r','s','c','h','t','\0'}; + static const WCHAR szempty[] = {'\0'}; + BSTR bstr, bstrempty; + + CHECKPTR(VarBstrCmp); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + bstr = SysAllocString(sz); + bstrempty = SysAllocString(szempty); + + /* NULL handling. Yepp, MSDN is totaly wrong here */ + VARBSTRCMP(NULL,NULL,VARCMP_EQ); + VARBSTRCMP(bstr,NULL,VARCMP_GT); + VARBSTRCMP(NULL,bstr,VARCMP_LT); + + /* NULL and empty string comparisions */ + VARBSTRCMP(bstrempty,NULL,VARCMP_EQ); + VARBSTRCMP(NULL,bstrempty,VARCMP_EQ); +} + /* Get the internal representation of a BSTR */ static inline LPINTERNAL_BSTR Get(const BSTR lpszString) { @@ -5968,6 +5999,7 @@ START_TEST(vartype) test_VarBstrFromR4(); test_VarBstrFromDate(); test_VarBstrFromDec(); + test_VarBstrCmp(); test_SysStringLen(); test_SysStringByteLen(); test_SysAllocString(); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2075827..1214752 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6599,23 +6599,21 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft * RETURNS * VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that pbstrLeft is less * than, equal to or greater than pbstrRight respectively. - * VARCMP_NULL is returned if either string is NULL, unless both are NULL - * in which case VARCMP_EQ is returned. + * + * NOTES + * VARCMP_NULL is NOT returned if either string is NULL unlike MSDN + * states. A NULL BSTR pointer is equivalent to an empty string. */ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFlags) { - if (!pbstrLeft) + if (!pbstrLeft || !*pbstrLeft) { if (!pbstrRight || !*pbstrRight) return VARCMP_EQ; - return VARCMP_NULL; - } - else if (!pbstrRight) - { - if (!*pbstrLeft) - return VARCMP_EQ; - return VARCMP_NULL; + return VARCMP_LT; } + else if (!pbstrRight || !*pbstrRight) + return VARCMP_GT; return CompareStringW(lcid, dwFlags, pbstrLeft, -1, pbstrRight, -1) - 1; }

1 0

Milko Krachounov : Update the Bulgarian resources for commdlg and regedit.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 58e156b5e8e490d3c119cd11f36fdc09407f3015 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58e156b5e8e490d3c119cd1… Author: Milko Krachounov <milko(a)3mhz.net> Date: Mon Dec 5 12:00:04 2005 +0100 Update the Bulgarian resources for commdlg and regedit. --- dlls/commdlg/cdlg_Bg.rc | 6 +++--- programs/regedit/Bg.rc | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/commdlg/cdlg_Bg.rc b/dlls/commdlg/cdlg_Bg.rc index 3dafd69..33a756a 100644 --- a/dlls/commdlg/cdlg_Bg.rc +++ b/dlls/commdlg/cdlg_Bg.rc @@ -406,9 +406,9 @@ �� .\n�� PD32_OUT_OF_MEMORY "�� ." PD32_GENERIC_ERROR "�� ." PD32_DRIVER_UNKNOWN "�� ." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." + PD32_NO_DEVICES "�� , \ +�� , \ +�� . �� ." PD32_DEFAULT_PRINTER "�� ; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "�� %d �� " diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index 5e29842..e40c216 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -59,8 +59,8 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&�� ", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&��\tCtrl+F", ID_EDIT_FIND + MENUITEM "�� &��\tF3", ID_EDIT_FINDNEXT END POPUP "&��" BEGIN @@ -130,6 +130,22 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��:",IDC_STATIC,5,7,119,8 + EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "�� :",IDC_STATIC,5, 22, 119, 8 + CHECKBOX "��", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�� ", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + DEFPUSHBUTTON "��",IDOK,175,5,30,11,WS_GROUP + PUSHBUTTON "��",IDCANCEL,175,22,30,11, WS_GROUP +END + IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�� "

1 0

Marcus Meissner : winsock: Rewrote mappers to use sizeof() based loops.
by Alexandre Julliard Dec. 5, 2005

Dec. 5, 2005

Module: wine Branch: refs/heads/master Commit: 851328cd853f9c443d746eba76d1c067b146f2f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=851328cd853f9c443d746eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Dec 5 11:59:43 2005 +0100 winsock: Rewrote mappers to use sizeof() based loops. Added IPPROTO_IP and AF_UNSPEC to the mappers. --- dlls/winsock/socket.c | 38 +++++++++++++------------------------- 1 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index db903f7..e83e747 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -260,7 +260,6 @@ static const int ws_sock_map[][2] = #ifdef SO_SNDTIMEO MAP_OPTION( SO_SNDTIMEO ), #endif - { 0, 0 } }; static const int ws_tcp_map[][2] = @@ -268,7 +267,6 @@ static const int ws_tcp_map[][2] = #ifdef TCP_NODELAY MAP_OPTION( TCP_NODELAY ), #endif - { 0, 0 } }; static const int ws_ip_map[][2] = @@ -284,17 +282,16 @@ static const int ws_ip_map[][2] = #endif MAP_OPTION( IP_TOS ), MAP_OPTION( IP_TTL ), - { 0, 0 } }; static const int ws_af_map[][2] = { + MAP_OPTION( AF_UNSPEC ), MAP_OPTION( AF_INET ), MAP_OPTION( AF_INET6 ), #ifdef HAVE_IPX MAP_OPTION( AF_IPX ), #endif - { 0, 0 } }; static const int ws_socktype_map[][2] = @@ -302,17 +299,16 @@ static const int ws_socktype_map[][2] = MAP_OPTION( SOCK_DGRAM ), MAP_OPTION( SOCK_STREAM ), MAP_OPTION( SOCK_RAW ), - { 0, 0 } }; static const int ws_proto_map[][2] = { + MAP_OPTION( IPPROTO_IP ), MAP_OPTION( IPPROTO_TCP ), MAP_OPTION( IPPROTO_UDP ), MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ), - { 0, 0 } }; static const int ws_aiflag_map[][2] = @@ -323,7 +319,6 @@ static const int ws_aiflag_map[][2] = /* Linux/UNIX knows a lot more. But Windows only * has 3 as far as I could see. -Marcus */ - { 0, 0 } }; static const int ws_eai_map[][2] = @@ -531,8 +526,7 @@ static int convert_sockopt(INT *level, I { case WS_SOL_SOCKET: *level = SOL_SOCKET; - for(i=0; ws_sock_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_sock_map)/sizeof(ws_sock_map[0]); i++) { if( ws_sock_map[i][0] == *optname ) { *optname = ws_sock_map[i][1]; @@ -543,8 +537,7 @@ static int convert_sockopt(INT *level, I break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; - for(i=0; ws_tcp_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_tcp_map)/sizeof(ws_tcp_map[0]); i++) { if ( ws_tcp_map[i][0] == *optname ) { *optname = ws_tcp_map[i][1]; @@ -555,8 +548,7 @@ static int convert_sockopt(INT *level, I break; case WS_IPPROTO_IP: *level = IPPROTO_IP; - for(i=0; ws_ip_map[i][0]; i++) - { + for(i=0; i<sizeof(ws_ip_map)/sizeof(ws_ip_map[0]); i++) { if (ws_ip_map[i][0] == *optname ) { *optname = ws_ip_map[i][1]; @@ -727,7 +719,7 @@ static int convert_af_w2u(int windowsaf) { int i; - for (i=0;ws_af_map[i][0];i++) + for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) if (ws_af_map[i][0] == windowsaf) return ws_af_map[i][1]; FIXME("unhandled Windows address family %d\n", windowsaf); @@ -738,7 +730,7 @@ static int convert_af_u2w(int unixaf) { int i; - for (i=0;ws_af_map[i][0];i++) + for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) if (ws_af_map[i][1] == unixaf) return ws_af_map[i][0]; FIXME("unhandled UNIX address family %d\n", unixaf); @@ -749,7 +741,7 @@ static int convert_proto_w2u(int windowsproto) { int i; - for (i=0;ws_proto_map[i][0];i++) + for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; FIXME("unhandled Windows socket protocol %d\n", windowsproto); @@ -760,11 +752,9 @@ static int convert_proto_u2w(int unixproto) { int i; - for (i=0;ws_proto_map[i][0];i++) + for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; - if (unixproto == 0) /* 0 is ok too as wild card */ - return 0; FIXME("unhandled UNIX socket protocol %d\n", unixproto); return -1; } @@ -773,7 +763,7 @@ static int convert_socktype_w2u(int windowssocktype) { int i; - for (i=0;ws_socktype_map[i][0];i++) + for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) if (ws_socktype_map[i][0] == windowssocktype) return ws_socktype_map[i][1]; FIXME("unhandled Windows socket type %d\n", windowssocktype); @@ -784,7 +774,7 @@ static int convert_socktype_u2w(int unixsocktype) { int i; - for (i=0;ws_socktype_map[i][0];i++) + for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) if (ws_socktype_map[i][1] == unixsocktype) return ws_socktype_map[i][0]; FIXME("unhandled UNIX socket type %d\n", unixsocktype); @@ -3089,12 +3079,11 @@ void WINAPI WS_freeaddrinfo(struct WS_ad static int convert_aiflag_w2u(int winflags) { int i, unixflags = 0; - for (i=0;ws_aiflag_map[i][0];i++) { + for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) if (ws_aiflag_map[i][0] & winflags) { unixflags |= ws_aiflag_map[i][1]; winflags &= ~ws_aiflag_map[i][0]; } - } if (winflags) FIXME("Unhandled windows AI_xxx flags %x\n", winflags); return unixflags; @@ -3103,12 +3092,11 @@ static int convert_aiflag_w2u(int winfla static int convert_aiflag_u2w(int unixflags) { int i, winflags = 0; - for (i=0;ws_aiflag_map[i][0];i++) { + for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) if (ws_aiflag_map[i][1] & unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; } - } if (unixflags) /* will warn usually */ WARN("Unhandled UNIX AI_xxx flags %x\n", unixflags); return winflags;

1 0

lostwages/ news/2005120201.xml wwn/wn20051202_ ...
by WineHQ Dec. 5, 2005

Dec. 5, 2005

ChangeSet ID: 21659 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/04 23:29:39 Added files: news : 2005120201.xml wwn : wn20051202_300.xml Log message: WWN #300. Patch: http://cvs.winehq.org/patch.py?id=21659 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005120201.xml Added 1.1 +0 -0 lostwages/wwn/wn20051202_300.xml

1 0

appdb/include application.php version.php
by WineHQ Dec. 5, 2005

Dec. 5, 2005

ChangeSet ID: 21658 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/12/04 22:19:14 Modified files: include : application.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix SendNotificationEmail() so it appends to the existing message in the 'edit' case instead of overwriting the message passed in Patch: http://cvs.winehq.org/patch.py?id=21658 Old revision New revision Changes Path 1.38 1.39 +1 -1 appdb/include/application.php 1.43 1.44 +1 -1 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.38 appdb/include/application.php:1.39 --- appdb/include/application.php:1.38 5 Dec 2005 4:19:14 -0000 +++ appdb/include/application.php 5 Dec 2005 4:19:14 -0000 @@ -376,7 +376,7 @@ class Application { break; case "edit": $sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; + $sMsg .= APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; addmsg("Application modified.", "green"); break; case "delete": Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.43 appdb/include/version.php:1.44 --- appdb/include/version.php:1.43 5 Dec 2005 4:19:14 -0000 +++ appdb/include/version.php 5 Dec 2005 4:19:14 -0000 @@ -486,7 +486,7 @@ class Version { break; case "edit": $sSubject = "'".$oApp->sName." ".$this->sName."' has been modified by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; + $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; addmsg("Version modified.", "green"); break; case "delete":

1 0

Robert Shearman : OLE: Support HREFTYPEs For ITypeInfos
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 190d05f4db08190b86517832a5608325da9734e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=190d05f4db08190b8651783… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:20:27 2005 +0100 OLE: Support HREFTYPEs For ITypeInfos Add support for reading the hreftype of a typeinfo, return it to the application in ITypeComp_Bind for the DESKIND_APPOBJECT case and support referencing it in ITypeInfo_GetRefTypeInfo. --- dlls/oleaut32/typelib.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3e4b83b..4d8a736 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -976,6 +976,7 @@ typedef struct tagITypeInfoImpl TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ + HREFTYPE hreftype; /* hreftype for app object binding */ /* type libs seem to store the doc strings in ascii * so why should we do it in unicode? */ @@ -1448,6 +1449,22 @@ static void MSFT_ReadGuid( GUID *pGuid, TRACE_(typelib)("%s\n", debugstr_guid(pGuid)); } +static HREFTYPE MSFT_ReadHreftype( TLBContext *pcx, int offset ) +{ + MSFT_NameIntro niName; + + if (offset < 0) + { + ERR_(typelib)("bad offset %d\n", offset); + return -1; + } + + MSFT_ReadLEDWords(&niName, sizeof(niName), pcx, + pcx->pTblDir->pNametab.offset+offset); + + return niName.hreftype; +} + static BSTR MSFT_ReadName( TLBContext *pcx, int offset) { char * name; @@ -2057,6 +2074,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( /* name, eventually add to a hash table */ ptiRet->Name=MSFT_ReadName(pcx, tiBase.NameOffset); + ptiRet->hreftype = MSFT_ReadHreftype(pcx, tiBase.NameOffset); TRACE_(typelib)("reading %s\n", debugstr_w(ptiRet->Name)); /* help info */ ptiRet->DocString=MSFT_ReadString(pcx, tiBase.docstringoffs); @@ -4111,7 +4129,7 @@ static HRESULT WINAPI ITypeLibComp_fnBin TYPEDESC tdesc_appobject = { { - 0 /* FIXME */ + (TYPEDESC *)pTypeInfo->hreftype }, VT_USERDEFINED }; @@ -4153,6 +4171,9 @@ static HRESULT WINAPI ITypeLibComp_fnBin } if (subtypeinfo) ITypeInfo_Release(subtypeinfo); + if (pTypeInfo->hreftype == -1) + FIXME("no hreftype for interface %p\n", pTypeInfo); + hr = TLB_AllocAndInitVarDesc(&vardesc_appobject, &pBindPtr->lpvardesc); if (FAILED(hr)) return hr; @@ -4202,6 +4223,7 @@ static ITypeInfo2 * WINAPI ITypeInfo_Con pTypeInfoImpl->lpVtbl = &tinfvt; pTypeInfoImpl->lpVtblTypeComp = &tcompvt; pTypeInfoImpl->ref=1; + pTypeInfoImpl->hreftype = -1; } TRACE("(%p)\n", pTypeInfoImpl); return (ITypeInfo2*) pTypeInfoImpl; @@ -5535,7 +5557,13 @@ static HRESULT WINAPI ITypeInfo_fnGetRef ITypeInfoImpl *This = (ITypeInfoImpl *)iface; HRESULT result = E_FAIL; - if (hRefType == -1 && + if ((This->hreftype != -1) && (This->hreftype == hRefType)) + { + *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + result = S_OK; + } + else if (hRefType == -1 && (((ITypeInfoImpl*) This)->TypeAttr.typekind == TKIND_DISPATCH) && (((ITypeInfoImpl*) This)->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) {

1 0

Robert Shearman : OLE: fix function name loading
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d8d1693def4dea73b60d9ce0786bf938a0a6f7cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d8d1693def4dea73b60d9ce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:20:03 2005 +0100 OLE: fix function name loading Correctly get the name of the second function of a propget/propput pair in MSFT typelibs when the name offset is set to -1. --- dlls/oleaut32/typelib.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07fa031..3e4b83b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1685,6 +1685,7 @@ MSFT_DoFuncs(TLBContext* pcx, char recbuf[512]; MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; + TLBFuncDesc *ptfd_prev = NULL; TRACE_(typelib)("\n"); @@ -1698,7 +1699,12 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&nameoffset, sizeof(INT), pcx, offset + infolen + (cFuncs + cVars + i + 1) * sizeof(INT)); - (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); + /* nameoffset is sometimes -1 on the second half of a propget/propput + * pair of functions */ + if ((nameoffset == -1) && (i > 0)) + (*pptfd)->Name = SysAllocString(ptfd_prev->Name); + else + (*pptfd)->Name = MSFT_ReadName(pcx, nameoffset); /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); @@ -1844,6 +1850,8 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), pInt[j], pcx); } + else + elemdesc->u.paramdesc.pparamdescex = NULL; /* custom info */ if ( nrattributes > 7 + j && pFuncRec->FKCCIC & 0x80 ) { @@ -1867,6 +1875,7 @@ MSFT_DoFuncs(TLBContext* pcx, (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; + ptfd_prev = *pptfd; pptfd = & ((*pptfd)->next); recoffset += reclength; }

1 0

Robert Shearman : OLE: fix invoking dispinterface functions
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: bd8fefd66b8457c39420ee146a6bd42effe7ee49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd8fefd66b8457c39420ee1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:19:17 2005 +0100 OLE: fix invoking dispinterface functions Fix invoking dispinterface functions by using the internal representation of the function, not the one returned to applications. --- dlls/oleaut32/typelib.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8e37ea9..07fa031 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5185,25 +5185,29 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; - unsigned int func_index, var_index; + unsigned int var_index; TYPEKIND type_kind; HRESULT hres; + const TLBFuncDesc *pFuncInfo; TRACE("(%p)(%p,id=%ld,flags=0x%08x,%p,%p,%p,%p) partial stub!\n", This,pIUnk,memid,dwFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); dump_DispParms(pDispParams); - hres = ITypeInfo2_GetFuncIndexOfMemId(iface, memid, dwFlags, &func_index); - if (SUCCEEDED(hres)) { - FUNCDESC *func_desc; + /* we do this instead of using GetFuncDesc since it will return a fake + * FUNCDESC for dispinterfaces and we want the real function description */ + for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) + if (memid == pFuncInfo->funcdesc.memid && (dwFlags & pFuncInfo->funcdesc.invkind)) + break; + + if (pFuncInfo) { + const FUNCDESC *func_desc = &pFuncInfo->funcdesc; - hres = ITypeInfo2_GetFuncDesc(iface, func_index, &func_desc); - if(FAILED(hres)) return hres; if (TRACE_ON(ole)) { TRACE("invoking:\n"); - dump_FUNCDESC(func_desc); + dump_TLBFuncDesc(pFuncInfo); } switch (func_desc->funckind) { @@ -5376,7 +5380,6 @@ func_fail: break; } - ITypeInfo2_ReleaseFuncDesc(iface, func_desc); TRACE("-- 0x%08lx\n", hres); return hres;

1 0

H. Verbeet : wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 246b07de7c6390f59b48f997c8e3038cc182e95d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=246b07de7c6390f59b48f99… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:10:56 2005 +0100 wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent. Remove an unnecessary cast. --- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a22f39b..123b3a5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -100,7 +100,7 @@ ULONG WINAPI IWineD3DPixelShaderImpl_Rel HRESULT WINAPI IWineD3DPixelShaderImpl_GetParent(IWineD3DPixelShader *iface, IUnknown** parent){ IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; - *parent= (IUnknown*) parent; + *parent = This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index ce5258d..af7a566 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -2012,7 +2012,7 @@ ULONG WINAPI IWineD3DVertexShaderImpl_Re HRESULT WINAPI IWineD3DVertexShaderImpl_GetParent(IWineD3DVertexShader *iface, IUnknown** parent){ IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - *parent = (IUnknown*)This->parent; + *parent = This->parent; IUnknown_AddRef(*parent); TRACE("(%p) : returning %p\n", This, *parent); return D3D_OK;

1 0

H. Verbeet : wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: c73679e4ebe68a505a261aa28d58de7b965c190d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c73679e4ebe68a505a261aa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:18:58 2005 +0100 wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction. --- dlls/wined3d/pixelshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 123b3a5..4f868ee 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1664,7 +1664,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S if (NULL != pToken) { while (D3DPS_END() != *pToken) { if (pshader_is_version_token(*pToken)) { /** version */ - version = *pToken & 0xFF; + version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); TRACE("ps_%lu_%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F)); ++pToken; ++len;

1 0

Robert Shearman : OLE: Move the dispinterface return value handling to functions that
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d48f6f36827dc12fd194fce6bc2c7b786fcb7b69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d48f6f36827dc12fd194fce… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:10:30 2005 +0100 OLE: Move the dispinterface return value handling to functions that return the FUNCDESC to the user. --- dlls/oleaut32/typelib.c | 76 +++++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 32c2780..8e37ea9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1863,38 +1863,6 @@ MSFT_DoFuncs(TLBContext* pcx, } } - /* special treatment for dispinterfaces: this makes functions appear - * to return their [retval] value when it is really returning an - * HRESULT */ - if ((pTI->TypeAttr.typekind == TKIND_DISPATCH) && - (*pptfd)->funcdesc.elemdescFunc.tdesc.vt == VT_HRESULT) - { - if (pFuncRec->nrargs && - ((*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) - { - ELEMDESC *elemdesc = &(*pptfd)->funcdesc.lprgelemdescParam[pFuncRec->nrargs - 1]; - if (elemdesc->tdesc.vt != VT_PTR) - { - ERR_(typelib)("elemdesc should have started with VT_PTR instead of:\n"); - if (ERR_ON(typelib)) - dump_ELEMDESC(elemdesc); - /* FIXME: return error */ - break; - } - - (*pptfd)->funcdesc.elemdescFunc = *elemdesc; - - /* dereference parameter */ - (*pptfd)->funcdesc.elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; - - pFuncRec->nrargs--; - (*pptfd)->funcdesc.cParams = pFuncRec->nrargs; - } - else - (*pptfd)->funcdesc.elemdescFunc.tdesc.vt = VT_VOID; - - } - /* scode is not used: archaic win16 stuff FIXME: right? */ (*pptfd)->funcdesc.cScodes = 0 ; (*pptfd)->funcdesc.lprgscode = NULL ; @@ -4403,7 +4371,7 @@ static void TLB_FreeElemDesc( ELEMDESC * VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); } -static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr ) +static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_ptr, BOOL dispinterface ) { FUNCDESC *dest; char *buffer; @@ -4454,6 +4422,38 @@ static HRESULT TLB_AllocAndInitFuncDesc( return hr; } + /* special treatment for dispinterfaces: this makes functions appear + * to return their [retval] value when it is really returning an + * HRESULT */ + if (dispinterface && dest->elemdescFunc.tdesc.vt == VT_HRESULT) + { + if (dest->cParams && + (dest->lprgelemdescParam[dest->cParams - 1].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL)) + { + ELEMDESC *elemdesc = &dest->lprgelemdescParam[dest->cParams - 1]; + if (elemdesc->tdesc.vt != VT_PTR) + { + ERR("elemdesc should have started with VT_PTR instead of:\n"); + if (ERR_ON(ole)) + dump_ELEMDESC(elemdesc); + return E_UNEXPECTED; + } + + /* copy last parameter to the return value. we are using a flat + * buffer so there is no danger of leaking memory in + * elemdescFunc */ + dest->elemdescFunc.tdesc = *elemdesc->tdesc.u.lptdesc; + + /* remove the last parameter */ + dest->cParams--; + } + else + /* otherwise this function is made to appear to have no return + * value */ + dest->elemdescFunc.tdesc.vt = VT_VOID; + + } + *dest_ptr = dest; return S_OK; } @@ -4477,7 +4477,10 @@ static HRESULT WINAPI ITypeInfo_fnGetFun ; if(pFDesc) - return TLB_AllocAndInitFuncDesc(&pFDesc->funcdesc, ppFuncDesc); + return TLB_AllocAndInitFuncDesc( + &pFDesc->funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); return E_INVALIDARG; } @@ -6362,7 +6365,10 @@ static HRESULT WINAPI ITypeComp_fnBind( if (pFDesc) { - HRESULT hr = TLB_AllocAndInitFuncDesc(&pFDesc->funcdesc, &pBindPtr->lpfuncdesc); + HRESULT hr = TLB_AllocAndInitFuncDesc( + &pFDesc->funcdesc, + &pBindPtr->lpfuncdesc, + This->TypeAttr.typekind == TKIND_DISPATCH); if (FAILED(hr)) return hr; *pDescKind = DESCKIND_FUNCDESC;

1 0

Robert Shearman : wininet: Correctly set the last error when a called Unix network
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: efd067f2c36b118add41e2566a6957a5cdc5c5df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efd067f2c36b118add41e25… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:10:14 2005 +0100 wininet: Correctly set the last error when a called Unix network function fails. --- dlls/wininet/http.c | 5 -- dlls/wininet/internet.c | 2 + dlls/wininet/netconnection.c | 86 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 23affbc..f234530 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -38,8 +38,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <errno.h> -#include <string.h> #include <time.h> #include <assert.h> @@ -2237,10 +2235,7 @@ static BOOL HTTP_OpenConnection(LPWININE if (!NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress, sizeof(lpwhs->socketAddress))) - { - WARN("Unable to connect to host (%s)\n", strerror(errno)); goto lend; - } if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d3e84bb..b91c9ff 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2965,6 +2965,8 @@ void INTERNET_SetLastError(DWORD dwError DWORD INTERNET_GetLastError(void) { LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + /* TlsGetValue clears last error, so set it again here */ + SetLastError(lpwite->dwError); return lpwite->dwError; } diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 05c6562..3c13818 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -43,6 +43,11 @@ #include "wininet.h" #include "winerror.h" +/* To avoid conflicts with the Unix socket headers. we only need it for + * the error codes anyway. */ +#define USE_WS_PREFIX +#include "winsock2.h" + #include "wine/debug.h" #include "internet.h" @@ -192,6 +197,70 @@ BOOL NETCON_connected(WININET_NETCONNECT return TRUE; } +/* translate a unix error code into a winsock one */ +static int sock_get_error( int err ) +{ + switch (err) + { + case EINTR: return WSAEINTR; + case EBADF: return WSAEBADF; + case EPERM: + case EACCES: return WSAEACCES; + case EFAULT: return WSAEFAULT; + case EINVAL: return WSAEINVAL; + case EMFILE: return WSAEMFILE; + case EWOULDBLOCK: return WSAEWOULDBLOCK; + case EINPROGRESS: return WSAEINPROGRESS; + case EALREADY: return WSAEALREADY; + case ENOTSOCK: return WSAENOTSOCK; + case EDESTADDRREQ: return WSAEDESTADDRREQ; + case EMSGSIZE: return WSAEMSGSIZE; + case EPROTOTYPE: return WSAEPROTOTYPE; + case ENOPROTOOPT: return WSAENOPROTOOPT; + case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; + case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; + case EOPNOTSUPP: return WSAEOPNOTSUPP; + case EPFNOSUPPORT: return WSAEPFNOSUPPORT; + case EAFNOSUPPORT: return WSAEAFNOSUPPORT; + case EADDRINUSE: return WSAEADDRINUSE; + case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; + case ENETDOWN: return WSAENETDOWN; + case ENETUNREACH: return WSAENETUNREACH; + case ENETRESET: return WSAENETRESET; + case ECONNABORTED: return WSAECONNABORTED; + case EPIPE: + case ECONNRESET: return WSAECONNRESET; + case ENOBUFS: return WSAENOBUFS; + case EISCONN: return WSAEISCONN; + case ENOTCONN: return WSAENOTCONN; + case ESHUTDOWN: return WSAESHUTDOWN; + case ETOOMANYREFS: return WSAETOOMANYREFS; + case ETIMEDOUT: return WSAETIMEDOUT; + case ECONNREFUSED: return WSAECONNREFUSED; + case ELOOP: return WSAELOOP; + case ENAMETOOLONG: return WSAENAMETOOLONG; + case EHOSTDOWN: return WSAEHOSTDOWN; + case EHOSTUNREACH: return WSAEHOSTUNREACH; + case ENOTEMPTY: return WSAENOTEMPTY; +#ifdef EPROCLIM + case EPROCLIM: return WSAEPROCLIM; +#endif +#ifdef EUSERS + case EUSERS: return WSAEUSERS; +#endif +#ifdef EDQUOT + case EDQUOT: return WSAEDQUOT; +#endif +#ifdef ESTALE + case ESTALE: return WSAESTALE; +#endif +#ifdef EREMOTE + case EREMOTE: return WSAEREMOTE; +#endif + default: errno=err; perror("sock_set_error"); return WSAEFAULT; + } +} + /****************************************************************************** * NETCON_create * Basically calls 'socket()' @@ -206,7 +275,10 @@ BOOL NETCON_create(WININET_NETCONNECTION connection->socketFD = socket(domain, type, protocol); if (connection->socketFD == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } @@ -239,7 +311,10 @@ BOOL NETCON_close(WININET_NETCONNECTION connection->socketFD = -1; if (result == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } @@ -358,6 +433,9 @@ BOOL NETCON_connect(WININET_NETCONNECTIO result = connect(connection->socketFD, serv_addr, addrlen); if (result == -1) { + WARN("Unable to connect to host (%s)\n", strerror(errno)); + INTERNET_SetLastError(sock_get_error(errno)); + closesocket(connection->socketFD); connection->socketFD = -1; return FALSE; @@ -379,7 +457,10 @@ BOOL NETCON_send(WININET_NETCONNECTION * { *sent = send(connection->socketFD, msg, len, flags); if (*sent == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } else @@ -410,7 +491,10 @@ BOOL NETCON_recv(WININET_NETCONNECTION * { *recvd = recv(connection->socketFD, buf, len, flags); if (*recvd == -1) + { + INTERNET_SetLastError(sock_get_error(errno)); return FALSE; + } return TRUE; } else @@ -498,7 +582,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNE { if (recv(connection->socketFD, &lpszBuffer[nRecv], 1, 0) <= 0) { - INTERNET_SetLastError(ERROR_CONNECTION_ABORTED); /* fixme: right error? */ + INTERNET_SetLastError(sock_get_error(errno)); goto lend; }

1 0

Eric Pouech : winedbg: simplify some code.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 56dcea4d16e6ca85f0330c85cb66a1991ff39408 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=56dcea4d16e6ca85f0330c8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:09:59 2005 +0100 winedbg: simplify some code. --- programs/winedbg/symbol.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 1118fc0..61ef3dc 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -432,11 +432,10 @@ enum dbg_line_status symbol_get_function { IMAGEHLP_LINE il; DWORD disp; - ULONG64 disp64, start, size; + ULONG64 disp64, start; DWORD lin = (DWORD)memory_to_linear_addr(addr); char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* sym = (SYMBOL_INFO*)buffer; - struct dbg_type type; il.SizeOfStruct = sizeof(il); sym->SizeOfStruct = sizeof(SYMBOL_INFO); @@ -466,11 +465,8 @@ enum dbg_line_status symbol_get_function if (symbol_get_debug_start(sym->ModBase, sym->TypeIndex, &start) && lin < start) return dbg_not_on_a_line_number; - type.module = sym->ModBase; - type.id = sym->TypeIndex; - if (!types_get_info(&type, TI_GET_LENGTH, &size) || size == 0) - size = 0x100000; - if (il.FileName && il.FileName[0] && disp < size) + if (!sym->Size) sym->Size = 0x100000; + if (il.FileName && il.FileName[0] && disp < sym->Size) return (disp == 0) ? dbg_on_a_line_number : dbg_not_on_a_line_number; return dbg_no_line_info;

1 0

H. Verbeet : wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 4880c586d8013e7271c744f581eb19905d90e0f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4880c586d8013e7271c744f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat Dec 3 18:04:26 2005 +0100 wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and already recording. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b8dc5c..185bca7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4493,6 +4493,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_BeginS IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; TRACE("(%p)", This); + + if (This->isRecordingState) { + return D3DERR_INVALIDCALL; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DStateBlockImpl)); if (NULL == object ) { FIXME("(%p)Error allocating memory for stateblock\n", This);

1 0

Pavel Roskin : Fixed regression in wineconsole creation (curses backend).
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 2b1747ccda3b303a07402d821e06c7f7314dc6f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b1747ccda3b303a07402d8… Author: Pavel Roskin <proski at gnu.org> Date: Sat Dec 3 18:04:07 2005 +0100 Fixed regression in wineconsole creation (curses backend). --- programs/wineconsole/wineconsole.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 486d86d..d73dc96 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -290,17 +290,13 @@ int WINECON_GrabChanges(struct inner_dat break; case CONSOLE_RENDERER_SB_RESIZE_EVENT: if (data->curcfg.sb_width != evts[i].u.resize.width || - data->curcfg.sb_height != evts[i].u.resize.height || !data->cells) + data->curcfg.sb_height != evts[i].u.resize.height) { WINE_TRACE(" resize(%d,%d)", evts[i].u.resize.width, evts[i].u.resize.height); data->curcfg.sb_width = evts[i].u.resize.width; data->curcfg.sb_height = evts[i].u.resize.height; - if (data->cells) - data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, - data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - else - data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->cells = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->cells, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n"); @@ -557,9 +553,6 @@ static BOOL WINECON_GetServerConfig(stru } SERVER_END_REQ; WINECON_DumpConfig("first cfg: ", &data->curcfg); - data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); return ret; } @@ -655,6 +648,11 @@ static struct inner_data* WINECON_Init(H { case init_success: WINECON_GetServerConfig(data); + data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); + if (!data->cells) WINECON_Fatal("OOM\n"); + data->fnResizeScreenBuffer(data); + data->fnComputePositions(data); WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg);

1 0

Vincent Béron : winapi_check: fully descend in included files to check for prototype.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 18c5a0a2a0153ef22f40d90d25ba7a8172910758 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18c5a0a2a0153ef22f40d90… Author: Vincent Béron <vberon(a)mecano.gme.usherb.ca> Date: Sat Dec 3 18:03:50 2005 +0100 winapi_check: fully descend in included files to check for prototype. --- tools/winapi/winapi_check | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 8ad0550..1ef85dd 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -498,6 +498,18 @@ foreach my $file (@c_files) { my $type = shift; }; + sub recursive_include { + my $include = shift; + my $includes = shift; + + if(!defined($includes->{$include})) { + $includes->{$include}++; + foreach my $include (keys(%{$include2info{$include}{includes}})) { + recursive_include($include, \%$includes); + } + } + }; + my $preprocessor = 'preprocessor'->new($found_include, $found_conditional); my $found_preprocessor = sub { my $directive = shift; @@ -545,10 +557,7 @@ foreach my $file (@c_files) { } if(defined($include)) { - $includes{$include}++; - foreach my $include (keys(%{$include2info{$include}{includes}})) { - $includes{$include}++; - } + recursive_include($include, \%includes); } }

1 0

Robert Shearman : OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: a61e4e802ce05e9aa9380ec2547fe98016efd1ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a61e4e802ce05e9aa9380ec… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:03:29 2005 +0100 OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind. The INVOKE_PROPERTYGET flag shouldn't affect binding to variables; it should just affect which of a pair of [propget] and [propput] functions should be returned. --- dlls/oleaut32/typelib.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 09c6fd7..32c2780 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6370,18 +6370,15 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { - if (!(wFlags & ~(INVOKE_PROPERTYGET))) - { - for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) { - if (!strcmpW(pVDesc->Name, szName)) { - HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); - if (FAILED(hr)) - return hr; - *pDescKind = DESCKIND_VARDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; - ITypeInfo_AddRef(*ppTInfo); - return S_OK; - } + for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) { + if (!strcmpW(pVDesc->Name, szName)) { + HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); + if (FAILED(hr)) + return hr; + *pDescKind = DESCKIND_VARDESC; + *ppTInfo = (ITypeInfo *)&This->lpVtbl; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } } }

1 0

Robert Shearman : wininet: global function/data cleanup
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 067f09604ad69d2c41a2bc78a3c3308f60ce3d51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=067f09604ad69d2c41a2bc7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 3 18:03:08 2005 +0100 wininet: global function/data cleanup Make some functions and a structure static since they are only used in one file. --- dlls/wininet/ftp.c | 82 +++++++++++++++++----------------- dlls/wininet/http.c | 2 - dlls/wininet/internet.c | 114 ++++++++++++++++++++++++----------------------- dlls/wininet/internet.h | 2 - 4 files changed, 99 insertions(+), 101 deletions(-)

1 0

Eric Pouech : winedbg: fixed regression (and simplified code!) for arguments
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 30121124b95e388e6a25f7e0f073ec5a4be77191 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30121124b95e388e6a25f7e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:02:49 2005 +0100 winedbg: fixed regression (and simplified code!) for arguments printing in backtrace. --- programs/winedbg/stack.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index c7d4994..b33cf60 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -176,18 +176,11 @@ static BOOL WINAPI sym_enum_cb(SYMBOL_IN struct sym_enum* se = (struct sym_enum*)user; DWORD addr; unsigned val; - long offset; if ((sym_info->Flags & (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) == (SYMFLAG_PARAMETER|SYMFLAG_FRAMEREL)) { - struct dbg_type type; - if (se->tmp[0]) strcat(se->tmp, ", "); - addr = se->frame; - type.module = sym_info->ModBase; - type.id = sym_info->TypeIndex; - types_get_info(&type, TI_GET_OFFSET, &offset); - addr += offset; + addr = se->frame + sym_info->Address; if (dbg_read_memory((char*)addr, &val, sizeof(val))) sprintf(se->tmp + strlen(se->tmp), "%s=0x%x", sym_info->Name, val); else

1 0

Eric Pouech : winedbg: fixed regression in 'info local' command.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 28c503a947ee1e8498fbc5ea3be139d162677544 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28c503a947ee1e8498fbc5e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 3 18:02:31 2005 +0100 winedbg: fixed regression in 'info local' command. --- programs/winedbg/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 65a0bf7..1118fc0 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -579,7 +579,7 @@ static BOOL CALLBACK info_locals_cb(SYMB else if (sym->Flags & SYMFLAG_LOCAL) { type.id = sym->TypeIndex; - v = ((IMAGEHLP_STACK_FRAME*)ctx)->FrameOffset + sym->Address; + v = (ULONG)ctx + sym->Address; if (!dbg_read_memory((void*)v, &val, sizeof(val))) {

1 0

Aric Cyr : Move standard WGL function declarations to wingdi.h.
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: d0713d28e2b264d0aa719b765c5f4aa439a0d775 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0713d28e2b264d0aa719b7… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Sat Dec 3 18:01:51 2005 +0100 Move standard WGL function declarations to wingdi.h. dlls/opengl32/wgl.h is now empty and no longer needed. --- dlls/opengl32/wgl.c | 4 +- dlls/opengl32/wgl.h | 77 ----------------------------------------------- dlls/opengl32/wgl_ext.c | 7 ++++ include/wingdi.h | 18 +++++++++++ 4 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 dlls/opengl32/wgl.h diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 812e9aa..e35680d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -30,8 +30,8 @@ #include "winuser.h" #include "winerror.h" #include "winreg.h" +#include "wingdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -360,7 +360,7 @@ static int wgl_compar(const void *elt_a, ((const WGL_extension *) elt_b)->func_name); } -void* WINAPI wglGetProcAddress(LPCSTR lpszProc) { +PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { void *local_func; OpenGL_extension ext; OpenGL_extension *ext_ret; diff --git a/dlls/opengl32/wgl.h b/dlls/opengl32/wgl.h deleted file mode 100644 index a363c34..0000000 --- a/dlls/opengl32/wgl.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Window-specific OpenGL functions implementation. - * - * Copyright (c) 2000 Lionel Ulmer - * Copyright (c) 2005 Raphael Junqueira - * - * 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 - */ - -#ifndef __DLLS_OPENGL32_WGL_H -#define __DLLS_OPENGL32_WGL_H - -#include "wingdi.h" - -HGLRC WINAPI wglCreateContext(HDC hdc) ; -HGLRC WINAPI wglCreateLayerContext(HDC hdc, - int iLayerPlane) ; -BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, - HGLRC hglrcDst, - UINT mask) ; -BOOL WINAPI wglDeleteContext(HGLRC hglrc) ; -BOOL WINAPI wglDescribeLayerPlane(HDC hdc, - int iPixelFormat, - int iLayerPlane, - UINT nBytes, - LPLAYERPLANEDESCRIPTOR plpd) ; -HGLRC WINAPI wglGetCurrentContext(void) ; -HDC WINAPI wglGetCurrentDC(void) ; -int WINAPI wglGetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -void * WINAPI wglGetProcAddress(LPCSTR lpszProc) ; -BOOL WINAPI wglMakeCurrent(HDC hdc, - HGLRC hglrc) ; -BOOL WINAPI wglRealizeLayerPalette(HDC hdc, - int iLayerPlane, - BOOL bRealize) ; -int WINAPI wglSetLayerPaletteEntries(HDC hdc, - int iLayerPlane, - int iStart, - int cEntries, - const COLORREF *pcr) ; -BOOL WINAPI wglShareLists(HGLRC hglrc1, - HGLRC hglrc2) ; -BOOL WINAPI wglSwapLayerBuffers(HDC hdc, - UINT fuPlanes); -BOOL WINAPI wglUseFontBitmaps(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase) ; -BOOL WINAPI wglUseFontOutlines(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase, - FLOAT deviation, - FLOAT extrusion, - int format, - LPGLYPHMETRICSFLOAT lpgmf) ; -const char * WINAPI wglGetExtensionsStringARB(HDC hdc) ; - -BOOL WINAPI wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -HDC WINAPI wglGetCurrentReadDCARB(void) ; - -#endif /* __DLLS_OPENGL32_WGL_H */ diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index c4bc6cb..b323d7c 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -32,7 +32,6 @@ #include "winerror.h" #include "gdi.h" -#include "wgl.h" #include "wgl_ext.h" #include "opengl_ext.h" #include "wine/library.h" @@ -1120,6 +1119,12 @@ void wgl_ext_finalize_extensions(void) } } + +/* these are located in wgl.c for convenience of implementation */ +BOOL WINAPI wglMakeContextCurrentARB(HDC,HDC,HGLRC); +HDC WINAPI wglGetCurrentReadDCARB(void); + + /* * Putting this at the end to prevent having to write the prototypes :-) * diff --git a/include/wingdi.h b/include/wingdi.h index 89b1d07..032efbb 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3678,6 +3678,24 @@ BOOL WINAPI PolyTextOutW(HDC,PPOLYT #define WGL_SWAP_UNDERLAY14 (1 << 29) #define WGL_SWAP_UNDERLAY15 (1 << 30) +/* WGL prototypes */ +HGLRC WINAPI wglCreateContext(HDC); +HGLRC WINAPI wglCreateLayerContext(HDC,INT); +BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); +BOOL WINAPI wglDeleteContext(HGLRC); +BOOL WINAPI wglDescribeLayerPlane(HDC,INT,INT,UINT,LPLAYERPLANEDESCRIPTOR); +HGLRC WINAPI wglGetCurrentContext(void); +HDC WINAPI wglGetCurrentDC(void); +INT WINAPI wglGetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +PROC WINAPI wglGetProcAddress(LPCSTR); +BOOL WINAPI wglMakeCurrent(HDC,HGLRC); +BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); +INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); +BOOL WINAPI wglShareLists(HGLRC,HGLRC); +BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); +BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); +BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); + #ifdef __cplusplus } #endif

1 0

Aric Stewart : wcmd: mkdir recursive create
by Alexandre Julliard Dec. 3, 2005

Dec. 3, 2005

Module: wine Branch: refs/heads/master Commit: 1d5adff0f1216f9930762c00cdb44d1e16e73836 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d5adff0f1216f9930762c0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 3 18:02:15 2005 +0100 wcmd: mkdir recursive create In at least both win2k and winxp mkdir from the command prompt can recursively create full directory paths. This implements that functionality. --- programs/wcmd/builtins.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c index 5652089..a47bc0a 100644 --- a/programs/wcmd/builtins.c +++ b/programs/wcmd/builtins.c @@ -150,11 +150,58 @@ char string[8], outpath[MAX_PATH], inpat * WCMD_create_dir * * Create a directory. + * + * this works recursivly. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if + * they do not already exist. */ +BOOL create_full_path(CHAR* path) +{ + int len; + CHAR *new_path; + BOOL ret = TRUE; + + new_path = HeapAlloc(GetProcessHeap(),0,strlen(path)+1); + strcpy(new_path,path); + + while ((len = strlen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while (!CreateDirectory(new_path,NULL)) + { + CHAR *slash; + DWORD last_error = GetLastError(); + if (last_error == ERROR_ALREADY_EXISTS) + break; + + if (last_error != ERROR_PATH_NOT_FOUND) + { + ret = FALSE; + break; + } + + if (!(slash = strrchr(new_path,'\\')) && ! (slash = strrchr(new_path,'/'))) + { + ret = FALSE; + break; + } + + len = slash - new_path; + new_path[len] = 0; + if (!create_full_path(new_path)) + { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + HeapFree(GetProcessHeap(),0,new_path); + return ret; +} + void WCMD_create_dir (void) { - if (!CreateDirectory (param1, NULL)) WCMD_print_error (); + if (!create_full_path(param1)) WCMD_print_error (); } /****************************************************************************

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 5127dc9f49d4505d08ceb353467939c0c4f58e04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5127dc9f49d4505d08ceb35… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:15:09 2005 Assorted spelling fixes. --- dlls/ole32/usrmarshal.c | 4 ++-- dlls/wined3d/surface.c | 12 ++++++------ dlls/winspool/info.c | 2 +- tools/winapi/msvcmaker | 4 ++-- tools/winapi/winapi_check_options.pm | 18 +++++++++--------- tools/winapi/winapi_extract | 2 +- tools/winebuild/utils.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 294be08..3bd46cb 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -333,7 +333,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU size = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); - /* redunancy is bad - it means you have to check consistancy like + /* redundancy is bad - it means you have to check consistency like * this: */ if (*(ULONG *)pBuffer != handle) { @@ -341,7 +341,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU return pBuffer; } pBuffer += sizeof(ULONG); - /* redunancy is bad - it means you have to check consistancy like + /* redundancy is bad - it means you have to check consistency like * this: */ if (*(ULONG *)pBuffer != size) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0aa1446..e1711e6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -320,19 +320,19 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR if (0 == This->resource.usage || This->resource.usage & D3DUSAGE_DYNAMIC) { /* classic surface TODO: non 2d surfaces? - Thease resources may be POOL_SYSTEMMEM, so they must not access the device */ + These resources may be POOL_SYSTEMMEM, so they must not access the device */ TRACE("locking an ordinarary surface\n"); - /* Check to see if memory has already been allocated fro the sufrace*/ + /* Check to see if memory has already been allocated from the surface*/ if (NULL == This->resource.allocatedMemory) { /* TODO: check to see if an update has been performed on the surface (an update could just clobber allocatedMemory */ - /* Non-systemmemory surfaces */ + /* Non-system memory surfaces */ - /*Surface has no memory currently allocate to it!*/ + /*Surface has no memory currently allocated to it!*/ TRACE("(%p) Locking rect\n" , This); This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->pow2Size); if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ - This->activeLock = TRUE; /* When this flag is set to true, laoding the surface again won't free THis->resource.allocatedMemory */ - /* TODO: make activeLock a bit more intelegent, maybe implement a method to purge the texture memory. */ + This->activeLock = TRUE; /* When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory */ + /* TODO: make activeLock a bit more intelligent, maybe implement a method to purge the texture memory. */ ENTER_GL(); /* Make sure that the texture is loaded */ diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index ffee18a..3bdd01d 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -3243,7 +3243,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPr * RETURNS * Success: TRUE and in pcbNeeded the Bytes used in pDriverDirectory * Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory, - * if cbBuf is to small + * if cbBuf is too small * * Native Values returned in pDriverDirectory on Success: *| NT(Windows NT x86): "%winsysdir%\\spool\\DRIVERS\\w32x86" diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index fd40f3d..1d31ae0 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -52,7 +52,7 @@ sub read_spec_file($) { while($lookahead || defined($_ = <IN>)) { $lookahead = 0; - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines @@ -137,7 +137,7 @@ MAKEFILE_IN: foreach my $makefile_in_fil $again = 0; } - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index cd788fd..cccfaa4 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -75,7 +75,7 @@ my %options_long = ( "calling-convention-win16" => { default => 0, parent => "calling-convention", description => "calling convention checking (Win16)" }, "calling-convention-win32" => { default => 1, parent => "calling-convention", description => "calling convention checking (Win32)" }, "misplaced" => { default => 1, parent => "local", description => "check for misplaced functions" }, - "statements" => { default => 0, parent => "local", description => "check for statements inconsistances" }, + "statements" => { default => 0, parent => "local", description => "check for statements inconsistencies" }, "cross-call" => { default => 0, parent => ["statements", "win16", "win32"], description => "check for cross calling functions" }, "cross-call-win32-win16" => { default => 0, parent => "cross-call", description => "check for cross calls between win32 and win16" @@ -83,7 +83,7 @@ my %options_long = ( "cross-call-unicode-ascii" => { default => 0, parent => "cross-call", description => "check for cross calls between Unicode and ASCII" }, - "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" }, + "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistencies" }, "comments" => { default => 1, @@ -99,36 +99,36 @@ my %options_long = ( "documentation" => { default => 1, parent => "local", - description => "check for documentation inconsistances" + description => "check for documentation inconsistencies" }, "documentation-pedantic" => { default => 0, parent => "documentation", - description => "be pendantic when checking for documentation inconsistances" + description => "be pendantic when checking for documentation inconsistencies" }, "documentation-arguments" => { default => 1, parent => "documentation", - description => "check for arguments documentation inconsistances\n" + description => "check for arguments documentation inconsistencies\n" }, "documentation-comment-indent" => { default => 0, - parent => "documentation", description => "check for documentation comment indent inconsistances" + parent => "documentation", description => "check for documentation comment indent inconsistencies" }, "documentation-comment-width" => { default => 0, - parent => "documentation", description => "check for documentation comment width inconsistances" + parent => "documentation", description => "check for documentation comment width inconsistencies" }, "documentation-name" => { default => 1, parent => "documentation", - description => "check for documentation name inconsistances\n" + description => "check for documentation name inconsistencies\n" }, "documentation-ordinal" => { default => 1, parent => "documentation", - description => "check for documentation ordinal inconsistances\n" + description => "check for documentation ordinal inconsistencies\n" }, "documentation-wrong" => { default => 1, diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 70b3f5a..040f228 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -70,7 +70,7 @@ if($options->spec_files || $options->win while($lookahead || defined($_ = <IN>)) { $lookahead = 0; - s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begining and end of line + s/^\s*?(.*?)\s*$/$1/; # remove whitespace at beginning and end of line s/^(.*?)\s*#.*$/$1/; # remove comments /^$/ && next; # skip empty lines diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index dbfa07c..a4cbb6f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -417,7 +417,7 @@ const char *get_stub_name( const ORDDEF * * The reason gas is written this way is that it's trying to mimick * native assemblers for the various architectures it runs on. gas - * provides other directives that work consistantly across + * provides other directives that work consistently across * architectures, but of course we want to work on all arches with or * without gas. Hence this function. *

1 0

Vitaliy Margolen : Move mapping (section) objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 348a3d912bf3d8c0523bf76566683dfc63ff050b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=348a3d912bf3d8c0523bf76… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:13:13 2005 Move mapping (section) objects into directory name space. --- dlls/kernel/virtual.c | 5 ++++- dlls/ntdll/virtual.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/mapping.c | 23 ++++++++++++++++++----- server/protocol.def | 2 ++ server/trace.c | 2 ++ 6 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/kernel/virtual.c b/dlls/kernel/virtual.c index d3dee13..ef46e30 100644 --- a/dlls/kernel/virtual.c +++ b/dlls/kernel/virtual.c @@ -43,6 +43,8 @@ #include "excpt.h" #include "wine/debug.h" +#include "kernel_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(seh); @@ -318,6 +320,7 @@ HANDLE WINAPI CreateFileMappingW( HANDLE { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } sec_type = protect & sec_flags; @@ -406,7 +409,7 @@ HANDLE WINAPI OpenFileMappingW( DWORD ac return 0; } attr.Length = sizeof(attr); - attr.RootDirectory = 0; + attr.RootDirectory = get_BaseNamedObjects_handle(); attr.ObjectName = &nameW; attr.Attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); attr.SecurityDescriptor = NULL; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 93392f5..d04c79e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1662,6 +1662,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->file_handle = file; req->size_high = size ? size->u.HighPart : 0; req->size_low = size ? size->u.LowPart : 0; @@ -1690,6 +1691,7 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *h { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; wine_server_add_data( req, attr->ObjectName->Buffer, len ); if (!(ret = wine_server_call( req ))) *handle = reply->handle; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 982d840..4ab0136 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1407,6 +1407,7 @@ struct create_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; int size_high; int size_low; int protect; @@ -1435,6 +1436,7 @@ struct open_mapping_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_mapping_reply @@ -4310,6 +4312,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 204 +#define SERVER_PROTOCOL_VERSION 205 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index b6e99e4..cf87361 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -273,15 +273,16 @@ inline static int get_file_size( struct return 1; } -static struct object *create_mapping( const struct unicode_str *name, unsigned int attr, - file_pos_t size, int protect, obj_handle_t handle ) +static struct object *create_mapping( struct directory *root, const struct unicode_str *name, + unsigned int attr, file_pos_t size, int protect, + obj_handle_t handle ) { struct mapping *mapping; int access = 0; if (!page_mask) init_page_size(); - if (!(mapping = create_named_object( sync_namespace, &mapping_ops, name, attr ))) + if (!(mapping = create_named_object_dir( root, name, attr, &mapping_ops ))) return NULL; if (get_error() == STATUS_OBJECT_NAME_EXISTS) return &mapping->obj; /* Nothing else to do */ @@ -378,25 +379,37 @@ DECL_HANDLER(create_mapping) { struct object *obj; struct unicode_str name; + struct directory *root = NULL; file_pos_t size = ((file_pos_t)req->size_high << 32) | req->size_low; reply->handle = 0; get_req_unicode_str( &name ); - if ((obj = create_mapping( &name, req->attributes, size, req->protect, req->file_handle ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((obj = create_mapping( root, &name, req->attributes, size, req->protect, req->file_handle ))) { reply->handle = alloc_handle( current->process, obj, req->access, req->attributes & OBJ_INHERIT ); release_object( obj ); } + + if (root) release_object( root ); } /* open a handle to a mapping */ DECL_HANDLER(open_mapping) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &mapping_ops, req->access, req->attributes ); + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + reply->handle = open_object_dir( root, &name, req->attributes, &mapping_ops, req->access ); + + if (root) release_object( root ); } /* get a mapping information */ diff --git a/server/protocol.def b/server/protocol.def index 4228258..297313c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1045,6 +1045,7 @@ enum char_info_mode @REQ(create_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ int size_high; /* mapping size */ int size_low; /* mapping size */ int protect; /* protection flags (see below) */ @@ -1068,6 +1069,7 @@ enum char_info_mode @REQ(open_mapping) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the mapping */ diff --git a/server/trace.c b/server/trace.c index 3d4983a..5d5159a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1448,6 +1448,7 @@ static void dump_create_mapping_request( { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " size_high=%d,", req->size_high ); fprintf( stderr, " size_low=%d,", req->size_low ); fprintf( stderr, " protect=%d,", req->protect ); @@ -1465,6 +1466,7 @@ static void dump_open_mapping_request( c { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move timer objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 7c5cb7a229a9058bdee08c40d20401670e2f05f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c5cb7a229a9058bdee08c4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:05:54 2005 Move timer objects into directory name space. --- dlls/kernel/sync.c | 2 ++ dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/timer.c | 22 +++++++++++++++++----- server/trace.c | 2 ++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 54f95a7..0c34098 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -927,6 +927,7 @@ HANDLE WINAPI CreateWaitableTimerW( SECU { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtCreateTimer(&handle, TIMER_ALL_ACCESS, &attr, @@ -979,6 +980,7 @@ HANDLE WINAPI OpenWaitableTimerW( DWORD { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtOpenTimer(&handle, access, &attr); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 675b9b7..3cf448f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -422,6 +422,7 @@ NTSTATUS WINAPI NtCreateTimer(OUT HANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->manual = (timer_type == NotificationTimer) ? TRUE : FALSE; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); @@ -449,6 +450,7 @@ NTSTATUS WINAPI NtOpenTimer(OUT PHANDLE { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); *handle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c144f24..982d840 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1885,6 +1885,7 @@ struct create_timer_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; int manual; /* VARARG(name,unicode_str); */ }; @@ -1901,6 +1902,7 @@ struct open_timer_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_timer_reply @@ -4308,6 +4310,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 203 +#define SERVER_PROTOCOL_VERSION 204 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a691e90..4228258 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1360,6 +1360,7 @@ enum char_info_mode @REQ(create_timer) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ int manual; /* manual reset */ VARARG(name,unicode_str); /* object name */ @REPLY @@ -1371,6 +1372,7 @@ enum char_info_mode @REQ(open_timer) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the timer */ diff --git a/server/timer.c b/server/timer.c index 2576dcd..74419e5 100644 --- a/server/timer.c +++ b/server/timer.c @@ -72,12 +72,12 @@ static const struct object_ops timer_ops /* create a timer object */ -static struct timer *create_timer( const struct unicode_str *name, unsigned int attr, - int manual ) +static struct timer *create_timer( struct directory *root, const struct unicode_str *name, + unsigned int attr, int manual ) { struct timer *timer; - if ((timer = create_named_object( sync_namespace, &timer_ops, name, attr ))) + if ((timer = create_named_object_dir( root, name, attr, &timer_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -209,24 +209,36 @@ DECL_HANDLER(create_timer) { struct timer *timer; struct unicode_str name; + struct directory *root = NULL; reply->handle = 0; get_req_unicode_str( &name ); - if ((timer = create_timer( &name, req->attributes, req->manual ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((timer = create_timer( root, &name, req->attributes, req->manual ))) { reply->handle = alloc_handle( current->process, timer, req->access, req->attributes & OBJ_INHERIT ); release_object( timer ); } + + if (root) release_object( root ); } /* open a handle to a timer */ DECL_HANDLER(open_timer) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &timer_ops, req->access, req->attributes ); + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + reply->handle = open_object_dir( root, &name, req->attributes, &timer_ops, req->access ); + + if (root) release_object( root ); } /* set a waitable timer */ diff --git a/server/trace.c b/server/trace.c index e50e71a..3d4983a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1798,6 +1798,7 @@ static void dump_create_timer_request( c { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " manual=%d,", req->manual ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); @@ -1812,6 +1813,7 @@ static void dump_open_timer_request( con { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Vitaliy Margolen : Move event and mutex objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: f676bc8d85bdf890caece85e030099bde4ebc139 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f676bc8d85bdf890caece85… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 14:55:48 2005 Move event and mutex objects into directory name space. --- dlls/kernel/kernel_private.h | 3 +++ dlls/kernel/sync.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/sync.c | 4 ++++ dlls/ntdll/tests/om.c | 12 ++++++------ include/wine/server_protocol.h | 6 +++++- server/console.c | 2 +- server/event.c | 22 +++++++++++++++++----- server/mutex.c | 21 +++++++++++++++++---- server/named_pipe.c | 2 +- server/object.h | 4 ++-- server/process.c | 2 +- server/protocol.def | 4 ++++ server/trace.c | 4 ++++ 13 files changed, 95 insertions(+), 21 deletions(-)

1 0

Vitaliy Margolen : Move semaphore objects into directory name space.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 5daae3dfa9bc4403b26e742cc5446e3081e9bbd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5daae3dfa9bc4403b26e742… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Fri Dec 2 15:01:17 2005 Move semaphore objects into directory name space. --- dlls/kernel/sync.c | 2 ++ dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/semaphore.c | 22 +++++++++++++++++----- server/trace.c | 2 ++ 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 659ee30..54f95a7 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -807,6 +807,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtCreateSemaphore( &ret, SEMAPHORE_ALL_ACCESS, &attr, initial, max ); @@ -858,6 +859,7 @@ HANDLE WINAPI OpenSemaphoreW( DWORD acce { RtlInitUnicodeString( &nameW, name ); attr.ObjectName = &nameW; + attr.RootDirectory = get_BaseNamedObjects_handle(); } status = NtOpenSemaphore( &ret, access, &attr ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index f5d85ae..675b9b7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -85,6 +85,7 @@ NTSTATUS WINAPI NtCreateSemaphore( OUT P { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; req->initial = InitialCount; req->max = MaximumCount; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); @@ -111,6 +112,7 @@ NTSTATUS WINAPI NtOpenSemaphore( OUT PHA { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; + req->rootdir = attr ? attr->RootDirectory : 0; if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *SemaphoreHandle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1818846..c144f24 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -707,6 +707,7 @@ struct create_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; unsigned int initial; unsigned int max; /* VARARG(name,unicode_str); */ @@ -738,6 +739,7 @@ struct open_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; + obj_handle_t rootdir; /* VARARG(name,unicode_str); */ }; struct open_semaphore_reply @@ -4306,6 +4308,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 202 +#define SERVER_PROTOCOL_VERSION 203 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 934ae42..a691e90 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -558,6 +558,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(create_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ unsigned int initial; /* initial count */ unsigned int max; /* maximum count */ VARARG(name,unicode_str); /* object name */ @@ -579,6 +580,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, @REQ(open_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ + obj_handle_t rootdir; /* root directory */ VARARG(name,unicode_str); /* object name */ @REPLY obj_handle_t handle; /* handle to the semaphore */ diff --git a/server/semaphore.c b/server/semaphore.c index bff60c5..e8d9cbb 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -63,8 +63,8 @@ static const struct object_ops semaphore }; -static struct semaphore *create_semaphore( const struct unicode_str *name, unsigned int attr, - unsigned int initial, unsigned int max ) +static struct semaphore *create_semaphore( struct directory *root, const struct unicode_str *name, + unsigned int attr, unsigned int initial, unsigned int max ) { struct semaphore *sem; @@ -73,7 +73,7 @@ static struct semaphore *create_semaphor set_error( STATUS_INVALID_PARAMETER ); return NULL; } - if ((sem = create_named_object( sync_namespace, &semaphore_ops, name, attr ))) + if ((sem = create_named_object_dir( root, name, attr, &semaphore_ops ))) { if (get_error() != STATUS_OBJECT_NAME_EXISTS) { @@ -150,24 +150,36 @@ DECL_HANDLER(create_semaphore) { struct semaphore *sem; struct unicode_str name; + struct directory *root = NULL; reply->handle = 0; get_req_unicode_str( &name ); - if ((sem = create_semaphore( &name, req->attributes, req->initial, req->max ))) + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max ))) { reply->handle = alloc_handle( current->process, sem, req->access, req->attributes & OBJ_INHERIT ); release_object( sem ); } + + if (root) release_object( root ); } /* open a handle to a semaphore */ DECL_HANDLER(open_semaphore) { struct unicode_str name; + struct directory *root = NULL; get_req_unicode_str( &name ); - reply->handle = open_object( sync_namespace, &name, &semaphore_ops, req->access, req->attributes ); + if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + return; + + reply->handle = open_object_dir( root, &name, req->attributes, &semaphore_ops, req->access ); + + if (root) release_object( root ); } /* release a semaphore */ diff --git a/server/trace.c b/server/trace.c index 04c4bb4..e50e71a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -968,6 +968,7 @@ static void dump_create_semaphore_reques { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " initial=%08x,", req->initial ); fprintf( stderr, " max=%08x,", req->max ); fprintf( stderr, " name=" ); @@ -994,6 +995,7 @@ static void dump_open_semaphore_request( { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); + fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " name=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Jacek Caban : Sync the WebBrowser's window size with document's window.
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

Module: wine Branch: refs/heads/master Commit: 84f0597d08a83844289ed6e7248eb72a9da828c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84f0597d08a83844289ed6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 2 14:54:58 2005 Sync the WebBrowser's window size with document's window. --- dlls/shdocvw/dochost.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 257ac78..d5dc95c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -88,6 +88,18 @@ static LRESULT navigate2(WebBrowser *Thi return 0; } +static LRESULT resize_document(WebBrowser *This, LONG width, LONG height) +{ + RECT rect = {0, 0, width, height}; + + TRACE("(%p)->(%ld %ld)\n", This, width, height); + + if(This->view) + IOleDocumentView_SetRect(This->view, &rect); + + return 0; +} + static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { WebBrowser *This; @@ -96,13 +108,14 @@ static LRESULT WINAPI doc_view_proc(HWND if(msg == WM_CREATE) { This = *(WebBrowser**)lParam; - ERR("create %p\n", This); SetPropW(hwnd, wszTHIS, This); }else { This = GetPropW(hwnd, wszTHIS); } switch(msg) { + case WM_SIZE: + return resize_document(This, LOWORD(lParam), HIWORD(lParam)); case WB_WM_NAVIGATE2: return navigate2(This); }

1 0

CVSROOT/. loginfo
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21634 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/02 09:43:52 Modified files: . : loginfo Log message: Don't send mail to wine-cvs for the wine module, this will be done from the git repository. Patch: http://cvs.winehq.org/patch.py?id=21634 Old revision New revision Changes Path 1.50 1.51 +2 -1 CVSROOT/loginfo Index: CVSROOT/loginfo diff -u -p CVSROOT/loginfo:1.50 CVSROOT/loginfo:1.51 --- CVSROOT/loginfo:1.50 2 Dec 2005 15:43:52 -0000 +++ CVSROOT/loginfo 2 Dec 2005 15:43:52 -0000 @@ -28,7 +28,8 @@ # Use this for testing ^test /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m testing(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -S -s %p %s +^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -f $CVSROOT/CVSROOT/commitlog -S -s %p %s + # All others go to wine-cvs -^wine /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -L 200 -p -S -s %p %s DEFAULT /usr/bin/perl $CVSROOT/CVSROOT/log_accum -m wine-cvs(a)winehq.org -f $CVSROOT/CVSROOT/commitlog -P winehq -L 200 -p -c -S -s %p %s

1 0

CVSROOT/. log_accum
by Alexandre Julliard Dec. 2, 2005

Dec. 2, 2005

ChangeSet ID: 21633 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/02 09:41:56 Modified files: . : log_accum Log message: Don't die if no mail recipient was specified. Patch: http://cvs.winehq.org/patch.py?id=21633 Old revision New revision Changes Path 1.31 1.32 +0 -1 CVSROOT/log_accum Index: CVSROOT/log_accum diff -u -p CVSROOT/log_accum:1.31 CVSROOT/log_accum:1.32 --- CVSROOT/log_accum:1.31 2 Dec 2005 15:41:56 -0000 +++ CVSROOT/log_accum 2 Dec 2005 15:41:56 -0000 @@ -600,7 +600,6 @@ while (@ARGV) { push @files, $arg; } } -($mailto) || die("No -m mail recipient specified\n"); if ($do_summary) {

1 0