December 2005 - Wine-commits

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

09 Dec '05

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

Alexandre Julliard : Release 0.9.3.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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

Tag wine-0.9.3 : Alexandre Julliard : Release 0.9.3
by Alexandre Julliard 08 Dec '05

08 Dec '05

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

Huw Davies : gdi: Fix 24bpp -> 32bpp copy.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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

08 Dec '05

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: Marshal and unmarshal basic types.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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: Formatting cleanups.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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

Eric Kohl : widl: Write out argument lists in the server.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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

Robert Shearman : widl: Add a type generator framework.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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: Rename some variables.
by Alexandre Julliard 08 Dec '05

08 Dec '05

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