March 2006 - wine-commits

Alexandre Julliard : gdi: In metafile test only print debug output if enabled.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: eb7ef83357a4acdcaf4ff39148cfcf8d59dbcc29 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb7ef83357a4acdcaf4ff39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 21:03:41 2006 +0200 gdi: In metafile test only print debug output if enabled. --- dlls/gdi/tests/metafile.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/metafile.c b/dlls/gdi/tests/metafile.c index b20fb30..eb10a07 100644 --- a/dlls/gdi/tests/metafile.c +++ b/dlls/gdi/tests/metafile.c @@ -612,6 +612,8 @@ static void dump_mf_bits (const HMETAFIL BYTE buf[MF_BUFSIZE]; UINT mfsize, i; + if (!winetest_debug) return; + mfsize = GetMetaFileBitsEx (mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetMetaFileBitsEx failed.\n", desc); @@ -710,6 +712,8 @@ static void dump_emf_bits(const HENHMETA BYTE buf[MF_BUFSIZE]; UINT mfsize, i; + if (!winetest_debug) return; + mfsize = GetEnhMetaFileBits(mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetEnhMetaFileBits failed\n", desc); @@ -733,6 +737,8 @@ static void dump_emf_records(const HENHM BYTE buf[MF_BUFSIZE]; UINT mfsize, offset; + if (!winetest_debug) return; + mfsize = GetEnhMetaFileBits(mf, MF_BUFSIZE, buf); ok (mfsize > 0, "%s: GetEnhMetaFileBits error %ld\n", desc, GetLastError());

1 0

Alexandre Julliard : loader: Hide the preloader from the ps output.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: c20d6c409569a916231d14acd8a5a104cfedf74b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c20d6c409569a916231d14a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 19:16:22 2006 +0200 loader: Hide the preloader from the ps output. --- loader/preloader.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 1ca6d83..9480ca9 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -287,6 +287,14 @@ static inline gid_t wld_getegid(void) return ret; } +static inline int wld_prctl( int code, int arg ) +{ + int ret; + __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" + : "=a" (ret) : "0" (SYS_prctl), "r" (code), "c" (arg) ); + return SYSCALL_RET(ret); +} + /* replacement for libc functions */ @@ -871,6 +879,26 @@ static int is_in_preload_range( const El return 0; } +/* set the process name if supported */ +static void set_process_name( int argc, char *argv[] ) +{ + unsigned int i, off; + char *p, *name, *end; + + /* set the process short name */ + for (p = name = argv[1]; *p; p++) if (p[0] == '/' && p[1]) name = p + 1; + if (wld_prctl( 15 /* PR_SET_NAME */, (int)name ) == -1) return; + + /* find the end of the argv array and move everything down */ + end = argv[argc - 1]; + while (*end) end++; + off = argv[1] - argv[0]; + for (p = argv[1]; p <= end; p++) *(p - off) = *p; + wld_memset( end - off, 0, off ); + for (i = 1; i < argc; i++) argv[i] -= off; +} + + /* * wld_start * @@ -956,6 +984,7 @@ void* wld_start( void **stack ) delete_av[i].a_type = AT_NULL; /* get rid of first argument */ + set_process_name( *pargc, argv ); pargc[1] = pargc[0] - 1; *stack = pargc + 1;

1 0

Alexandre Julliard : winewrapper: Remove a couple of variables that are no longer needed.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: bf463abfecb804eb5755f64b43d7c277b9aff03b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf463abfecb804eb5755f64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 17:39:37 2006 +0200 winewrapper: Remove a couple of variables that are no longer needed. --- tools/winewrapper | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/tools/winewrapper b/tools/winewrapper index 7c49b38..92073d6 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -81,15 +81,8 @@ else export LD_LIBRARY_PATH fi -if [ -n "$WINEDLLPATH" ] -then - WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH" -else - WINEDLLPATH="$topdir/dlls:$topdir/programs" -fi -WINESERVER="$topdir/server/wineserver" WINELOADER="$topdir/loader/wine" -export WINEDLLPATH WINESERVER WINELOADER +export WINELOADER # any local settings ? if [ -f "$topdir/.winewrapper" ]

1 0

Alexandre Julliard : ntdll: Get rid of the loadorder wildcard support, builtin is always the default now.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: e17df7ae7f5d1b6bd346a4b6ec3e8150e01a781b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e17df7ae7f5d1b6bd346a4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 17:39:21 2006 +0200 ntdll: Get rid of the loadorder wildcard support, builtin is always the default now. --- dlls/ntdll/loadorder.c | 56 ------------------------------------------------ 1 files changed, 0 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index ac4dcb8..833c53c 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -51,28 +51,6 @@ struct loadorder_list module_loadorder_t *order; }; -/* dll to load as builtins if not explicitly specified otherwise */ -/* the list must remain sorted by dll name */ -static const WCHAR default_builtins[][10] = -{ - { 'g','d','i','3','2',0 }, - { 'i','c','m','p',0 }, - { 'k','e','r','n','e','l','3','2',0 }, - { 'n','t','d','l','l',0 }, - { 'o','d','b','c','3','2',0 }, - { 't','t','y','d','r','v',0 }, - { 'u','s','e','r','3','2',0 }, - { 'w','3','2','s','k','r','n','l',0 }, - { 'w','i','n','e','d','o','s',0 }, - { 'w','i','n','e','p','s',0 }, - { 'w','i','n','m','m',0 }, - { 'w','n','a','s','p','i','3','2',0 }, - { 'w','o','w','3','2',0 }, - { 'w','s','2','_','3','2',0 }, - { 'w','s','o','c','k','3','2',0 }, - { 'x','1','1','d','r','v',0 } -}; - static const WCHAR separatorsW[] = {',',' ','\t',0}; static int init_done; @@ -92,15 +70,6 @@ static int cmp_sort_func(const void *s1, /*************************************************************************** - * strcmp_func - */ -static int strcmp_func(const void *s1, const void *s2) -{ - return strcmpiW( (const WCHAR *)s1, (const WCHAR *)s2 ); -} - - -/*************************************************************************** * get_basename * * Return the base name of a file name (i.e. remove the path components). @@ -321,21 +290,6 @@ static inline enum loadorder get_env_loa /*************************************************************************** - * get_default_load_order - * - * Get the load order for a given module from the default list. - */ -static inline enum loadorder get_default_load_order( const WCHAR *module ) -{ - const int count = sizeof(default_builtins) / sizeof(default_builtins[0]); - if (!bsearch( module, default_builtins, count, sizeof(default_builtins[0]), strcmp_func )) - return FALSE; - TRACE( "got compiled-in builtin default for %s\n", debugstr_w(module) ); - return LO_BUILTIN; -} - - -/*************************************************************************** * get_standard_key * * Return a handle to the standard DllOverrides registry section. @@ -478,8 +432,6 @@ static enum loadorder get_load_order_val */ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) { - static const WCHAR wildcardW[] = {'*',0}; - enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; WCHAR *module, *basename; @@ -522,14 +474,6 @@ enum loadorder get_load_order( const WCH if (basename != module+1 && ((ret = get_load_order_value( std_key, app_key, basename )) != LO_INVALID)) goto done; - /* then compiled-in defaults */ - if ((ret = get_default_load_order( basename )) != LO_INVALID) - goto done; - - /* then wildcard entry (only if no explicit path) */ - if (basename == module+1 && ((ret = get_load_order_value( std_key, app_key, wildcardW )) != LO_INVALID)) - goto done; - /* and last the hard-coded default */ ret = LO_DEFAULT; TRACE( "got hardcoded default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );

1 0

Detlef Riekenberg : kernel: Fix handling of invalid parameter in GlobalSize ().
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 839f00a967045250ac5d77f7af4b0f00269ff76a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=839f00a967045250ac5d77f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 31 12:27:30 2006 +0200 kernel: Fix handling of invalid parameter in GlobalSize(). --- dlls/kernel/heap.c | 19 +++++++++++++------ dlls/kernel/tests/heap.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index c76f876..730379c 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -751,13 +751,19 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) * * Get the size of a global memory object. * + * PARAMS + * hmem [I] Handle of the global memory object + * * RETURNS - * Size in bytes of the global memory object - * 0: Failure + * Failure: 0 + * Success: Size in Bytes of the global memory object + * + * NOTES + * When the handle is invalid, last error is set to ERROR_INVALID_HANDLE + * */ -SIZE_T WINAPI GlobalSize( - HGLOBAL hmem /* [in] Handle of global memory object */ -) { +SIZE_T WINAPI GlobalSize(HGLOBAL hmem) +{ DWORD retval; PGLOBAL32_INTERN pintern; @@ -785,7 +791,8 @@ SIZE_T WINAPI GlobalSize( } else { - WARN("invalid handle\n"); + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); + SetLastError(ERROR_INVALID_HANDLE); retval=0; } RtlUnlockHeap(GetProcessHeap()); diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index fee1830..089c502 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -92,6 +92,11 @@ START_TEST(heap) ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " \ "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + SetLastError(MAGIC_DEAD); + size = GlobalSize(gbl); + ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %ld with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", + size, GetLastError()); /* Local*() functions */ @@ -128,6 +133,11 @@ START_TEST(heap) ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " \ "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + SetLastError(MAGIC_DEAD); + size = LocalSize(gbl); + ok( (size == 0) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %ld with 0x%08lx (expected '0' with ERROR_INVALID_HANDLE)\n", + size, GetLastError()); /* trying to lock empty memory should give an error */

1 0

Robert Shearman : ole: Use ncalrpc instead of ncacn_np as the RPC transport .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 714b66e9457dacf32e0bfefb9564e20e446bc44d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=714b66e9457dacf32e0bfef… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:34:25 2006 +0100 ole: Use ncalrpc instead of ncacn_np as the RPC transport. Use ncalrpc instead of ncacn_np as the transport as this is more similar to how ole32 from NT works and should also be compatible with rpcrt4 from Win9x, allowing more combinations of dlls to work. --- dlls/ole32/rpc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 6715f72..d849c6e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -70,7 +70,7 @@ static CRITICAL_SECTION_DEBUG csRegIf_de }; static CRITICAL_SECTION csRegIf = { &csRegIf_debug, -1, 0, 0, 0, 0 }; -static WCHAR wszPipeTransport[] = {'n','c','a','c','n','_','n','p',0}; +static WCHAR wszRpcTransport[] = {'n','c','a','l','r','p','c',0}; struct registered_if @@ -447,7 +447,7 @@ HRESULT RPC_CreateClientChannel(const OX status = RpcStringBindingComposeW( NULL, - wszPipeTransport, + wszRpcTransport, NULL, endpoint, NULL, @@ -683,7 +683,7 @@ void RPC_StartRemoting(struct apartment get_rpc_endpoint(endpoint, &apt->oxid); status = RpcServerUseProtseqEpW( - wszPipeTransport, + wszRpcTransport, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint, NULL);

1 0

Robert Shearman : kernel: Add some documentation for simple process functions.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 1fd711c1920c0336a1e9dd942a2c90775466f2e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1fd711c1920c0336a1e9dd9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:33:04 2006 +0100 kernel: Add some documentation for simple process functions. --- dlls/kernel/process.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 4263a22..7b656ac 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1887,6 +1887,16 @@ HINSTANCE WINAPI LoadModule( LPCSTR name /****************************************************************************** * TerminateProcess (KERNEL32.@) + * + * Terminates a process. + * + * PARAMS + * handle [I] Process to terminate. + * exit_code [I] Exit code. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). */ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) { @@ -1898,6 +1908,14 @@ BOOL WINAPI TerminateProcess( HANDLE han /*********************************************************************** * ExitProcess (KERNEL32.@) + * + * Exits the current process. + * + * PARAMS + * status [I] Status code to exit with. + * + * RETURNS + * Nothing. */ void WINAPI ExitProcess( DWORD status ) { @@ -2247,6 +2265,17 @@ void WINAPI ExitProcess16( WORD status ) /********************************************************************* * OpenProcess (KERNEL32.@) + * + * Opens a handle to a process. + * + * PARAMS + * access [I] Desired access rights assigned to the returned handle. + * inherit [I] Determines whether or not child processes will inherit the handle. + * id [I] Process identifier of the process to get a handle to. + * + * RETURNS + * Success: Valid handle to the specified process. + * Failure: NULL, check GetLastError(). */ HANDLE WINAPI OpenProcess( DWORD access, BOOL inherit, DWORD id ) { @@ -2278,6 +2307,20 @@ HANDLE WINAPI OpenProcess( DWORD access, /********************************************************************* * MapProcessHandle (KERNEL.483) * GetProcessId (KERNEL32.@) + * + * Gets the a unique identifier of a process. + * + * PARAMS + * hProcess [I] Handle to the process. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). + * + * NOTES + * + * The identifier is unique only on the machine and only until the process + * exits (including system shutdown). */ DWORD WINAPI GetProcessId( HANDLE hProcess ) { @@ -2295,6 +2338,15 @@ DWORD WINAPI GetProcessId( HANDLE hProce /********************************************************************* * CloseW32Handle (KERNEL.474) * CloseHandle (KERNEL32.@) + * + * Closes a handle. + * + * PARAMS + * handle [I] Handle to close. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE, check GetLastError(). */ BOOL WINAPI CloseHandle( HANDLE handle ) { @@ -2687,7 +2739,6 @@ BOOL WINAPI WriteProcessMemory( HANDLE p BOOL WINAPI FlushInstructionCache(HANDLE hProcess, LPCVOID lpBaseAddress, SIZE_T dwSize) { NTSTATUS status; - if (GetVersion() & 0x80000000) return TRUE; /* not NT, always TRUE */ status = NtFlushInstructionCache( hProcess, lpBaseAddress, dwSize ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; @@ -2755,9 +2806,14 @@ HANDLE WINAPI GetCurrentProcess(void) /*********************************************************************** * CmdBatNotification (KERNEL32.@) * - * Called by cmd.exe with - * (1) when a batch file is started - * (0) when a batch file finishes executing + * Notifies the system that a batch file has started or finished. + * + * PARAMS + * bBatchRunning [I] TRUE if a batch file has started or + * FALSE if a batch file has finished executing. + * + * RETURNS + * Unknown. */ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) {

1 0

Robert Shearman : widl: There's no need to cast _StubMsg - it' s already of the correct type.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 837e830a264d6180eb3a577d023548790aba6cb4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=837e830a264d6180eb3a577… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:55:05 2006 +0100 widl: There's no need to cast _StubMsg - it's already of the correct type. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ed47c04..a8ab982 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1422,7 +1422,7 @@ static void print_phase_function(FILE *f print_file(file, indent, "Ndr%s%s(\n", type, function); indent++; - print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_file(file, indent, "&_StubMsg,\n"); print_file(file, indent, "%s%s,\n", (phase == PHASE_UNMARSHAL) ? "(unsigned char **)&" : "(unsigned char *)", varname);

1 0

Robert Shearman : widl: Only assign variables if not a string and only create a local variable if not a sized parameter .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 506404ba09fe5e7a4501d3f15f55df65e12d3531 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=506404ba09fe5e7a4501d3f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:50:46 2006 +0100 widl: Only assign variables if not a string and only create a local variable if not a sized parameter. Only assign variables if not a string and only create a local variable if not a sized parameter. Fixes type mismatches in the generated code due to differences in the algorithms between creating local variables and using them. --- tools/widl/server.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 9ffb6b5..5188965 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -101,12 +101,16 @@ static void declare_args(const func_t *f while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { + const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + int has_size = size_is && (size_is->type != EXPR_VOID); + int is_string = is_attr(var->attrs, ATTR_STRING); + in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr) in_attr = 1; - if (!in_attr && !is_attr(var->attrs, ATTR_STRING)) + if (!in_attr && !has_size && !is_string) { int indirection; print_server(""); @@ -143,6 +147,7 @@ static void assign_out_args(const func_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { + int is_string = is_attr(var->attrs, ATTR_STRING); size_is = get_attrp(var->attrs, ATTR_SIZEIS); has_size = size_is && (size_is->type != EXPR_VOID); in_attr = is_attr(var->attrs, ATTR_IN); @@ -165,7 +170,7 @@ static void assign_out_args(const func_t write_expr(server, size_is, 1); fprintf(server, " * %u);\n", get_type_memsize(type)); } - else + else if (!is_string) { fprintf(server, " = &_W%u;\n", i); if (var->ptr_level > 1)

1 0

Robert Shearman : widl: Initialise the temporary variable to 0 for parameters with more than one level of indirection .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 62eb9f4b0c88d02c05e3971b3be25833996de0a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62eb9f4b0c88d02c05e3971… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:50:10 2006 +0100 widl: Initialise the temporary variable to 0 for parameters with more than one level of indirection. --- tools/widl/server.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index b3c8c65..9ffb6b5 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -167,7 +167,10 @@ static void assign_out_args(const func_t } else { - fprintf(server, " = &_W%u;\n", i++); + fprintf(server, " = &_W%u;\n", i); + if (var->ptr_level > 1) + print_server("_W%u = 0;\n", i); + i++; } sep = 1;

1 0

Robert Shearman : widl: Create the correct variable type for parameters with more than one level of indirection .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: d82bb4ade916e3928537ba509090214d7a347618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d82bb4ade916e3928537ba5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:49:57 2006 +0100 widl: Create the correct variable type for parameters with more than one level of indirection. --- tools/widl/server.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 8261dc7..b3c8c65 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -108,8 +108,11 @@ static void declare_args(const func_t *f if (!in_attr && !is_attr(var->attrs, ATTR_STRING)) { + int indirection; print_server(""); write_type(server, var->type, NULL, var->tname); + for (indirection = 0; indirection < var->ptr_level - 1; indirection++) + fprintf(server, "*"); fprintf(server, " _W%u;\n", i++); }

1 0

Robert Shearman : widl: Re-use print_phase_basetype for generating return value marshaling and unmarshaling code .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 27c3222715999782ece21eaa33427bf97ac04a2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27c3222715999782ece21ea… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:49:36 2006 +0100 widl: Re-use print_phase_basetype for generating return value marshaling and unmarshaling code. --- tools/widl/client.c | 10 +--------- tools/widl/server.c | 13 +------------ tools/widl/typegen.h | 1 + 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ee8a625..355da9b 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -272,15 +272,7 @@ static void write_function_stubs(type_t /* unmarshal return value */ if (!is_void(def->type, NULL)) - { - fprintf(client, "\n"); - print_client("_RetVal = *("); - write_type(client, def->type, def, def->tname); - fprintf(client, " *)_StubMsg.Buffer;\n"); - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, def->type, def, def->tname); - fprintf(client, ");\n"); - } + print_phase_basetype(client, indent, PHASE_UNMARSHAL, PASS_RETURN, def, "_RetVal"); /* update proc_offset */ if (func->args) diff --git a/tools/widl/server.c b/tools/widl/server.c index d7a2d7e..8261dc7 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -388,18 +388,7 @@ static void write_function_stubs(type_t /* marshall the return value */ if (!is_void(def->type, NULL)) - { - unsigned int alignment; - unsigned int size = get_required_buffer_size(def, &alignment); - print_server("_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - size - 1, size - 1); - print_server("*("); - write_type(server, def->type, def, def->tname); - fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, def->type, def, def->tname); - fprintf(server, ");\n"); - } + print_phase_basetype(server, indent, PHASE_MARSHAL, PASS_RETURN, def, "_RetVal"); indent--; print_server("}\n"); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 61e317c..ee2179c 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -39,6 +39,7 @@ void write_procformatstring(FILE *file, void write_typeformatstring(FILE *file, type_t *iface); size_t get_type_memsize(const type_t *type); unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); +void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase); size_t get_size_procformatstring_var(const var_t *var); size_t get_size_typeformatstring_var(const var_t *var);

1 0

Robert Shearman : widl: Move handling of base type marshaling and unmarshaling to a separate function .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 3e065ab342019a934131705bb4988b13f22b1563 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e065ab342019a934131705… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:48:24 2006 +0100 widl: Move handling of base type marshaling and unmarshaling to a separate function. Move handling of base type marshaling and unmarshaling to a separate function and improve it to support return values. --- tools/widl/typegen.c | 228 ++++++++++++++++++++------------------------------ 1 files changed, 92 insertions(+), 136 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 786217f..ed47c04 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1433,6 +1433,96 @@ static void print_phase_function(FILE *f indent--; } +void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, + enum pass pass, const var_t *var, + const char *varname) +{ + const type_t *type = var->type; + unsigned int size; + unsigned int alignment = 0; + + /* no work to do for other phases, buffer sizing is done elsewhere */ + if (phase != PHASE_MARSHAL && phase != PHASE_UNMARSHAL) + return; + + while (type_has_ref(type)) + type = type->ref; + + switch (type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size = 1; + alignment = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + alignment = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + alignment = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + alignment = 8; + break; + + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* no marshalling needed */ + return; + + default: + error("print_phase_basetype: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, type->type); + size = 0; + } + + print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + alignment - 1, alignment - 1); + + if (phase == PHASE_MARSHAL) + { + print_file(file, indent, "*("); + write_type(file, var->type, NULL, var->tname); + if (var->ptr_level) + fprintf(file, " *)_StubMsg.Buffer = *"); + else + fprintf(file, " *)_StubMsg.Buffer = "); + fprintf(file, varname); + fprintf(file, ";\n"); + } + else if (phase == PHASE_UNMARSHAL) + { + if (pass == PASS_IN || pass == PASS_RETURN) + print_file(file, indent, ""); + else + print_file(file, indent, "*"); + fprintf(file, varname); + if (pass == PASS_IN && var->ptr_level) + fprintf(file, " = ("); + else + fprintf(file, " = *("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + } + + print_file(file, indent, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, ");\n"); +} + /* returns whether the MaxCount, Offset or ActualCount members need to be * filled in for the specified phase */ static inline int is_size_needed_for_phase(enum remoting_phase phase) @@ -1559,77 +1649,7 @@ void write_remoting_arguments(FILE *file } else if (var->ptr_level == 0 && is_base_type(type->type)) { - unsigned int size; - unsigned int alignment = 0; - switch (type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - alignment = 1; - break; - - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - alignment = 2; - break; - - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - alignment = 4; - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - alignment = 8; - break; - - case RPC_FC_IGNORE: - case RPC_FC_BIND_PRIMITIVE: - /* no marshalling needed */ - continue; - - default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, type->type); - size = 0; - } - - if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - { - print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - alignment - 1, alignment - 1); - - if (phase == PHASE_MARSHAL) - { - print_file(file, indent, "*("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer = "); - write_name(file, var); - fprintf(file, ";\n"); - } - else if (phase == PHASE_UNMARSHAL) - { - print_file(file, indent, ""); - write_name(file, var); - fprintf(file, " = *("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); - } - else - error("write_remoting_arguments: Unimplemented for base types for phase %d\n", phase); - - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); - } + print_phase_basetype(file, indent, phase, pass, var, var->name); } else if (var->ptr_level == 0) { @@ -1662,71 +1682,7 @@ void write_remoting_arguments(FILE *file { if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(type->type)) { - unsigned int size; - switch (type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - break; - - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - break; - - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - break; - - case RPC_FC_IGNORE: - case RPC_FC_BIND_PRIMITIVE: - /* no marshalling needed */ - continue; - - default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, type->type); - size = 0; - } - - if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) - { - print_file(file, indent, - "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - size - 1, size - 1); - - if (phase == PHASE_MARSHAL) - { - print_file(file, indent, "*("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer = *"); - write_name(file, var); - fprintf(file, ";\n"); - } - else if (phase == PHASE_UNMARSHAL) - { - print_file(file, indent, (pass == PASS_IN) ? "" : "*"); - write_name(file, var); - fprintf(file, (pass == PASS_IN) ? " = (" : " = *("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); - } - - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, ");\n"); - } + print_phase_basetype(file, indent, phase, pass, var, var->name); } else {

1 0

Robert Shearman : widl: Use print_phase_function for printing NdrPointerFree call.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: eb000448a0f816e5d2acf6643355753e9d7b86ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb000448a0f816e5d2acf66… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:50 2006 +0100 widl: Use print_phase_function for printing NdrPointerFree call. --- tools/widl/typegen.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a284557..786217f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1501,20 +1501,11 @@ void write_remoting_arguments(FILE *file fprintf(file, ";\n"); } + /* FIXME: these can't both be correct */ if (phase == PHASE_FREE) - { - print_file(file, indent, "NdrPointerFree(\n"); - indent++; - print_file(file, indent, "&_StubMsg,\n"); - print_file(file, indent, "(unsigned char *)%s,\n", var->name); - print_file(file, indent, "&__MIDL_TypeFormatString.Format[%d]);\n", - *type_offset); - indent--; - } + print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); else - { print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); - } } } else if (is_array_type(var->attrs, var->ptr_level, var->array))

1 0

Robert Shearman : widl: Add a function to generate the Ndr type calls.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 04632f6ab716c4089f6d3e399d0a516f5c209107 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04632f6ab716c4089f6d3e3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:35 2006 +0100 widl: Add a function to generate the Ndr type calls. - Add a function to generate the Ndr type calls. - Fix a typo where the aligned buffer was added to itself, rather than assigned. --- tools/widl/typegen.c | 69 ++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 36 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d31110a..a284557 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1396,20 +1396,41 @@ unsigned int get_required_buffer_size(co return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); } -static inline const char *function_from_phase(enum remoting_phase phase) +static void print_phase_function(FILE *file, int indent, const char *type, + enum remoting_phase phase, + const char *varname, unsigned int type_offset) { + const char *function; switch (phase) { case PHASE_BUFFERSIZE: - return "BufferSize"; + function = "BufferSize"; + break; case PHASE_MARSHAL: - return "Marshall"; + function = "Marshall"; + break; case PHASE_UNMARSHAL: - return "Unmarshall"; + function = "Unmarshall"; + break; case PHASE_FREE: - return "Free"; + function = "Free"; + break; + default: + assert(0); + return; } - return NULL; + + print_file(file, indent, "Ndr%s%s(\n", type, function); + indent++; + print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_file(file, indent, "%s%s,\n", + (phase == PHASE_UNMARSHAL) ? "(unsigned char **)&" : "(unsigned char *)", + varname); + print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", + type_offset, (phase == PHASE_UNMARSHAL) ? "," : ");"); + if (phase == PHASE_UNMARSHAL) + print_file(file, indent, "0);\n"); + indent--; } /* returns whether the MaxCount, Offset or ActualCount members need to be @@ -1470,9 +1491,7 @@ void write_remoting_arguments(FILE *file if (is_string_type(var->attrs, var->ptr_level, var->array)) { if (var->array && var->array->is_const) - print_file(file, indent, - "NdrNonConformantString%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - function_from_phase(phase), var->name, *type_offset); + print_phase_function(file, indent, "NonConformantString", phase, var->name, *type_offset); else { if (size_is && is_size_needed_for_phase(phase)) @@ -1494,16 +1513,7 @@ void write_remoting_arguments(FILE *file } else { - print_file(file, indent, "NdrConformantString%s(\n", function_from_phase(phase)); - indent++; - print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_file(file, indent, "(unsigned char *)%s,\n", var->name); - print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", - *type_offset + (has_size ? 4 : 2), - (phase == PHASE_MARSHAL) ? ");" : ","); - if (phase == PHASE_UNMARSHAL) - print_file(file, indent, "(unsigned char)0);\n"); - indent--; + print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); } } } @@ -1554,10 +1564,7 @@ void write_remoting_arguments(FILE *file } } - print_file(file, indent, - "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - array_type, function_from_phase(phase), var->name, - *type_offset); + print_phase_function(file, indent, array_type, phase, var->name, *type_offset); } else if (var->ptr_level == 0 && is_base_type(type->type)) { @@ -1606,7 +1613,7 @@ void write_remoting_arguments(FILE *file if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) { - print_file(file, indent, "_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", alignment - 1, alignment - 1); if (phase == PHASE_MARSHAL) @@ -1658,9 +1665,7 @@ void write_remoting_arguments(FILE *file ndrtype = NULL; } - print_file(file, indent, - "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - ndrtype, function_from_phase(phase), var->name, *type_offset); + print_phase_function(file, indent, ndrtype, phase, var->name, *type_offset); } else { @@ -1734,15 +1739,7 @@ void write_remoting_arguments(FILE *file } else { - print_file(file, indent, "NdrPointer%s(\n", function_from_phase(phase)); - indent++; - print_file(file, indent, "(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_file(file, indent, "(unsigned char *)%s,\n", var->name); - print_file(file, indent, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]%s\n", - *type_offset, (phase == PHASE_MARSHAL) ? ");" : ","); - if (phase == PHASE_UNMARSHAL) - print_file(file, indent, "(unsigned char *)0);\n"); - indent--; + print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); } } fprintf(file, "\n");

1 0

Robert Shearman : widl: Only write the buffer incrementing code for the marshaling and unmarshaling phases .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 96f6a22ece54672c9e232d388c803646daab5881 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96f6a22ece54672c9e232d3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:22 2006 +0100 widl: Only write the buffer incrementing code for the marshaling and unmarshaling phases. Only write the buffer incrementing code for the marshaling and unmarshaling phases - buffer sizing is handled elsewhere and freeing isn't applicable. --- tools/widl/typegen.c | 45 ++++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 096173f..d31110a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1704,30 +1704,33 @@ void write_remoting_arguments(FILE *file size = 0; } - print_file(file, indent, - "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", - size - 1, size - 1); - - if (phase == PHASE_MARSHAL) - { - print_file(file, indent, "*("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer = *"); - write_name(file, var); - fprintf(file, ";\n"); - } - else if (phase == PHASE_UNMARSHAL) + if (phase == PHASE_MARSHAL || phase == PHASE_UNMARSHAL) { - print_file(file, indent, (pass == PASS_IN) ? "" : "*"); - write_name(file, var); - fprintf(file, (pass == PASS_IN) ? " = (" : " = *("); + print_file(file, indent, + "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + size - 1, size - 1); + + if (phase == PHASE_MARSHAL) + { + print_file(file, indent, "*("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, " *)_StubMsg.Buffer = *"); + write_name(file, var); + fprintf(file, ";\n"); + } + else if (phase == PHASE_UNMARSHAL) + { + print_file(file, indent, (pass == PASS_IN) ? "" : "*"); + write_name(file, var); + fprintf(file, (pass == PASS_IN) ? " = (" : " = *("); + write_type(file, var->type, NULL, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + } + + print_file(file, indent, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, NULL, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); + fprintf(file, ");\n"); } - - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, NULL, var->tname); - fprintf(file, ");\n"); } else {

1 0

Robert Shearman : widl: Output the necessary sizing information for other phases.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 226c8f6b5215ec998fb48ee109d3dae745eb0d6e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=226c8f6b5215ec998fb48ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:47:08 2006 +0100 widl: Output the necessary sizing information for other phases. Output the necessary sizing information for PHASE_BUFFERSIZE and PHASE_FREE as well as PHASE_MARSHAL. Standardise this rule in a new function. --- tools/widl/typegen.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e92985c..096173f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1412,6 +1412,13 @@ static inline const char *function_from_ return NULL; } +/* returns whether the MaxCount, Offset or ActualCount members need to be + * filled in for the specified phase */ +static inline int is_size_needed_for_phase(enum remoting_phase phase) +{ + return (phase != PHASE_UNMARSHAL); +} + void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase) @@ -1468,7 +1475,7 @@ void write_remoting_arguments(FILE *file function_from_phase(phase), var->name, *type_offset); else { - if (size_is && phase != PHASE_UNMARSHAL) + if (size_is && is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is, 1); @@ -1512,7 +1519,7 @@ void write_remoting_arguments(FILE *file array_type = "FixedArray"; else if (has_length && !has_size) { - if (phase == PHASE_MARSHAL) + if (is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); @@ -1523,7 +1530,7 @@ void write_remoting_arguments(FILE *file } else if (!has_length && has_size) { - if (phase == PHASE_MARSHAL) + if (is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is ? size_is : var->array, 1); @@ -1533,7 +1540,7 @@ void write_remoting_arguments(FILE *file } else { - if (phase == PHASE_MARSHAL) + if (is_size_needed_for_phase(phase)) { print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); write_expr(file, size_is ? size_is : var->array, 1);

1 0

Robert Shearman : widl: Output NULL ref pointer check for pointer levels > 1 too.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 4a67201b703d9d71f2b57d7d24ab3ed27071cf8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a67201b703d9d71f2b57d7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:46:56 2006 +0100 widl: Output NULL ref pointer check for pointer levels > 1 too. --- tools/widl/client.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index c9e99fb..ee8a625 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -105,7 +105,7 @@ static void check_pointers(const func_t if (pointer_type == RPC_FC_RP) { - if (var->ptr_level == 1) + if (var->ptr_level >= 1) { print_client("if (!%s)\n", var->name); print_client("{\n"); @@ -114,11 +114,6 @@ static void check_pointers(const func_t indent--; print_client("}\n\n"); } - else if (var->ptr_level > 1) - { - error("Pointer level %d not supported!\n", var->ptr_level); - return; - } } var = PREV_LINK(var);

1 0

Robert Shearman : widl: Fix a GCC warning in the generated client and server code.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 73ff576554dc309b357a945433e703dbfba4f787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73ff576554dc309b357a945… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:46:28 2006 +0100 widl: Fix a GCC warning in the generated client and server code. --- tools/widl/client.c | 4 ++++ tools/widl/server.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 528ffbf..c9e99fb 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -360,10 +360,14 @@ static void write_stubdescriptor(type_t print_client("(void *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); + print_client("{\n"); + indent++; if (implicit_handle) print_client("&%s,\n", implicit_handle); else print_client("&%s__MIDL_AutoBindHandle,\n", iface->name); + indent--; + print_client("},\n"); print_client("0,\n"); print_client("0,\n"); if (expr_eval_routines) diff --git a/tools/widl/server.c b/tools/widl/server.c index 3abd35e..d7a2d7e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -494,7 +494,11 @@ static void write_stubdescriptor(type_t print_server("(void *)& %s___RpcServerInterface,\n", iface->name); print_server("MIDL_user_allocate,\n"); print_server("MIDL_user_free,\n"); + print_server("{\n"); + indent++; print_server("0,\n"); + indent--; + print_server("},\n"); print_server("0,\n"); print_server("0,\n"); if (expr_eval_routines)

1 0

Robert Shearman : widl: The lval member of var_t is essentially a duplicate of eval->cval.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 4cd506b8fd14ecc7ddc031001348149b31048100 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cd506b8fd14ecc7ddc0310… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:45:43 2006 +0100 widl: The lval member of var_t is essentially a duplicate of eval->cval. - Generate eval's for enums that don't explicitly have one. This means that enums written in header files won't match exactly what has been put into the IDL file, but the numeric constat is the same and MIDL does a similar thing. - Replace constant lookups with eval->cval instead of lval. --- tools/widl/parser.y | 14 ++++++-------- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index eb00304..7ab2edf 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -436,7 +436,6 @@ case: tCASE expr ':' field { attr_t constdef: tCONST type ident '=' expr_const { $$ = reg_const($3); set_type($$, $2, NULL); $$->eval = $5; - $$->lval = $5->cval; } ; @@ -445,20 +444,20 @@ enums: { $$ = NULL; } | enum_list ; -enum_list: enum +enum_list: enum { if (!$$->eval) + $$->eval = make_exprl(EXPR_NUM, 0 /* default for first enum entry */); + } | enum_list ',' enum { LINK($3, $1); $$ = $3; - if ($1 && !$3->eval) - $3->lval = $1->lval + 1; + if (!$$->eval) + $$->eval = make_exprl(EXPR_NUM, $1->eval->cval + 1); } ; enum: ident '=' expr_const { $$ = reg_const($1); $$->eval = $3; - $$->lval = $3->cval; $$->type = make_type(RPC_FC_LONG, &std_int); } | ident { $$ = reg_const($1); - $$->lval = 0; /* default for first enum entry */ $$->type = make_type(RPC_FC_LONG, &std_int); } ; @@ -875,7 +874,7 @@ static expr_t *make_exprs(enum expr_type e->u.sval = c->name; free(val); e->is_const = TRUE; - e->cval = c->lval; + e->cval = c->eval->cval; } } return e; @@ -1101,7 +1100,6 @@ static var_t *make_var(char *name) v->attrs = NULL; v->array = NULL; v->eval = NULL; - v->lval = 0; INIT_LINK(v); return v; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 30620d0..a2d917b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -216,7 +216,6 @@ struct _var_t { const char *tname; attr_t *attrs; expr_t *eval; - long lval; /* parser-internal */ DECL_LINK(var_t) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index ffbe9f8..2af7d66 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1559,7 +1559,7 @@ static HRESULT add_var_desc(msft_typeinf switch(typeinfo->typeinfo->typekind & 0xf) { case TKIND_ENUM: - write_value(typeinfo->typelib, &typedata[4], VT_I4, &var->lval); + write_value(typeinfo->typelib, &typedata[4], VT_I4, &var->eval->cval); var_kind = 2; /* VAR_CONST */ var_type_size += 16; /* sizeof(VARIANT) */ typeinfo->datawidth = var_datawidth;

1 0

Robert Shearman : widl: De-reference parameters' types before deciding what to do with them.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 4edcf2de35e677f3d9eaf099e6286642f917c01e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4edcf2de35e677f3d9eaf09… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:45:16 2006 +0100 widl: De-reference parameters' types before deciding what to do with them. De-reference parameters' types before deciding what to do with them. Also dereference string parameters since they are immediately dispatched to write_string_tfs when the string attribute is detected without any further processing done on them. --- tools/widl/typegen.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e58bc17..e92985c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -706,6 +706,9 @@ static size_t write_string_tfs(FILE *fil if (!get_attrp(attrs, ATTR_SIZEIS)) flags |= RPC_FC_P_SIMPLEPOINTER; + while (type_has_ref(type)) + type = type->ref; + if ((type->type != RPC_FC_BYTE) && (type->type != RPC_FC_CHAR) && (type->type != RPC_FC_WCHAR)) { error("write_string_tfs: Unimplemented for type 0x%x of name: %s\n", type->type, name); @@ -1425,6 +1428,7 @@ void write_remoting_arguments(FILE *file while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { + const type_t *type = var->type; length_is = get_attrp(var->attrs, ATTR_LENGTHIS); size_is = get_attrp(var->attrs, ATTR_SIZEIS); has_length = length_is && (length_is->type != EXPR_VOID); @@ -1453,6 +1457,9 @@ void write_remoting_arguments(FILE *file break; } + while (type_has_ref(type)) + type = type->ref; + if (is_string_type(var->attrs, var->ptr_level, var->array)) { if (var->array && var->array->is_const) @@ -1545,11 +1552,11 @@ void write_remoting_arguments(FILE *file array_type, function_from_phase(phase), var->name, *type_offset); } - else if (var->ptr_level == 0 && is_base_type(var->type->type)) + else if (var->ptr_level == 0 && is_base_type(type->type)) { unsigned int size; unsigned int alignment = 0; - switch (var->type->type) + switch (type->type) { case RPC_FC_BYTE: case RPC_FC_CHAR: @@ -1586,7 +1593,7 @@ void write_remoting_arguments(FILE *file continue; default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); + error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, type->type); size = 0; } @@ -1623,7 +1630,7 @@ void write_remoting_arguments(FILE *file { const char *ndrtype; - switch (var->type->type) + switch (type->type) { case RPC_FC_STRUCT: ndrtype = "SimpleStruct"; @@ -1640,7 +1647,7 @@ void write_remoting_arguments(FILE *file break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", - var->name, var->type->type, var->ptr_level); + var->name, type->type, var->ptr_level); ndrtype = NULL; } @@ -1650,10 +1657,10 @@ void write_remoting_arguments(FILE *file } else { - if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(var->type->type)) + if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(type->type)) { unsigned int size; - switch (var->type->type) + switch (type->type) { case RPC_FC_BYTE: case RPC_FC_CHAR: @@ -1686,7 +1693,7 @@ void write_remoting_arguments(FILE *file continue; default: - error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); + error("write_remoting_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, type->type); size = 0; }

1 0

Robert Shearman : widl: Write pointer calls for all non-basetype pointer parameters to functions.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 4b5386e2cd530996b1ceb517e2225eeaa6aed405 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b5386e2cd530996b1ceb51… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:46:43 2006 +0100 widl: Write pointer calls for all non-basetype pointer parameters to functions. --- tools/widl/typegen.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 673eca2..e58bc17 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1163,8 +1163,12 @@ static size_t write_typeformatstring_var const type_t *type = var->type; int ptr_level = var->ptr_level; + chat("write_typeformatstring_var: %s\n", var->name); + while (TRUE) { + chat("write_typeformatstring: type->type = 0x%x, type->name = %s, ptr_level = %d\n", type->type, type->name, ptr_level); + if (is_string_type(var->attrs, ptr_level, var->array)) return write_string_tfs(file, var->attrs, type, var->array, var->name, typeformat_offset); @@ -1646,7 +1650,7 @@ void write_remoting_arguments(FILE *file } else { - if (pointer_type == RPC_FC_RP) + if ((var->ptr_level == 1) && (pointer_type == RPC_FC_RP) && is_base_type(var->type->type)) { unsigned int size; switch (var->type->type) @@ -1711,7 +1715,7 @@ void write_remoting_arguments(FILE *file write_type(file, var->type, NULL, var->tname); fprintf(file, ");\n"); } - else if (pointer_type == RPC_FC_UP) + else { print_file(file, indent, "NdrPointer%s(\n", function_from_phase(phase)); indent++; @@ -1723,10 +1727,6 @@ void write_remoting_arguments(FILE *file print_file(file, indent, "(unsigned char *)0);\n"); indent--; } - else if (pointer_type == RPC_FC_FP) - { - error("write_remoting_arguments: Unimplemented for full pointers to base types\n"); - } } fprintf(file, "\n"); }

1 0

Robert Shearman : widl: Write definitions for MIDL_user_allocate and MIDL_user_free in the header.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 91dbc5ae286e72197fc4b60a1b2d411237c32ac7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91dbc5ae286e72197fc4b60… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:45:29 2006 +0100 widl: Write definitions for MIDL_user_allocate and MIDL_user_free in the header. Write definitions for MIDL_user_allocate and MIDL_user_free in the header when writing out RPC interfaces to prevent compile failures in the generated client/server code. --- tools/widl/header.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ba241f6..c4f3a26 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -916,6 +916,14 @@ static void write_rpc_interface(const ty { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + static int allocate_written = 0; + + if (!allocate_written) + { + allocate_written = 1; + fprintf(header, "void * __RPC_USER MIDL_user_allocate(size_t);\n"); + fprintf(header, "void __RPC_USER MIDL_user_free(void *);\n\n"); + } fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, LOWORD(ver), HIWORD(ver));

1 0

Robert Shearman : widl: Write out the pre- and postamble for RPC interfaces with no methods.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 071dfb188aaf89bbd4c0973f9c4766493337e7a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=071dfb188aaf89bbd4c0973… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:50:34 2006 +0100 widl: Write out the pre- and postamble for RPC interfaces with no methods. --- tools/widl/header.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 0347ead..ba241f6 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -917,18 +917,19 @@ static void write_rpc_interface(const ty unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - if (!iface->funcs) return; - fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, " */\n"); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name); fprintf(header,"#define __%s_INTERFACE_DEFINED__\n\n", iface->name); - write_iface_guid(iface); - if (var) fprintf(header, "extern handle_t %s;\n", var); - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); - write_function_proto(iface); + if (iface->funcs) + { + write_iface_guid(iface); + if (var) fprintf(header, "extern handle_t %s;\n", var); + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + write_function_proto(iface); + } fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); /* FIXME: server/client code */

1 0

Robert Shearman : widl: Output interface defined guard for rpc interfaces too.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: b38cd7ff5f43dfca3d1c97728b042ff63efc515b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b38cd7ff5f43dfca3d1c977… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:44:53 2006 +0100 widl: Output interface defined guard for rpc interfaces too. --- tools/widl/header.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3b290d6..0347ead 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -922,12 +922,14 @@ static void write_rpc_interface(const ty fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, " */\n"); + fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name); + fprintf(header,"#define __%s_INTERFACE_DEFINED__\n\n", iface->name); write_iface_guid(iface); if (var) fprintf(header, "extern handle_t %s;\n", var); fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); write_function_proto(iface); - fprintf(header, "\n"); + fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); /* FIXME: server/client code */ }

1 0

Robert Shearman : widl: NdrFcShort should be written out instead of NdrShort.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 97d6f7c4441a0d712e99227007ac234b0de502bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97d6f7c4441a0d712e99227… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:44:39 2006 +0100 widl: NdrFcShort should be written out instead of NdrShort. --- tools/widl/typegen.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8b0cba6..673eca2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -313,7 +313,7 @@ static size_t write_conf_or_var_desc(FIL print_file(file, 2, "0x%x, /* Corr desc: constant, val = %ld */\n", RPC_FC_CONSTANT_CONFORMANCE, expr->cval); print_file(file, 2, "0x%x,\n", expr->cval & ~USHRT_MAX); - print_file(file, 2, "NdrShort(0x%x),\n", expr->cval & USHRT_MAX); + print_file(file, 2, "NdrFcShort(0x%x),\n", expr->cval & USHRT_MAX); return 4; } @@ -450,7 +450,7 @@ static size_t write_conf_or_var_desc(FIL correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "parameter, " : "", param_type_string); print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); - print_file(file, 2, "NdrShort(0x%x), /* %soffset = %d */\n", + print_file(file, 2, "NdrFcShort(0x%x), /* %soffset = %d */\n", offset, correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "x86 stack size / " : "", offset); @@ -499,7 +499,7 @@ static size_t write_conf_or_var_desc(FIL correlation_type, correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "parameter" : ""); print_file(file, 2, "0x%x, /* %s */\n", RPC_FC_CALLBACK, "FC_CALLBACK"); - print_file(file, 2, "NdrShort(0x%x), /* %u */\n", callback_offset, callback_offset); + print_file(file, 2, "NdrFcShort(0x%x), /* %u */\n", callback_offset, callback_offset); } return 4; } @@ -1007,7 +1007,7 @@ static size_t write_struct_tfs(FILE *fil /* alignment */ print_file(file, 2, "0x0,\n"); /* total size */ - print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); + print_file(file, 2, "NdrFcShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; if (type->type == RPC_FC_PSTRUCT) @@ -1057,9 +1057,9 @@ static size_t write_struct_tfs(FILE *fil /* alignment */ print_file(file, 2, "0x0,\n"); /* total size */ - print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); + print_file(file, 2, "NdrFcShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; - print_file(file, 2, "NdrShort(0x%x), /* offset = %d (%u) */\n", + print_file(file, 2, "NdrFcShort(0x%x), /* offset = %d (%u) */\n", array_offset - *typestring_offset, array_offset - *typestring_offset, array_offset); @@ -1108,9 +1108,9 @@ static size_t write_struct_tfs(FILE *fil /* alignment */ print_file(file, 2, "0x0,\n"); /* total size */ - print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); + print_file(file, 2, "NdrFcShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; - print_file(file, 2, "NdrShort(0x%x), /* offset = %d (%u) */\n", + print_file(file, 2, "NdrFcShort(0x%x), /* offset = %d (%u) */\n", array_offset - *typestring_offset, array_offset - *typestring_offset, array_offset); @@ -1145,7 +1145,7 @@ static void write_pointer_only_tfs(FILE print_file(file, 2, "0x%x, 0x00, /* %s */\n", pointer_type, pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); - print_file(file, 2, "NdrShort(0x%x), /* %d */\n", offset, offset); + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", offset, offset); *typeformat_offset += 4; }

1 0

Robert Shearman : widl: Output the numeric equivalent of FC_END, not the string FC_END itself.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: bed9fdec8dd9f93af23b1c908c7be4bd94011c51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bed9fdec8dd9f93af23b1c9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:44:27 2006 +0100 widl: Output the numeric equivalent of FC_END, not the string FC_END itself. --- tools/widl/typegen.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3b58741..8b0cba6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -828,7 +828,7 @@ static size_t write_array_tfs(FILE *file } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 2; return start_offset; @@ -882,7 +882,7 @@ static size_t write_array_tfs(FILE *file } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 2; return start_offset; @@ -915,7 +915,7 @@ static size_t write_array_tfs(FILE *file } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 2; return start_offset; @@ -951,7 +951,7 @@ static size_t write_array_tfs(FILE *file } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 2; return start_offset; @@ -1023,7 +1023,7 @@ static size_t write_struct_tfs(FILE *fil /* member layout */ print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 2; return start_offset; @@ -1076,7 +1076,7 @@ static size_t write_struct_tfs(FILE *fil *typestring_offset += 1; } - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 1; return start_offset; @@ -1127,7 +1127,7 @@ static size_t write_struct_tfs(FILE *fil *typestring_offset += 1; } - print_file(file, 2, "FC_END,\n"); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 1; return start_offset;

1 0

Robert Shearman : widl: Support references in type_memsize.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 3ec771a20f2ff6718b515043cea6c79a70f9caa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ec771a20f2ff6718b51504… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:44:16 2006 +0100 widl: Support references in type_memsize. --- tools/widl/typegen.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1d681d9..3b58741 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -525,6 +525,9 @@ static size_t type_memsize(const type_t if (ptr_level) return sizeof(void *); + if (type_has_ref(t)) + return type_memsize(t->ref, 0 /* FIXME */, NULL); + switch (t->type) { case RPC_FC_BYTE: @@ -561,7 +564,7 @@ static size_t type_memsize(const type_t size = fields_memsize(t->fields); break; default: - error("type_memsize: Unknown type %d", t->type); + error("type_memsize: Unknown type %d\n", t->type); size = 0; }

1 0

Robert Shearman : widl: Only output code for non-object interfaces in client and server.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 3db71d9d9ca808e37c26e394dccc3df794cece5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3db71d9d9ca808e37c26e39… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 31 12:44:04 2006 +0100 widl: Only output code for non-object interfaces in client and server. Only output code for non-object interfaces in client and server generation and convert the while loops into for loops. --- tools/widl/client.c | 7 ++++--- tools/widl/server.c | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index c2af6b9..528ffbf 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -491,8 +491,11 @@ void write_client(ifref_t *ifaces) if (!client) return; - while (iface) + for (; iface; iface = PREV_LINK(iface)) { + if (is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) + continue; + fprintf(client, "/*****************************************************************************\n"); fprintf(client, " * %s interface\n", iface->iface->name); fprintf(client, " */\n"); @@ -526,8 +529,6 @@ void write_client(ifref_t *ifaces) write_expr_eval_routine_list(client, iface->iface->name); write_stubdescriptor(iface->iface, expr_eval_routines); } - - iface = PREV_LINK(iface); } fclose(client); diff --git a/tools/widl/server.c b/tools/widl/server.c index a7f3a74..3abd35e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -601,7 +601,7 @@ void write_server(ifref_t *ifaces) if (!do_server) return; - if (!iface) + if (!ifaces) return; END_OF_LIST(iface); @@ -609,8 +609,11 @@ void write_server(ifref_t *ifaces) if (!server) return; - while (iface) + for (; iface; iface = PREV_LINK(iface)) { + if (is_object(iface->iface->attrs) || is_local(iface->iface->attrs)) + continue; + fprintf(server, "/*****************************************************************************\n"); fprintf(server, " * %s interface\n", iface->iface->name); fprintf(server, " */\n"); @@ -643,8 +646,6 @@ void write_server(ifref_t *ifaces) write_stubdescriptor(iface->iface, expr_eval_routines); write_dispatchtable(iface->iface); } - - iface = PREV_LINK(iface); } fclose(server);

1 0

lostwages/ include/winehq.conf news/2006033101.xml
by WineHQ 31 Mar '06

31 Mar '06

ChangeSet ID: 23882 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/31 12:19:42 Modified files: include : winehq.conf Added files: news : 2006033101.xml Log message: news about Wine 0.9.11 Patch: http://cvs.winehq.org/patch.py?id=23882 Old revision New revision Changes Path 1.34 1.35 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006033101.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.34 lostwages/include/winehq.conf:1.35 --- lostwages/include/winehq.conf:1.34 31 Mar 2006 18:19:42 -0000 +++ lostwages/include/winehq.conf 31 Mar 2006 18:19:42 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.10 +snapshot_date: 0.9.11 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006033101.xml diff -u -p /dev/null lostwages/news/2006033101.xml:1.1 --- /dev/null 31 Mar 2006 18:19:42 -0000 +++ lostwages/news/2006033101.xml 31 Mar 2006 18:19:42 -0000 @@ -0,0 +1,26 @@ +<news> + <date>March 31, 2006</date> + <title>Wine 0.9.11 Released</title> + <body> + +Just in time to give you something to do this weekend, Alexandre +released Wine 0.9.11. The more notable changes include: +<ul> + <li>Fake dll files created in the system directory to help installers.</li> + <li>Desktop mode now properly supports multiple processes.</li> + <li>Better type parsing in dbghelp.</li> + <li>Several OpenGL fixes.</li> + <li>A bunch of Unicode functions in advpack.</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.11.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.115">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. Currently official Fedora packages lag behind, but you can get + Wine-0.9.10 by running <tt>yum install wine</tt> from + <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a>. + + </body> +</news>

1 0

Tag wine-0.9.11 : Alexandre Julliard : Release 0.9.11
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/tags/wine-0.9.11 Tag: 123b9dbc8d10a4e49774f7f22054271c626b8ad2 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=123b9dbc8d10a4e49774f7f220… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:38:15 2006 +0200 Release 0.9.11

1 0

Alexandre Julliard : Release 0.9.11.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: bb8a0a9f7ebbb7580047178f35565768d31b4db1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb8a0a9f7ebbb7580047178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 14:38:15 2006 +0200 Release 0.9.11. --- ANNOUNCE | 15 - ChangeLog | 1440 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1458 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=bb8a0a9f7ebbb758004…

1 0

Alexandre Julliard : server: Avoid crash on startup when the configuration dir doesn't exist.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: c5c599d478d716548879f982f4d22a6d2c6c1d74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5c599d478d716548879f98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 13:06:04 2006 +0200 server: Avoid crash on startup when the configuration dir doesn't exist. --- server/request.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index 6f0ffb9..701d2aa 100644 --- a/server/request.c +++ b/server/request.c @@ -528,12 +528,12 @@ static void create_dir( const char *name } /* create the server directory and chdir to it */ -static void create_server_dir(void) +static void create_server_dir( const char *dir ) { char *p, *server_dir; struct stat st, st2; - if (!(server_dir = strdup( wine_get_server_dir() ))) fatal_error( "out of memory\n" ); + if (!(server_dir = strdup( dir ))) fatal_error( "out of memory\n" ); /* first create the base directory if needed */ @@ -579,10 +579,13 @@ static int create_server_lock(void) /* wait for the server lock */ int wait_for_lock(void) { + const char *server_dir = wine_get_server_dir(); int fd, r; struct flock fl; - create_server_dir(); + if (!server_dir) return 0; /* no server dir, so no lock to wait on */ + + create_server_dir( server_dir ); fd = create_server_lock(); fl.l_type = F_WRLCK; @@ -598,11 +601,14 @@ int wait_for_lock(void) /* kill the wine server holding the lock */ int kill_lock_owner( int sig ) { + const char *server_dir = wine_get_server_dir(); int fd, i, ret = 0; pid_t pid = 0; struct flock fl; - create_server_dir(); + if (!server_dir) return 0; /* no server dir, nothing to do */ + + create_server_dir( server_dir ); fd = create_server_lock(); for (i = 0; i < 10; i++) @@ -721,6 +727,7 @@ static void acquire_lock(void) /* open the master server socket and start waiting for new clients */ void open_master_socket(void) { + const char *server_dir = wine_get_server_dir(); int fd, pid, status, sync_pipe[2]; char dummy; @@ -728,7 +735,8 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); - create_server_dir(); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", wine_get_config_dir() ); + create_server_dir( server_dir ); if (!foreground) {

1 0

Alexandre Julliard : user/tests: Flush events before running the keyboard event test.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 510a6f70a89ff090c4128a0eaa50bc6757803f0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=510a6f70a89ff090c4128a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 12:51:54 2006 +0200 user/tests: Flush events before running the keyboard event test. --- dlls/user/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 326a279..a4ecbe5 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2314,6 +2314,7 @@ static void test_keyboard_input(HWND hwn ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); + flush_events(); ok(GetActiveWindow() == hwnd, "wrong active window %p\n", GetActiveWindow());

1 0

Alexandre Julliard : comctl32: Force a specific day value in the monthcal test.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 5fd23798ffc67a08d4ba2e823e089ff109c7e773 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fd23798ffc67a08d4ba2e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 12:45:59 2006 +0200 comctl32: Force a specific day value in the monthcal test. Avoids test failure when the current day happens to be the 31st... --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 89d3bc6..b5fb982 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -59,6 +59,7 @@ void test_monthcal(void) ok(st1[0].wYear != 2000, "Lover limit changed\n"); GetSystemTime(&st[0]); + st[0].wDay = 20; st[0].wMonth = 5; st[1] = st[0];

1 0

James Hawkins : advpack: LaunchINFSectionExW is available, so mark it so in the spec file.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: d04606b583c8e1c8ceaa5780dd006f812384714a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d04606b583c8e1c8ceaa578… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 30 12:50:37 2006 -0600 advpack: LaunchINFSectionExW is available, so mark it so in the spec file. --- dlls/advpack/advpack.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 2d3731c..f6a85c7 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -39,7 +39,7 @@ # stdcall LaunchINFSectionW(ptr ptr wstr long) @ stdcall LaunchINFSection(ptr ptr str long) LaunchINFSectionA @ stdcall LaunchINFSectionExA(ptr ptr str long) -# stdcall LaunchINFSectionExW(ptr ptr wstr long) +@ stdcall LaunchINFSectionExW(ptr ptr wstr long) @ stdcall LaunchINFSectionEx(ptr ptr str long) LaunchINFSectionExA @ stdcall NeedReboot(long) @ stdcall NeedRebootInit()

1 0

James Hawkins : advpack: Forward ExecuteCabA to its Unicode counterpart.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 017d1b0b564fafc6a15d2b7f42284a7d1dc45a9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=017d1b0b564fafc6a15d2b7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 30 12:26:59 2006 -0600 advpack: Forward ExecuteCabA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/install.c | 48 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 252b779..2d3731c 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -14,7 +14,7 @@ @ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) @ stdcall ExecuteCabA(ptr ptr ptr) -# stdcall ExecuteCabW(ptr ptr ptr) +@ stdcall ExecuteCabW(ptr ptr ptr) @ stdcall ExecuteCab(ptr ptr ptr) ExecuteCabA @ stdcall ExtractFilesA(str str long ptr ptr long) # stdcall ExtractFilesW(wstr wstr long ptr ptr long) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 042f761..80ed36e 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -27,6 +27,7 @@ #include "winreg.h" #include "winver.h" #include "winternl.h" +#include "winnls.h" #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" @@ -86,6 +87,51 @@ HRESULT WINAPI DoInfInstall(const SETUPC /*********************************************************************** * ExecuteCabA (ADVPACK.@) + * + * See ExecuteCabW. + */ +HRESULT WINAPI ExecuteCabA(HWND hwnd, CABINFOA* pCab, LPVOID pReserved) +{ + UNICODE_STRING cab, inf, section; + CABINFOW cabinfo; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", hwnd, pCab, pReserved); + + if (!pCab) + return E_INVALIDARG; + + if (pCab->pszCab) + { + RtlCreateUnicodeStringFromAsciiz(&cab, pCab->pszCab); + cabinfo.pszCab = cab.Buffer; + } + else + cabinfo.pszCab = NULL; + + RtlCreateUnicodeStringFromAsciiz(&inf, pCab->pszInf); + RtlCreateUnicodeStringFromAsciiz(&section, pCab->pszSection); + + MultiByteToWideChar(CP_ACP, 0, pCab->szSrcPath, -1, cabinfo.szSrcPath, + sizeof(cabinfo.szSrcPath) / sizeof(WCHAR)); + + cabinfo.pszInf = inf.Buffer; + cabinfo.pszSection = section.Buffer; + cabinfo.dwFlags = pCab->dwFlags; + + hr = ExecuteCabW(hwnd, &cabinfo, pReserved); + + if (pCab->pszCab) + RtlFreeUnicodeString(&cab); + + RtlFreeUnicodeString(&inf); + RtlFreeUnicodeString(&section); + + return hr; +} + +/*********************************************************************** + * ExecuteCabW (ADVPACK.@) * * Installs the INF file extracted from a specified cabinet file. * @@ -101,7 +147,7 @@ HRESULT WINAPI DoInfInstall(const SETUPC * BUGS * Unimplemented */ -HRESULT WINAPI ExecuteCabA( HWND hwnd, CABINFOA* pCab, LPVOID pReserved ) +HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) { FIXME("(%p %p %p): stub\n", hwnd, pCab, pReserved); return E_FAIL;

1 0

Robert Shearman : ole32: Remove unnecessary commenting out of the RPC interfaces in the dcom idl file .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: fb5ec209cd89b08426e23aa25cad0ce639535174 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb5ec209cd89b08426e23aa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:56:28 2006 +0100 ole32: Remove unnecessary commenting out of the RPC interfaces in the dcom idl file. --- dlls/ole32/dcom.idl | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index 7d95f37..71120fb 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -215,7 +215,6 @@ interface IRemUnknown2 : IRemUnknown [out, size_is(cIids)] MInterfacePointer **ppMIF); } -cpp_quote("#if 0") [ uuid(99fcfec4-5260-101b-bbcb-00aa0021347a), pointer_default(unique) @@ -289,4 +288,3 @@ interface IRemoteActivation [out,size_is(Interfaces)] MInterfacePointer **ppInterfaceData, [out,size_is(Interfaces)] HRESULT *pResults); } -cpp_quote("#endif")

1 0

Robert Shearman : wininet: Fix some string length calculations.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: c564ee826f46e630dc21d93725535d2d20312ef2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c564ee826f46e630dc21d93… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:55:36 2006 +0100 wininet: Fix some string length calculations. Fix some string length calculations that didn't account for the different sized characters with Unicode. --- dlls/wininet/urlcache.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a4bdfa7..3557ea5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -943,8 +943,8 @@ static BOOL URLCache_CopyEntry( lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); else lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - dwRequiredSize += lenUrl + 1; - + dwRequiredSize += (lenUrl + 1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + /* FIXME: is source url optional? */ if (*lpdwBufferSize >= dwRequiredSize) { @@ -970,7 +970,7 @@ static BOOL URLCache_CopyEntry( { lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName; } - dwRequiredSize += nLocalFilePathSize; + dwRequiredSize += nLocalFilePathSize * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)) ; if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4));

1 0

Robert Shearman : wininet: Only access the URL in the cache by the provided offset.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 4f40f1722605c745ce2c442e1f07a124b3415d03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f40f1722605c745ce2c442… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 30 19:55:15 2006 +0100 wininet: Only access the URL in the cache by the provided offset. --- dlls/wininet/urlcache.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f143512..a4bdfa7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -95,7 +95,7 @@ typedef struct _URL_CACHEFILE_ENTRY DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ - DWORD dwOffsetUrl; /* usually 0x68 */ + DWORD dwOffsetUrl; /* offset of start of url from start of entry */ BYTE CacheDir; /* index of cache directory this url is stored in */ BYTE Unknown4; /* usually zero */ WORD wUnknown5; /* usually 0x1010 */ @@ -112,7 +112,8 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wUnknownTime; /* usually same as wLastSyncTime */ DWORD dwUnknown7; /* usually zero */ DWORD dwUnknown8; /* usually zero */ - CHAR szSourceUrlName[1]; /* start of url */ + /* packing to dword align start of next field */ + /* CHAR szSourceUrlName[]; (url) */ /* packing to dword align start of next field */ /* CHAR szLocalFileName[]; (local file name exluding path) */ /* packing to dword align start of next field */ @@ -939,9 +940,9 @@ static BOOL URLCache_CopyEntry( ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4)); dwRequiredSize = DWORD_ALIGN(dwRequiredSize); if (bUnicode) - lenUrl = MultiByteToWideChar(CP_ACP, 0, pUrlEntry->szSourceUrlName, -1, NULL, 0); + lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); else - lenUrl = strlen(pUrlEntry->szSourceUrlName); + lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); dwRequiredSize += lenUrl + 1; /* FIXME: is source url optional? */ @@ -949,9 +950,9 @@ static BOOL URLCache_CopyEntry( { lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrl - 1; if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, pUrlEntry->szSourceUrlName, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); + MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, pUrlEntry->szSourceUrlName, (lenUrl + 1) * sizeof(CHAR)); + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, (lenUrl + 1) * sizeof(CHAR)); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) @@ -1398,7 +1399,7 @@ BOOL WINAPI GetUrlCacheEntryInfoA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a(pUrlEntry->szSourceUrlName)); + TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); @@ -1483,7 +1484,7 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWST } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a(pUrlEntry->szSourceUrlName)); + TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); if (!URLCache_CopyEntry( @@ -1704,7 +1705,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( } pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", pUrlEntry->szSourceUrlName); + TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); pUrlEntry->dwHitRate++; @@ -2035,7 +2036,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn LPURLCACHE_HEADER pHeader; CACHEFILE_ENTRY * pEntry; URL_CACHEFILE_ENTRY * pUrlEntry; - DWORD dwBytesNeeded = sizeof(*pUrlEntry) - sizeof(pUrlEntry->szSourceUrlName); + DWORD dwBytesNeeded = DWORD_ALIGN(sizeof(*pUrlEntry)); DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwFileSizeLow = 0; @@ -2177,7 +2178,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn pUrlEntry->dwHitRate = 0; pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; - pUrlEntry->dwOffsetUrl = sizeof(*pUrlEntry) - sizeof(pUrlEntry->szSourceUrlName); + pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); pUrlEntry->dwSizeHigh = 0; pUrlEntry->dwSizeLow = dwFileSizeLow; pUrlEntry->dwSizeHigh = dwFileSizeHigh; @@ -2200,7 +2201,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn pUrlEntry->dwUnknown8 = 0; - strcpy(pUrlEntry->szSourceUrlName, achUrl); + strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, achUrl); if (dwOffsetLocalFileName) strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName); if (dwOffsetHeader)

1 0

H. Verbeet : wined3d: Move fields common to vertex shaders and pixel shaders to IWineD3DBaseShader .
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 59af5c4a620c0299075a355963ea56b58bb72915 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59af5c4a620c0299075a355… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 30 19:14:31 2006 +0200 wined3d: Move fields common to vertex shaders and pixel shaders to IWineD3DBaseShader. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 12 ++++++----- dlls/wined3d/pixelshader.c | 40 +++++++++++++++++++------------------- dlls/wined3d/vertexshader.c | 38 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 42 ++++++++++++++++++++++++++++------------ 5 files changed, 76 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=59af5c4a620c0299075…

1 0

Juan Lang : crypt32: Tiny fixes.
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 04ed9c2a57b78f21f189e20b6d7798f0e00aa71b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04ed9c2a57b78f21f189e20… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 30 08:31:14 2006 -0800 crypt32: Tiny fixes. --- dlls/crypt32/proplist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index ec9e242..c030153 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -132,7 +132,6 @@ BOOL ContextPropertyList_SetProperty(PCO { prop->propID = id; prop->cbData = cbData; - list_init(&prop->entry); prop->pbData = data; list_add_tail(&list->properties, &prop->entry); ret = TRUE; @@ -158,6 +157,7 @@ void ContextPropertyList_RemoveProperty( list_remove(&prop->entry); CryptMemFree(prop->pbData); CryptMemFree(prop); + break; } } LeaveCriticalSection(&list->cs);

1 0

Juan Lang : crypt32: Fix certificate adding
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: 5eadd8c79192c5503c8969f18d8212c32bdf1e33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5eadd8c79192c5503c8969f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 30 07:27:05 2006 -0800 crypt32: Fix certificate adding - Implement add disposition in CertAddCertificateContextToStore, rather than in each store. - Add a few more tests. --- dlls/crypt32/store.c | 318 +++++++++++++++++++++++++------------------- dlls/crypt32/tests/store.c | 107 +++++++++++++++ 2 files changed, 285 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5eadd8c79192c5503c8…

1 0

Rein Klazes : msvcrt: Fix read beyond end of string in __unDNameEx().
by Alexandre Julliard 31 Mar '06

31 Mar '06

Module: wine Branch: refs/heads/master Commit: ef9038c761cec7ae40b334c98c33d6e0b8fae79d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef9038c761cec7ae40b334c… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Thu Mar 30 16:30:01 2006 +0200 msvcrt: Fix read beyond end of string in __unDNameEx(). --- dlls/msvcrt/undname.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 1cda196..ebf51fa 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1233,8 +1233,7 @@ char* __unDNameEx(char* buffer, const ch result = symbol_demangle(&sym) ? sym.result : mangled; if (buffer && buflen) { - memcpy(buffer, result, buflen - 1); - buffer[buflen - 1] = '\0'; + lstrcpynA( buffer, result, buflen); } else {

1 0

lostwages/wwn wn20011125_109.xml wn20020913_13 ...
by Jeremy Newman 30 Mar '06

30 Mar '06

ChangeSet ID: 23868 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/30 15:39:46 Modified files: wwn : wn20011125_109.xml wn20020913_135.xml wn20041231_255.xml wn20050204_260.xml wn20060129_304.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. Fix the WineTools case. Patch: http://cvs.winehq.org/patch.py?id=23868 Old revision New revision Changes Path 1.9 1.10 +1 -1 lostwages/wwn/wn20011125_109.xml 1.11 1.12 +1 -1 lostwages/wwn/wn20020913_135.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20041231_255.xml 1.2 1.3 +4 -4 lostwages/wwn/wn20050204_260.xml 1.3 1.4 +2 -2 lostwages/wwn/wn20060129_304.xml Index: lostwages/wwn/wn20011125_109.xml diff -u -p lostwages/wwn/wn20011125_109.xml:1.9 lostwages/wwn/wn20011125_109.xml:1.10 --- lostwages/wwn/wn20011125_109.xml:1.9 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20011125_109.xml 30 Mar 2006 21:39:46 -0000 @@ -346,7 +346,7 @@ he was having, <quote who="Josh Thielen" Finale expects mmsystem to be present without having to call LoadLibrary on it. It does a GetModuleHandle on mmsystem.dll to find out if the mm extensions are available. I checked out windows 95, and it has mmsystem - and winmm loaded when no apps are runing besides the desktop / + and winmm loaded when no apps are running besides the desktop / explorer. This patch links wine with winmm and makes winmm load mmsystem on init. Finale gets by this ok now. I don't know if this the correct approach, though. Could someone (Eric or Alexandre?) please take a look Index: lostwages/wwn/wn20020913_135.xml diff -u -p lostwages/wwn/wn20020913_135.xml:1.11 lostwages/wwn/wn20020913_135.xml:1.12 --- lostwages/wwn/wn20020913_135.xml:1.11 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20020913_135.xml 30 Mar 2006 21:39:46 -0000 @@ -336,7 +336,7 @@ and exactly what would currently build. window mode. Basically, the main menu bar should be at the top of the window, but the - configurable taskbar / buttonbar is displayed "over" it. The accellerator + configurable taskbar / buttonbar is displayed "over" it. The accelerator keys for the menu bar are no longer recognised (the program beeps if you try to use <alt>f [for example] to get to the File menu). </quote> Index: lostwages/wwn/wn20041231_255.xml diff -u -p lostwages/wwn/wn20041231_255.xml:1.3 lostwages/wwn/wn20041231_255.xml:1.4 --- lostwages/wwn/wn20041231_255.xml:1.3 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20041231_255.xml 30 Mar 2006 21:39:46 -0000 @@ -473,7 +473,7 @@ so by making it any easier.</quote> Jon thought it was worth getting rid of heap.h though: <quote who="Jon Griffiths"> -winapi_check will allready tell us all cross-calls anyway, doesn't +winapi_check will already tell us all cross-calls anyway, doesn't it? It may be years before all the a to w conversions are done and we are 100% internally unicode, why live with a non standard header that long?</quote> Index: lostwages/wwn/wn20050204_260.xml diff -u -p lostwages/wwn/wn20050204_260.xml:1.2 lostwages/wwn/wn20050204_260.xml:1.3 --- lostwages/wwn/wn20050204_260.xml:1.2 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20050204_260.xml 30 Mar 2006 21:39:46 -0000 @@ -452,8 +452,8 @@ ever run into legal issues they need cla </section> <section - title="Debian Winetools Packages" - subject="Winetools Debian Package!" + title="Debian WineTools Packages" + subject="WineTools Debian Package!" archive="http://www.winehq.org/hypermail/wine-devel/2005/01/0048.html" posts="1" startdate="02/02/2005" @@ -461,8 +461,8 @@ ever run into legal issues they need cla <topic>Utilities</topic> -Scott Ritchie announced the availability of the Winetools package -for Debian. Winetools sets up a custom configuration and lets you +Scott Ritchie announced the availability of the WineTools package +for Debian. WineTools sets up a custom configuration and lets you install various Windows programs: <quote who="Scott Ritchie"> Index: lostwages/wwn/wn20060129_304.xml diff -u -p lostwages/wwn/wn20060129_304.xml:1.3 lostwages/wwn/wn20060129_304.xml:1.4 --- lostwages/wwn/wn20060129_304.xml:1.3 30 Mar 2006 21:39:46 -0000 +++ lostwages/wwn/wn20060129_304.xml 30 Mar 2006 21:39:46 -0000 @@ -86,7 +86,7 @@ Its main goal is to carpet. It also serv > <topic>Utilities</topic> Debate has been raging for weeks over whether the -<a href="http://www.von-thadden.de/Joachim/WineTools/">Winetools</a> +<a href="http://www.von-thadden.de/Joachim/WineTools/">WineTools</a> project should be listed on Wine's <a href="http://www.winehq.org/site/download">download</a> page. @@ -245,7 +245,7 @@ run and don't run with and without winet those users to appDB. We need information there available for everyone to see, not in your e-mail box (no offense). -Winetools has setup the +WineTools has setup the environment in a such a way that it is unified! If you're saying that all you did is tinkered with lots of stuff to get few applications to work, this is not good. Wine is not cedega designed to run games and games

1 0

lostwages/wwn wn20060313_308.xml
by Jeremy Newman 30 Mar '06

30 Mar '06

ChangeSet ID: 23867 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/03/30 15:39:05 Modified files: wwn : wn20060313_308.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes and tweaks. Link to Jeremy White's Darwine email. Fix the WineTools case. Patch: http://cvs.winehq.org/patch.py?id=23867 Old revision New revision Changes Path 1.2 1.3 +37 -37 lostwages/wwn/wn20060313_308.xml

1 0

Detlef Riekenberg : spoolss: Add DllAllocSplMem and DllFreeSplMem.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: fee66fb15ac70f109398c6d60e18821b0acfced1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fee66fb15ac70f109398c6d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 30 15:59:17 2006 +0200 spoolss: Add DllAllocSplMem and DllFreeSplMem. --- dlls/spoolss/spoolss.spec | 4 ++-- dlls/spoolss/spoolss_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 57b78d2..0862626 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -38,8 +38,8 @@ @ stub DeletePrinterDriverW @ stub DeletePrinterIC @ stub DeletePrinterKeyW -@ stub DllAllocSplMem -@ stub DllFreeSplMem +@ stdcall DllAllocSplMem(long) +@ stdcall DllFreeSplMem(ptr) @ stub DllFreeSplStr @ stub EndDocPrinter @ stub EndPagePrinter diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 65ed261..6baf07a 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -45,3 +45,51 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, } return TRUE; } + +/****************************************************************** + * DllAllocSplMem [SPOOLSS.@] + * + * Allocate cleared memory from the spooler heap + * + * PARAMS + * size [I] Number of bytes to allocate + * + * RETURNS + * Failure: NULL + * Success: PTR to the allocated memory + * + * NOTES + * We use the process heap (Windows use a separate spooler heap) + * + */ +LPVOID WINAPI DllAllocSplMem(DWORD size) +{ + LPVOID res; + + res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + TRACE("(%ld) => %p\n", size, res); + return res; +} + +/****************************************************************** + * DllFreeSplMem [SPOOLSS.@] + * + * Free the allocated spooler memory + * + * PARAMS + * memory [I] PTR to the memory allocated by DllAllocSplMem + * + * RETURNS + * Failure: FALSE + * Success: TRUE + * + * NOTES + * We use the process heap (Windows use a separate spooler heap) + * + */ + +BOOL WINAPI DllFreeSplMem(LPBYTE memory) +{ + TRACE("(%p)\n", memory); + return HeapFree(GetProcessHeap(), 0, memory); +}

1 0

Dmitry Timoshkov : gdi32: Add a test for WMF-> EMF conversions performed by SetWinMetaFileBits.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: d53ad9c3f7c4ab7fd2577aa666ac803629218eb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d53ad9c3f7c4ab7fd2577aa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 30 23:03:02 2006 +0900 gdi32: Add a test for WMF->EMF conversions performed by SetWinMetaFileBits. These tests currently fail in Wine. --- dlls/gdi/tests/metafile.c | 188 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 179 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d53ad9c3f7c4ab7fd25…

1 0

Dmitry Timoshkov : x11drv: Update Hungarian keyboard layout to better match the X11 one.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 70afa9214a72b172e68bd589ceebaa05e9a984b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70afa9214a72b172e68bd58… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 30 23:02:41 2006 +0900 x11drv: Update Hungarian keyboard layout to better match the X11 one. --- dlls/x11drv/keyboard.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 78ff47c..202bff9 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -595,11 +595,11 @@ static const char main_key_BE[MAIN_LEN][ /*** Hungarian keyboard layout (setxkbmap hu) */ static const char main_key_HU[MAIN_LEN][4] = { - "0�","1'~","2\"�","3+^","4!�","5%0�","6/�","7=`","8(�","9)�","�ֽ","�ܨ","�Ӹ", - "qQ\\","wW|","eE","rR","tT","zZ","uU","iI�","oO�","pP","��","��", - "aA","sS�","dD�","fF[","gG]","hH","jJ�","kK�","lL�","��$","��","�ۤ", - "yY>","xX#","cC&","vV@","bB{","nN}","mM",",?;",".:>","-_*", - "��<" + "0�","1'","2\"","3+","4!","5%","6/","7=","8(","9)","��","��","��", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","��", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","��", + "yY","xX","cC","vV","bB","nN","mM",",?",".:","-_", + "��" }; /*** Polish (programmer's) keyboard layout ***/

1 0

Eric Kohl : widl: Implement support for ref pointers to strings.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 12d4d9c229678639f77fb07e47314ae2defec6ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12d4d9c229678639f77fb07… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Wed Mar 29 12:42:29 2006 +0200 widl: Implement support for ref pointers to strings. --- tools/widl/client.c | 41 ++++++++++---- tools/widl/header.c | 22 +++++++ tools/widl/header.h | 1 tools/widl/server.c | 38 +++++++++++-- tools/widl/typegen.c | 150 ++++++++++++++++++++++++++++++++++++++------------ tools/widl/typegen.h | 1 6 files changed, 202 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=12d4d9c229678639f77…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006