December 2005 - Wine-commits

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

13 Dec '05

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 13 Dec '05

13 Dec '05

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

Robert Shearman : widl: Start generating type format strings.
by Alexandre Julliard 13 Dec '05

13 Dec '05

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

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

13 Dec '05

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

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

13 Dec '05

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 13 Dec '05

13 Dec '05

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

Eric Pouech : winedump: Const correctness fixes.
by Alexandre Julliard 13 Dec '05

13 Dec '05

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 13 Dec '05

13 Dec '05

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

Marcus Meissner : wininet: Reinitialise NETCON on redirect.
by Alexandre Julliard 13 Dec '05

13 Dec '05

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

Oliver Stieber : wined3d: Cube texture named constants.
by Alexandre Julliard 13 Dec '05

13 Dec '05

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