December 2005 - Wine-Commits

Jesse Allen : msvcrt: Require exact uppercase and lowercase format in printf routines.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 5c6311688c13a5557e4b05d06f2f9b6f6c341063 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c6311688c13a5557e4b05d… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 19 21:26:46 2005 +0100 msvcrt: Require exact uppercase and lowercase format in printf routines. --- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 73b08b7..72b12a4 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -51,6 +51,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation\n"); ok( r==1, "return count wrong\n"); + format = "%I"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); + ok( r==1, "return count wrong\n"); + format = "%S"; r = sprintf(buffer,format,wide); ok(!strcmp(buffer,"wide"),"Problem with wide string format\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2e5d0a9..b8dc39e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -347,19 +347,17 @@ static inline int pf_output_format_A( pf static inline BOOL pf_is_double_format( char fmt ) { - char float_fmts[] = "aefg"; + static const char float_fmts[] = "aeEfgG"; if (!fmt) return FALSE; - fmt = tolower( fmt ); return strchr( float_fmts, fmt ) ? TRUE : FALSE; } static inline BOOL pf_is_valid_format( char fmt ) { - char float_fmts[] = "acdefginoux"; + static const char float_fmts[] = "acCdeEfgGinouxX"; if (!fmt) return FALSE; - fmt = tolower( fmt ); return strchr( float_fmts, fmt ) ? TRUE : FALSE; }

1 0

Bill Medland : winemenubuilder: Provide depth to the menus created.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: d5739ed88f916b53325a16fa08bf62990ff149bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5739ed88f916b53325a16f… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Mon Dec 19 21:25:52 2005 +0100 winemenubuilder: Provide depth to the menus created. --- programs/winemenubuilder/winemenubuilder.c | 102 ++++++++++++++++++---------- tools/wineshelllink | 7 ++ 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 589b208..3823142 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -5,6 +5,7 @@ * Copyright 1998 Juergen Schmied * Copyright 2003 Mike McCormack for CodeWeavers * Copyright 2004 Dmitry Timoshkov + * Copyright 2005 Bill Medland * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * + * This program is used to replicate the Windows desktop and start menu + * into the native desktop's copies. Desktop entries are merged directly + * into the native desktop. The Windows Start Menu corresponds to a Wine + * entry within the native "start" menu and replicates the whole tree + * structure of the Windows Start Menu. Currently it does not differentiate + * between the user's desktop/start menu and the "All Users" copies. + * * This program will read a Windows shortcut file using the IShellLink * interface, then invoke wineshelllink with the appropriate arguments * to create a KDE/Gnome menu entry for the shortcut. @@ -28,10 +36,21 @@ * winemenubuilder [ -r ] <shortcut.lnk> * * If the -r parameter is passed, and the shortcut cannot be created, - * this program will add RunOnce entry to invoke itself at the next + * this program will add a RunOnce entry to invoke itself at the next * reboot. This covers the case when a ShortCut is created before the * executable containing its icon. * + * TODO + * Handle data lnk files. There is no icon in the file; the icon is in + * the handler for the file type (or pointed to by the lnk file). Also it + * might be better to use a native handler (e.g. a native acroread for pdf + * files). + * Differentiate between the user's entries and the "All Users" entries. + * If it is possible to add the desktop files to the native system's + * shared location for an "All Users" entry then do so. As a suggestion the + * shared menu Wine base could be writable to the wine group, or a wineadm + * group. + * */ #include "config.h" @@ -650,32 +669,46 @@ static int fork_and_wait( const char *li return retcode; } -static char *cleanup_link( LPCWSTR link ) +/* Return a heap-allocated copy of the unix format difference between the two + * Windows-format paths. + * locn is the owning location + * link is within locn + */ +static char *relative_path( LPCWSTR link, LPCWSTR locn ) { - char *unix_file_name; - char *p, *link_name; + char *unix_locn, *unix_link; + char *relative = NULL; - unix_file_name = wine_get_unix_file_name(link); - if (!unix_file_name) - { - WINE_ERR("target link %s not found\n", wine_dbgstr_w(link)); - return NULL; + unix_locn = wine_get_unix_file_name(locn); + unix_link = wine_get_unix_file_name(link); + if (unix_locn && unix_link) + { + size_t len_unix_locn, len_unix_link; + len_unix_locn = strlen (unix_locn); + len_unix_link = strlen (unix_link); + if (len_unix_locn < len_unix_link && memcmp (unix_locn, unix_link, len_unix_locn) == 0 && unix_link[len_unix_locn] == '/') + { + size_t len_rel; + char *p = strrchr (unix_link + len_unix_locn, '/'); + p = strrchr (p, '.'); + if (p) + { + *p = '\0'; + len_unix_link = p - unix_link; + } + len_rel = len_unix_link - len_unix_locn; + relative = HeapAlloc(GetProcessHeap(), 0, len_rel); + if (relative) + { + memcpy (relative, unix_link + len_unix_locn + 1, len_rel); + } + } } - - link_name = unix_file_name; - p = strrchr( link_name, '/' ); - if (p) - link_name = p + 1; - - p = strrchr( link_name, '.' ); - if (p) - *p = 0; - - p = HeapAlloc(GetProcessHeap(), 0, strlen(link_name) + 1); - strcpy(p, link_name); - HeapFree(GetProcessHeap(), 0, unix_file_name); - - return p; + if (!relative) + WINE_WARN("Could not separate the relative link path of %s in %s\n", wine_dbgstr_w(link), wine_dbgstr_w(locn)); + HeapFree(GetProcessHeap(), 0, unix_locn); + HeapFree(GetProcessHeap(), 0, unix_link); + return relative; } /*********************************************************************** @@ -683,9 +716,11 @@ static char *cleanup_link( LPCWSTR link * GetLinkLocation * * returns TRUE if successful - * *loc will contain CS_DESKTOPDIRECTORY, CS_STARTMENU, CS_STARTUP + * *loc will contain CS_DESKTOPDIRECTORY, CS_STARTMENU, CS_STARTUP etc. + * *relative will contain the address of a heap-allocated copy of the portion + * of the filename that is within the specified location, in unix form */ -static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc ) +static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) { WCHAR filename[MAX_PATH], buffer[MAX_PATH]; DWORD len, i, r, filelen; @@ -708,7 +743,7 @@ static BOOL GetLinkLocation( LPCWSTR lin len = lstrlenW(buffer); if (len >= MAX_PATH) - continue; + continue; /* We've just trashed memory! Hopefully we are OK */ if (len > filelen || filename[len]!='\\') continue; @@ -721,7 +756,8 @@ static BOOL GetLinkLocation( LPCWSTR lin /* return the remainder of the string and link type */ *loc = locations[i]; - return TRUE; + *relative = relative_path (filename, buffer); + return (*relative != NULL); } return FALSE; @@ -856,7 +892,7 @@ static BOOL InvokeShellLinker( IShellLin return FALSE; } - if( !GetLinkLocation( link, &csidl ) ) + if( !GetLinkLocation( link, &csidl, &link_name ) ) { WINE_WARN("Unknown link location '%s'. Ignoring.\n",wine_dbgstr_w(link)); return TRUE; @@ -866,6 +902,7 @@ static BOOL InvokeShellLinker( IShellLin WINE_WARN("Not under desktop or start menu. Ignoring.\n"); return TRUE; } + WINE_TRACE("Link : %s\n", wine_dbgstr_a(link_name)); szWorkDir[0] = 0; IShellLinkW_GetWorkingDirectory( sl, szWorkDir, MAX_PATH ); @@ -935,13 +972,6 @@ static BOOL InvokeShellLinker( IShellLin lstrcatW(szPath, startW); } - link_name = cleanup_link( link ); - if( !link_name ) - { - WINE_ERR("Couldn't clean up link name %s\n", wine_dbgstr_w(link)); - goto cleanup; - } - /* escape the path and parameters */ escaped_path = escape(szPath); escaped_args = escape(szArgs); diff --git a/tools/wineshelllink b/tools/wineshelllink index 722ede0..10fa80b 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -20,6 +20,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# Note that the link is a relative unix-style path name. Since the / character +# is not valid in Windows filenames it is an adequate separator to show the +# menu structure. (This program may need to split the menu structure out for +# implementing xdg-style menus) + mode="" args="" menu="" @@ -38,7 +43,7 @@ options: --desktop create a desktop link --menu create a menu entry --path xx path to the application - --link xx name of link to create + --link xx name of link to create, including path --args xx command-line arguments for the application --icon xx icon to display --workdir xx working directory for the application

1 0

Alexandre Julliard : kernel32: Check for tabs too when extracting the program name
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 68df9182825ee82793bc8fb76dd0ae7409fbd384 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68df9182825ee82793bc8fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 21:25:23 2005 +0100 kernel32: Check for tabs too when extracting the program name (reported by Vitaliy Margolen). --- dlls/kernel/process.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index e75fccb..19d945b 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1736,6 +1736,7 @@ static LPWSTR get_file_name( LPCWSTR app WCHAR *name, *pos, *ret = NULL; const WCHAR *p; + BOOL got_space; /* if we have an app name, everything is easy */ @@ -1780,26 +1781,27 @@ static LPWSTR get_file_name( LPCWSTR app return NULL; pos = name; p = cmdline; + got_space = FALSE; while (*p) { - do *pos++ = *p++; while (*p && *p != ' '); + do *pos++ = *p++; while (*p && *p != ' ' && *p != '\t'); *pos = 0; if (find_exe_file( name, buffer, buflen, handle )) { ret = cmdline; break; } + if (*p) got_space = TRUE; } - if (!ret || !strchrW( name, ' ' )) goto done; /* no change necessary */ - - /* now build a new command-line with quotes */ - - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) ))) - goto done; - sprintfW( ret, quotesW, name ); - strcatW( ret, p ); + if (ret && got_space) /* now build a new command-line with quotes */ + { + if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) ))) + goto done; + sprintfW( ret, quotesW, name ); + strcatW( ret, p ); + } done: HeapFree( GetProcessHeap(), 0, name );

1 0

Hans Leidekker : widl: Avoid lvalue casts in generated code.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 4f46232368fbfbac621bda169bb19a65622a6f78 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f46232368fbfbac621bda1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Dec 19 21:20:14 2005 +0100 widl: Avoid lvalue casts in generated code. --- tools/widl/client.c | 7 +++++-- tools/widl/proxy.c | 28 ++++++++++++++++++++-------- tools/widl/server.c | 7 +++++-- tools/widl/typegen.c | 14 ++++++++++---- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index e0c4295..3fd5f5c 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -255,9 +255,12 @@ static void write_function_stubs(type_t indent -= 2; fprintf(client, "\n"); - print_client("_RetVal = *(("); + print_client("_RetVal = *("); write_type(client, def->type, def, def->tname); - fprintf(client, " *)_StubMsg.Buffer)++;\n"); + fprintf(client, " *)_StubMsg.Buffer;\n"); + fprintf(client, "_StubMsg.Buffer += sizeof("); + write_type(client, def->type, def, def->tname); + fprintf(client, ");\n"); } /* update proc_offset */ diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 936e1e7..c91d388 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -323,9 +323,12 @@ static void marshall_copy_arg( var_t *ar case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - print_proxy( "*(("); + print_proxy( "*("); write_type(proxy, arg->type, arg, arg->tname); - fprintf(proxy,"*)_StubMsg.Buffer)++ = %s;\n", arg->name ); + fprintf(proxy, " *)_StubMsg.Buffer = %s;\n", arg->name ); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); + write_type(proxy, arg->type, arg, arg->tname); + fprintf(proxy, ");\n"); break; case RPC_FC_STRUCT: @@ -419,9 +422,12 @@ static void unmarshall_copy_arg( var_t * case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - print_proxy( "%s = *((", arg->name ); + print_proxy( "%s = *(", arg->name ); + write_type(proxy, arg->type, arg, arg->tname); + fprintf(proxy," *)_StubMsg.Buffer;\n"); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); write_type(proxy, arg->type, arg, arg->tname); - fprintf(proxy,"*)_StubMsg.Buffer)++;\n"); + fprintf(proxy, ");\n"); break; case RPC_FC_STRUCT: @@ -595,9 +601,12 @@ static void gen_proxy(type_t *iface, fun */ print_proxy( "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + 3) & ~ 0x3);\n"); - print_proxy( "_RetVal = *((" ); + print_proxy( "_RetVal = *(" ); write_type(proxy, def->type, def, def->tname); - fprintf(proxy, "*)_StubMsg.Buffer)++;\n"); + fprintf(proxy, " *)_StubMsg.Buffer;\n"); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); + write_type(proxy, def->type, def, def->tname); + fprintf(proxy, ");\n"); } indent--; @@ -798,9 +807,12 @@ static void gen_stub(type_t *iface, func */ print_proxy( "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + 3) & ~ 0x3);\n"); - print_proxy( "*((" ); + print_proxy( "*(" ); + write_type(proxy, def->type, def, def->tname); + fprintf(proxy, " *)_StubMsg.Buffer = _RetVal;\n"); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); write_type(proxy, def->type, def, def->tname); - fprintf(proxy, "*)_StubMsg.Buffer)++ = _RetVal;\n"); + fprintf(proxy, ");\n"); } indent--; diff --git a/tools/widl/server.c b/tools/widl/server.c index cb10993..6022f5a 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -267,9 +267,12 @@ static void write_function_stubs(type_t print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); fprintf(server, "\n"); - print_server("*(("); + print_server("*("); write_type(server, def->type, def, def->tname); - fprintf(server, " *)_StubMsg.Buffer)++ = _RetVal;\n"); + fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); + fprintf(server, "_StubMsg.Buffer += sizeof("); + write_type(server, def->type, def, def->tname); + fprintf(server, ");\n"); } indent--; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 32ac8e8..cb6e87b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -301,11 +301,14 @@ void marshall_arguments(FILE *file, int if (alignment != 0) print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - print_file(file, indent, "*(("); + print_file(file, indent, "*("); write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer)++ = "); + fprintf(file, " *)_StubMsg.Buffer = "); write_name(file, var); fprintf(file, ";\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, var, var->tname); + fprintf(file, ");\n"); fprintf(file, "\n"); last_size = size; @@ -373,9 +376,12 @@ void unmarshall_arguments(FILE *file, in print_file(file, indent, ""); write_name(file, var); - fprintf(file, " = *(("); + fprintf(file, " = *("); + write_type(file, var->type, var, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer)++;\n"); + fprintf(file, ");\n"); fprintf(file, "\n"); last_size = size;

1 0

Kai Blin : secur32: Adding AcceptSecurityContext to the NTLM security provider.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 43b21b6e8649f26b348b58fd64262f242e308da4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43b21b6e8649f26b348b58f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Dec 19 21:20:03 2005 +0100 secur32: Adding AcceptSecurityContext to the NTLM security provider. --- dlls/secur32/ntlm.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 226 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3de699f..feaef9b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -741,7 +741,232 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac ptsExpiry); if (phCredential) { - ret = SEC_E_UNSUPPORTED_FUNCTION; + PNegoHelper helper = (PNegoHelper)phCredential->dwLower; + /* Max size of input data is 2010 byte, as that's the maximum size + * ntlm_auth will handle*/ + char *buffer = HeapAlloc(GetProcessHeap(), 0, + sizeof(char) * NTLM_MAX_BUF); + PBYTE bin = HeapAlloc(GetProcessHeap(),0, sizeof(BYTE) * NTLM_MAX_BUF); + int buffer_len, bin_len, max_len = NTLM_MAX_BUF; + ULONG ctxt_attr = 0; + + if(helper->mode != NTLM_SERVER) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_HANDLE; + } + + /* Handle all the flags */ + if(fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + FIXME("AcceptSecurityContext(): ISC_REQ_ALLOCATE_MEMORY stub\n"); + } + if(fContextReq & ISC_REQ_CONFIDENTIALITY) + { + FIXME("AcceptSecurityContext(): ISC_REQ_CONFIDENTIALITY stub\n"); + } + if(fContextReq & ISC_REQ_CONNECTION) + { + /* This is default, so we'll enable it */ + ctxt_attr |= ISC_RET_CONNECTION; + } + if(fContextReq & ISC_REQ_EXTENDED_ERROR) + { + FIXME("AcceptSecurityContext(): ISC_REQ_EXTENDED_ERROR stub\n"); + } + if(fContextReq & ISC_REQ_INTEGRITY) + { + FIXME("AcceptSecurityContext(): ISC_REQ_INTEGRITY stub\n"); + } + if(fContextReq & ISC_REQ_MUTUAL_AUTH) + { + FIXME("AcceptSecurityContext(): ISC_REQ_MUTUAL_AUTH stub\n"); + } + if(fContextReq & ISC_REQ_REPLAY_DETECT) + { + FIXME("AcceptSecurityContext(): ISC_REQ_REPLAY_DETECT stub\n"); + } + if(fContextReq & ISC_REQ_SEQUENCE_DETECT) + { + FIXME("AcceptSecurityContext(): ISC_REQ_SEQUENCE_DETECT stub\n"); + } + if(fContextReq & ISC_REQ_STREAM) + { + FIXME("AcceptSecurityContext(): ISC_REQ_STREAM stub\n"); + } + /* Done with the flags */ + if(TargetDataRep == SECURITY_NETWORK_DREP){ + FIXME("Don't know how to do SECURITY_NETWORK_DREP\n"); + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + + if(phContext == NULL) + { + /* This is the first call to AcceptSecurityHandle */ + if(pInput == NULL) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->cBuffers < 1) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->pBuffers[0].cbBuffer > max_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + else + bin_len = pInput->pBuffers[0].cbBuffer; + + /* This is the YR request from the client, encode to base64 */ + + memcpy(bin, pInput->pBuffers[0].pvBuffer, bin_len); + + lstrcpynA(buffer, "YR ", max_len-1); + + if((ret = encodeBase64(bin, bin_len, buffer+3, max_len-3, + &buffer_len)) != SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Client sent: %s\n", debugstr_a(buffer)); + + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != + SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Reply from ntlm_auth: %s\n", debugstr_a(buffer)); + /* The expected answer is TT <base64 blob> */ + + if(strncmp(buffer, "TT ", 3) != 0) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + + if((ret = decodeBase64(buffer+3, buffer_len-3, bin, max_len, + &bin_len)) != SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + /* send this to the client */ + if(pOutput == NULL) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INSUFFICIENT_MEMORY; + } + + if(pOutput->cBuffers < 1) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INSUFFICIENT_MEMORY; + } + + pOutput->pBuffers[0].cbBuffer = bin_len; + pOutput->pBuffers[0].BufferType = SECBUFFER_DATA; + memcpy(pOutput->pBuffers[0].pvBuffer, bin, bin_len); + ret = SEC_I_CONTINUE_NEEDED; + + } + else + { + /* we expect a KK request from client */ + if(pInput == NULL) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->cBuffers < 1) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->pBuffers[0].cbBuffer > max_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + else + bin_len = pInput->pBuffers[0].cbBuffer; + + memcpy(bin, pInput->pBuffers[0].pvBuffer, bin_len); + + lstrcpynA(buffer, "KK ", max_len-1); + + if((ret = encodeBase64(bin, bin_len, buffer+3, max_len-3, + &buffer_len)) != SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Client sent: %s\n", debugstr_a(buffer)); + + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != + SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Reply from ntlm_auth: %s\n", debugstr_a(buffer)); + + if(strncmp(buffer, "AF ", 3) != 0) + { + if(strncmp(buffer, "NA ", 3) == 0) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_LOGON_DENIED; + } + else + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + } + + ret = SEC_E_OK; + } + + phNewContext->dwUpper = ctxt_attr; + phNewContext->dwLower = ret; + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + } else {

1 0

Detlef Riekenberg : winspool: Filter additional failures.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 6035b93e455d4577ba1cb29602df5267048246ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6035b93e455d4577ba1cb29… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 19 21:19:47 2005 +0100 winspool: Filter additional failures. --- dlls/winspool/tests/info.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 0401546..2218ef4 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -418,8 +418,10 @@ static void test_openprinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); - ok(res || (!res && GetLastError() == ERROR_INVALID_DATATYPE), - "returned %ld with %ld (expected '!=0' or '0' with ERROR_INVALID_DATATYPE)\n", + ok(res || (GetLastError() == ERROR_INVALID_DATATYPE || + GetLastError() == RPC_S_SERVER_UNAVAILABLE), + "returned %ld with %ld (expected '!=0' or '0' with: " \ + "ERROR_INVALID_DATATYPE or RPC_S_SERVER_UNAVAILABLE)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -430,8 +432,10 @@ static void test_openprinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); - ok(res || (!res && GetLastError() == ERROR_ACCESS_DENIED), - "returned %ld with %ld (expected '!=0' or '0' with ERROR_ACCESS_DENIED)\n", + ok(res || (GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE), + "returned %ld with %ld (expected '!=0' or '0' with: " \ + "ERROR_ACCESS_DENIED or RPC_S_SERVER_UNAVAILABLE)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -440,8 +444,10 @@ static void test_openprinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); - ok(res || (!res && GetLastError() == ERROR_ACCESS_DENIED), - "returned %ld with %ld (expected '!=0' or '0' with ERROR_ACCESS_DENIED)\n", + ok(res || (GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE), + "returned %ld with %ld (expected '!=0' or '0' with: " \ + "ERROR_ACCESS_DENIED or RPC_S_SERVER_UNAVAILABLE)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); }

1 0

Eric Pouech : winhelp: Handle '> ' on command lines.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: e5b40ab56a6760b4132f00a84031c03f401f3c41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5b40ab56a6760b4132f00a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:23:02 2005 +0100 winhelp: Handle '> ' on command lines. --- programs/winhelp/winhelp.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 5c4b9e2..f3abdd5 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -161,10 +161,10 @@ static HLPFILE_WINDOWINFO* WINHELP_G */ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { - MSG msg; - LONG lHash = 0; - HLPFILE* hlpfile; - CHAR* quote; + MSG msg; + LONG lHash = 0; + HLPFILE* hlpfile; + char* wndname = "main"; WINHELP_DLL* dll; Globals.hInstance = hInstance; @@ -214,17 +214,23 @@ int PASCAL WinMain(HINSTANCE hInstance, if (*cmdline) { - if ((*cmdline == '"') && (quote = strchr(cmdline+1, '"'))) + char* ptr; + if ((*cmdline == '"') && (ptr = strchr(cmdline+1, '"'))) { cmdline++; - *quote = '\0'; + *ptr = '\0'; + } + if ((ptr = strchr(cmdline, '>'))) + { + *ptr = '\0'; + wndname = ptr + 1; } hlpfile = WINHELP_LookupHelpFile(cmdline); if (!hlpfile) return 0; } else hlpfile = NULL; WINHELP_CreateHelpWindowByHash(hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, "main"), show); + WINHELP_GetWindowInfo(hlpfile, wndname), show); /* Message loop */ while (GetMessage(&msg, 0, 0, 0))

1 0

Eric Pouech : dbghelp: First stab at supporting calling convention in function signature.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: be849decf60eb49811995f9129d72808424b8d12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be849decf60eb49811995f9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:22:54 2005 +0100 dbghelp: First stab at supporting calling convention in function signature. --- dlls/dbghelp/dbghelp_private.h | 4 +++- dlls/dbghelp/dwarf.c | 23 ++++++++++++++++++++++- dlls/dbghelp/msc.c | 17 +++++++++++------ dlls/dbghelp/stabs.c | 8 ++++---- dlls/dbghelp/type.c | 18 ++++++++++++++++-- 5 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1291162..8d8cb70 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -220,6 +220,7 @@ struct symt_function_signature struct symt symt; struct symt* rettype; struct vector vchildren; + enum CV_call_e call_conv; }; struct symt_function_arg_type @@ -472,7 +473,8 @@ extern struct symt_array* struct symt* base); extern struct symt_function_signature* symt_new_function_signature(struct module* module, - struct symt* ret_type); + struct symt* ret_type, + enum CV_call_e call_conv); extern BOOL symt_add_function_signature_parameter(struct module* module, struct symt_function_signature* sig, struct symt* param); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f16dd63..946852e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -443,6 +443,17 @@ typedef enum dwarf_operation_e { DW_OP_nop = 0x96 } dwarf_operation_t; +enum dwarf_calling_convention +{ + DW_CC_normal = 0x1, + DW_CC_program = 0x2, + DW_CC_nocall = 0x3 +}; + +#define DW_CC_lo_user 0x40 +#define DW_CC_hi_user 0xff + + /** * Parsers */ @@ -1876,6 +1887,8 @@ static struct symt_function* dwarf2_pars unsigned char decl_line = 0; dwarf2_abbrev_entry_attr_t* attr = NULL; unsigned long next_sibling = 0; + enum CV_call_e call_conv = CV_CALL_FAR_C; /* FIXME: assuming C source code */ + unsigned cc; TRACE("%s, for %lu\n", dwarf2_debug_ctx(ctx), entry->entry_code); @@ -1908,6 +1921,14 @@ static struct symt_function* dwarf2_pars case DW_AT_inline: inl_flags = dwarf2_parse_byte(ctx); break; + case DW_AT_calling_convention: + switch (cc = dwarf2_parse_byte(ctx)) + { + case DW_CC_normal: break; + case DW_CC_nocall: call_conv = -1; + default: FIXME("Unsupported calling convention %d\n", cc); + } + break; /* not work yet, need parsing .debug_line and using Compil Unit stmt_list case DW_AT_decl_file: decl_file = dwarf2_parse_byte(ctx); @@ -1921,7 +1942,7 @@ static struct symt_function* dwarf2_pars dwarf2_parse_attr(attr, ctx); } } - sig_type = symt_new_function_signature(module, ret_type); + sig_type = symt_new_function_signature(module, ret_type, call_conv); if (!is_decl) { func_type = symt_new_function(module, compiland, name, addr, size, &sig_type->symt); if (low_pc && high_pc) { diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 054f27b..93f0474 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -726,11 +726,12 @@ static int codeview_add_type_struct(stru } static int codeview_new_func_signature(struct module* module, unsigned typeno, - unsigned ret_type) + unsigned ret_type, enum CV_call_e call_conv) { struct symt* symt; symt = &symt_new_function_signature(module, - codeview_get_type(ret_type, FALSE))->symt; + codeview_get_type(ret_type, FALSE), + call_conv)->symt; return codeview_add_type(typeno, symt); } @@ -916,25 +917,29 @@ static int codeview_parse_type_table(str break; case LF_PROCEDURE_V1: retv = codeview_new_func_signature(module, curr_type, - type->procedure_v1.rvtype); + type->procedure_v1.rvtype, + type->procedure_v1.call); break; case LF_PROCEDURE_V2: retv = codeview_new_func_signature(module, curr_type, - type->procedure_v2.rvtype); + type->procedure_v2.rvtype, + type->procedure_v2.call); break; case LF_MFUNCTION_V1: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ retv = codeview_new_func_signature(module, curr_type, - type->mfunction_v1.rvtype); + type->mfunction_v1.rvtype, + type->mfunction_v1.call); break; case LF_MFUNCTION_V2: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ retv = codeview_new_func_signature(module, curr_type, - type->mfunction_v2.rvtype); + type->mfunction_v2.rvtype, + type->mfunction_v2.call); break; case LF_ARGLIST_V1: case LF_ARGLIST_V2: diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index f29f552..76629b7 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -848,7 +848,7 @@ static int stabs_pts_read_type_def(struc break; case 'f': PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_function_signature(ptd->module, ref_dt)->symt; + new_dt = &symt_new_function_signature(ptd->module, ref_dt, -1)->symt; break; case 'e': new_dt = &symt_new_enum(ptd->module, typename)->symt; @@ -930,7 +930,7 @@ static int stabs_pts_read_type_def(struc { ptd->ptr++; PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_function_signature(ptd->module, ref_dt)->symt; + new_dt = &symt_new_function_signature(ptd->module, ref_dt, -1)->symt; } else { @@ -940,7 +940,7 @@ static int stabs_pts_read_type_def(struc PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &cls_dt) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ','); PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_function_signature(ptd->module, ref_dt)->symt; + new_dt = &symt_new_function_signature(ptd->module, ref_dt, -1)->symt; while (*ptd->ptr == ',') { ptd->ptr++; @@ -1422,7 +1422,7 @@ BOOL stabs_parse(struct module* module, (load_offset + stab_ptr->n_value - curr_func->address) : 0); } func_type = symt_new_function_signature(module, - stabs_parse_type(ptr)); + stabs_parse_type(ptr), -1); curr_func = symt_new_function(module, compiland, symname, load_offset + stab_ptr->n_value, 0, &func_type->symt); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index fba6942..a62d50a 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -298,7 +298,8 @@ struct symt_array* symt_new_array(struct } struct symt_function_signature* symt_new_function_signature(struct module* module, - struct symt* ret_type) + struct symt* ret_type, + enum CV_call_e call_conv) { struct symt_function_signature* sym; @@ -307,6 +308,7 @@ struct symt_function_signature* symt_new sym->symt.tag = SymTagFunctionType; sym->rettype = ret_type; vector_init(&sym->vchildren, sizeof(struct symt*), 4); + sym->call_conv = call_conv; symt_add_type(module, &sym->symt); } return sym; @@ -735,11 +737,20 @@ BOOL symt_get_info(const struct symt* ty X(VARIANT) = ((const struct symt_data*)type)->u.value; break; + case TI_GET_CALLING_CONVENTION: + if (type->tag != SymTagFunctionType) return FALSE; + if (((const struct symt_function_signature*)type)->call_conv == -1) + { + FIXME("No support for calling convention for this signature\n"); + X(DWORD) = CV_CALL_FAR_C; /* FIXME */ + } + else X(DWORD) = ((const struct symt_function_signature*)type)->call_conv; + break; + #undef X case TI_GET_ADDRESSOFFSET: case TI_GET_ARRAYINDEXTYPEID: - case TI_GET_CALLING_CONVENTION: case TI_GET_CLASSPARENTID: case TI_GET_SYMINDEX: case TI_GET_THISADJUST: @@ -749,6 +760,9 @@ BOOL symt_get_info(const struct symt* ty case TI_IS_EQUIV_TO: FIXME("Unsupported GetInfo request (%u)\n", req); return FALSE; + default: + FIXME("Unknown GetInfo request (%u)\n", req); + return FALSE; } return TRUE;

1 0

Eric Pouech : dbghelp: Return proper size for local & parameters in SYMBOL_INFO.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 750575ccf29c6ae1a478ef4f81f6d1054ef926c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=750575ccf29c6ae1a478ef4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:20:47 2005 +0100 dbghelp: Return proper size for local & parameters in SYMBOL_INFO. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d2445cd..1291162 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -142,7 +142,7 @@ struct symt_data unsigned long address; /* DataIs{Global, FileStatic} */ struct { - long offset; /* DataIs{Member,Local,Param} in bits*/ + long offset; /* DataIs{Member,Local,Param} in bits */ unsigned long length; /* DataIs{Member} in bits */ unsigned long reg_id; /* DataIs{Local} (0 if frame relative) */ } s; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 29e7d1f..74634d1 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -448,7 +448,10 @@ static void symt_fill_sym_info(const str if (!symt_get_info(sym, TI_GET_TYPE, &sym_info->TypeIndex)) sym_info->TypeIndex = 0; sym_info->info = (DWORD)sym; - symt_get_info(sym, TI_GET_LENGTH, &size); + if (!symt_get_info(sym, TI_GET_LENGTH, &size) && + sym_info->TypeIndex && + !symt_get_info((struct symt*)sym_info->TypeIndex, TI_GET_LENGTH, &size)) + size = 0; sym_info->Size = (DWORD)size; sym_info->ModBase = module->module.BaseOfImage; sym_info->Flags = 0;

1 0

Jonathan Ernst : winecfg: Updated French resources.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: d3805c307acbb4e59a2bdc274f550ab096de2ac0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3805c307acbb4e59a2bdc2… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Dec 19 18:18:01 2005 +0100 winecfg: Updated French resources. --- programs/winecfg/Fr.rc | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index f71a70b..33e3142 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Param�tres des applications ",IDC_STATIC, 8,4,244,240 LTEXT "Wine peut imiter diff�rentes versions de Windows pour chaque application. Cet onglet est li� aux onglets Biblioth�ques et Affichage pour vous permettre de changer des param�tres globaux ou par application dans ces onglets.", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,20,227,40 CONTROL "Applications",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,60,230,140 PUSHBUTTON "&Ajouter une application...",IDC_APP_ADDAPP, 70,204,85,14 @@ -82,8 +82,8 @@ BEGIN GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 - LTEXT "Support du Vertex Shader: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Support du Vertex Shader: ",IDC_STATIC,15,150,100,30 + COMBOBOX IDC_D3D_VSHADER_MODE,110,148,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Permettre le Pixel Shader (si support� par le mat�riel)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 END @@ -160,10 +160,10 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "Pilote audio: ",IDC_STATIC,15,20,227,30 - CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,170,50,85,14 + GROUPBOX " S�lection du pilote ",IDC_STATIC,8,4,244,195 + LTEXT "S�lectionnez un pilote audio en cochant la case en regard du pilote d�sir�. D�sactivez le son en ne s�lectionnant aucun polote. La s�lection de pilotes multiples n'est pas recommand�. Configurez le pilote en effectuant un click droit dessus.",IDC_STATIC,15,20,227,60 + CONTROL "Mat�riel",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,60,140,130 + PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,160,60,86,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Acc�l�ration mat�rielle: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -174,13 +174,13 @@ IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Th�mes ",IDC_STATIC,8,10,244,94 - LTEXT "Th�me:",IDC_STATIC,15,22,228,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,30,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Couleur:",IDC_THEME_COLORTEXT,15,48,228,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,56,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Taille:",IDC_THEME_SIZETEXT,15,74,228,8 - COMBOBOX IDC_THEME_SIZECOMBO,15,82,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Th�me:",IDC_STATIC,8,10,244,8 + COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Installer un th�me...",IDC_THEME_INSTALL,152,32,100,14 + LTEXT "Couleur:",IDC_THEME_COLORTEXT,8,48,244,8 + COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Taille:",IDC_THEME_SIZETEXT,8,74,244,8 + COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END STRINGTABLE DISCARDABLE @@ -198,4 +198,6 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "A propos" IDS_WINECFG_TITLE "Configuration de Wine" + IDS_THEMEFILE "Fichiers de th�mes" + IDS_THEMEFILE_SELECT "S�lectionnez un fichier de th�me" END

1 0