February 2007 - Wine-Commits

Francois Gouget : winapi: Remove useless 'if (0)' statements.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: ba517e57d2b9d6f2593e3f25684b0af421fb0a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba517e57d2b9d6f2593e3f256… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:49:17 2007 +0100 winapi: Remove useless 'if (0)' statements. --- tools/winapi/c_parser.pm | 28 +++++++--------------------- tools/winapi/make_parser.pm | 12 +++--------- tools/winapi/winapi_fixup_statements.pm | 4 +--- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 4d750e9..270334f 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -604,9 +604,7 @@ sub parse_c_declaration($$$$$$$$$$$$) { # Variable my $type; - if(0) { - # Nothing - } elsif(s/^WINE_(?:DEFAULT|DECLARE)_DEBUG_CHANNEL\s*$\s*(\w+)\s*$\s*//s) { # FIXME: Wine specific kludge + if(s/^WINE_(?:DEFAULT|DECLARE)_DEBUG_CHANNEL\s*$\s*(\w+)\s*$\s*//s) { # FIXME: Wine specific kludge $self->_update_c_position($&, \$line, \$column); } elsif(s/^__ASM_GLOBAL_FUNC$\s*(\w+)\s*,\s*//s) { # FIXME: Wine specific kludge $self->_update_c_position($&, \$line, \$column); @@ -995,9 +993,7 @@ sub parse_c_file($$$$) { } - if (0) { - # Nothing - } elsif($preprocessor =~ /^\#\s*if/) { + if($preprocessor =~ /^\#\s*if/) { if($preprocessor =~ /^\#\s*if\s*0/) { $if0++; } elsif($if0 > 0) { @@ -1193,9 +1189,7 @@ sub parse_c_function($$$$$) { my $begin_line = $line; my $begin_column = $column + 1; - if(0) { - # Nothing - } elsif($self->_parse_c('__declspec\((?:dllexport|dllimport|naked)$|INTERNETAPI|RPCRTAPI', \$_, \$line, \$column)) { + if($self->_parse_c('__declspec$(?:dllexport|dllimport|naked)$|INTERNETAPI|RPCRTAPI', \$_, \$line, \$column)) { # Nothing } @@ -1215,9 +1209,7 @@ sub parse_c_function($$$$$) { } } - if(0) { - # Nothing - } elsif($self->_parse_c('DECL_GLOBAL_CONSTRUCTOR', \$_, \$line, \$column, \$name)) { # FIXME: Wine specific kludge + if($self->_parse_c('DECL_GLOBAL_CONSTRUCTOR', \$_, \$line, \$column, \$name)) { # FIXME: Wine specific kludge # Nothing } elsif($self->_parse_c('WINE_EXCEPTION_FILTER$\w+$', \$_, \$line, \$column, \$name)) { # FIXME: Wine specific kludge # Nothing @@ -1259,9 +1251,7 @@ sub parse_c_function($$$$$) { } - if (0) { - # Nothing - } elsif($self->_parse_c('__attribute__\s*$\s*\(\s*(?:constructor|destructor)\s*$\s*\)', \$_, \$line, \$column)) { + if($self->_parse_c('__attribute__\s*$\s*\(\s*(?:constructor|destructor)\s*$\s*\)', \$_, \$line, \$column)) { # Nothing } @@ -1383,9 +1373,7 @@ sub parse_c_preprocessor($$$$) { return 1; } - if(0) { - # Nothing - } elsif(/^\#\s*define\s*(.*?)$/s) { + if(/^\#\s*define\s*(.*?)$/s) { $self->_update_c_position($_, \$line, \$column); } elsif(/^\#\s*else/s) { $self->_update_c_position($_, \$line, \$column); @@ -1783,9 +1771,7 @@ sub parse_c_type($$$$$) { $self->_parse_c("(?:const|volatile)", \$_, \$line, \$column); - if(0) { - # Nothing - } elsif($self->_parse_c('ICOM_VTABLE$.*?$', \$_, \$line, \$column, \$type)) { + if($self->_parse_c('ICOM_VTABLE$.*?$', \$_, \$line, \$column, \$type)) { # Nothing } elsif($self->_parse_c('(?:enum\s+|interface\s+|struct\s+|union\s+)?(?:(?:MSVCRT|WS)$\s*\w+\s*$|\w+)\s*(\*\s*)*', \$_, \$line, \$column, \$type)) diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 6f7e6a4..885f77a 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -95,9 +95,7 @@ sub make_output($$) { $file = ""; $message = ""; - if(0) { - # Nothing - } elsif(/^\*\*\* \[(.*?)\] Error (\d+)$/) { + if(/^\*\*\* \[(.*?)\] Error (\d+)$/) { # Nothing } elsif(/^\*\*\* Error code (\d+)$/) { # Nothing @@ -294,9 +292,7 @@ sub gcc_output($$) { if(s/^warning:\s+//) { my $suppress = 0; - if(0) { - # Nothing - } elsif(/^((?:signed |unsigned )?(?:int|long)) format, (different type|\S+) arg $arg (\d+)$$/) { + if(/^((?:signed |unsigned )?(?:int|long)) format, (different type|\S+) arg $arg (\d+)$$/) { my $type = $2; if($type =~ /^(?: HACCEL|HACMDRIVER|HANDLE|HBITMAP|HBRUSH|HCALL|HCURSOR|HDC|HDRVR|HDESK|HDRAWDIB @@ -451,9 +447,7 @@ sub ld_output($$) { $file = shift; local $_ = shift; - if(0) { - # Nothing - } elsif(/^In function \`(.*?)\':$/) { + if(/^In function \`(.*?)\':$/) { $function = $1; } elsif(/^more undefined references to \`(.*?)\' follow$/) { # Nothing diff --git a/tools/winapi/winapi_fixup_statements.pm b/tools/winapi/winapi_fixup_statements.pm index 1b3c841..df1d811 100644 --- a/tools/winapi/winapi_fixup_statements.pm +++ b/tools/winapi/winapi_fixup_statements.pm @@ -114,9 +114,7 @@ sub fixup_user_message_2_windowsx($$) { $lparam =~ s/^$LPARAM$\s*//; my @arguments; - if(0) { - # Nothing - } elsif($msg =~ /^WM_COMMAND$/) { + if($msg =~ /^WM_COMMAND$/) { (my $id, my $code_notify) = _parse_makelong($wparam); my $hwndctl = $lparam; @arguments = ($id, $hwndctl, $code_notify);

1 0

Francois Gouget : winapi: Update and simplify file_skip() to match the current sources.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: 03bcef1d94641d8c7a55a6d137d1a1e99674a0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bcef1d94641d8c7a55a6d13… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:50:21 2007 +0100 winapi: Update and simplify file_skip() to match the current sources. --- tools/winapi/config.pm | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index b652e49..fd45dc7 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -108,11 +108,8 @@ sub file_skip($) { $_ = file_absolutize($_); - m%^(?:loader|libs|programs|server|tools)/% && return 1; - m%^dlls/wineps/data/% && return 1; - m%^dlls/winmm/wineoss/midipatch\.c$% && return 1; - m%spec\.c$% && return 1; - + m%^(?:dlls|include)/% || return 1; + m%^dlls/wineps\.drv/data/% && return 1; return 0; }

1 0

Francois Gouget : winapi_check: Fix handling of the 'longlong' arguments.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: 88619a80d8f83fa6f4a4d431a36a74b7ebbf9b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88619a80d8f83fa6f4a4d431a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:48:32 2007 +0100 winapi_check: Fix handling of the 'longlong' arguments. --- tools/winapi/winapi_local.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index f46d1ec..9cea587 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -187,7 +187,7 @@ sub _check_function($$$$$$) { ("double", "double"); } elsif(defined($kind) && $kind eq "longlong") { $n+=1; - "double"; + "longlong"; } else { $n++; $kind; @@ -230,7 +230,8 @@ sub _check_function($$$$$$) { $output->write("argument " . ($n + 1) . " type is forbidden: " . "$argument_types[$n] ($argument_kinds[$n])\n"); } - } elsif($argument_kinds[$n] ne $declared_argument_kinds[$n]) { + } elsif($argument_kinds[$n] ne $declared_argument_kinds[$n] && + !($argument_kinds[$n] eq "longlong" && $declared_argument_kinds[$n] eq "double")) { if($options->report_argument_kind($argument_kinds[$n]) || $options->report_argument_kind($declared_argument_kinds[$n])) {

1 0

Francois Gouget : winapi_check: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: f032dcbda2b314d84b8567d45e1958f4ba156861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f032dcbda2b314d84b8567d45… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:45:39 2007 +0100 winapi_check: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 1924f46..5726f02 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1270,6 +1270,7 @@ HENHMETAFILE HFONT HGDIOBJ HGLOBAL +HGLRC HMETAFILE HPALETTE HPEN @@ -1331,6 +1332,7 @@ LPDWORD LPENHMETAHEADER LPFONTSIGNATURE LPGLYPHMETRICS +LPGLYPHSET LPHANDLETABLE LPINT LPKERNINGPAIR @@ -2954,6 +2956,7 @@ RTL_USER_PROCESS_PARAMETERS * RTL_USER_PROCESS_PARAMETERS ** SECURITY_DESCRIPTOR * SIZE_T * +SLIST_HEADER * STRING * UINT * ULONG *

1 0

Francois Gouget : ole32: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: f5c6a71a654568cc0bc5814eea949ddee8a2ec29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c6a71a654568cc0bc5814ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:45:28 2007 +0100 ole32: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ole32/compobj.c | 2 +- include/objbase.h | 2 +- tools/winapi/win32.api | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f1c6ebe..110223a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3148,7 +3148,7 @@ static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) * MsgWaitForMultipleObjects, WaitForMultipleObjects. */ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, - ULONG cHandles, const HANDLE* pHandles, LPDWORD lpdwindex) + ULONG cHandles, LPHANDLE pHandles, LPDWORD lpdwindex) { HRESULT hr = S_OK; DWORD start_time = GetTickCount(); diff --git a/include/objbase.h b/include/objbase.h index f85fdcd..79603a0 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -416,7 +416,7 @@ typedef enum tagCOWAIT_FLAGS COWAIT_ALERTABLE = 0x00000002 } COWAIT_FLAGS; -HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHandles,const HANDLE* pHandles,LPDWORD lpdwindex); +HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHandles,LPHANDLE pHandles,LPDWORD lpdwindex); /***************************************************************************** * GUID API diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 0f6780a..1924f46 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3101,10 +3101,10 @@ LONG UINT ULONG int -unsigned long %ptr +BIND_OPTS * CLIPFORMAT * CLSID * COSERVERINFO * @@ -3117,8 +3117,11 @@ HBITMAP * HDC * HENHMETAFILE * HGLOBAL * +HMETAFILE * +HMETAFILEPICT * HPALETTE * HRESULT * +IChannelHook * ICreateErrorInfo ** IDataObject * IDataObject ** @@ -3146,6 +3149,7 @@ LPDWORD LPENUMFORMATETC * LPENUMOLEVERB * LPFORMATETC +LPHANDLE LPLOCKBYTES * LPMALLOC * LPMALLOCSPY @@ -3180,6 +3184,7 @@ PSECURITY_DESCRIPTOR REFCLSID REFGUID REFIID +RPC_AUTHZ_HANDLE * SNB SNB * SOLE_AUTHENTICATION_SERVICE * @@ -3188,7 +3193,6 @@ STGOPTIONS * ULONG * WORD * unsigned char * -unsigned long * void * void ** @@ -3206,6 +3210,7 @@ void BSTR OLECHAR * +LPCWSTR WCHAR * %%oleacc.dll

1 0

Francois Gouget : advapi32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: c4a4c5435c16702e33f2e46a9d260b110caa8751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a4c5435c16702e33f2e46a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 20 15:45:09 2007 +0100 advapi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5041168..0f6780a 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -60,6 +60,7 @@ TRUSTEE_FORM TRUSTEE_TYPE UINT ULONG +WELL_KNOWN_SID_TYPE WORD unsigned int @@ -151,6 +152,7 @@ PTRUSTEEA PTRUSTEEW PUCHAR PULONG +PUNICODE_STRING PVALENTA PVALENTW PVOID @@ -158,13 +160,13 @@ PVOID * SC_LOCK SECURITY_ATTRIBUTES * WMIDPREQUEST +struct ustring * unsigned char * %str LPCSTR LPSTR -PCHAR %void

1 0

Hans Leidekker : setupapi: Always return an empty list from SetupDiGetClassDevs.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: 7a039ebbf14b91c4db2b1868b4df6c5a873d4722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a039ebbf14b91c4db2b1868b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Feb 20 12:03:31 2007 +0100 setupapi: Always return an empty list from SetupDiGetClassDevs. --- dlls/setupapi/devinst.c | 32 ++++++-------------------------- 1 files changed, 6 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index fbf6ded..e2a2dfe 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -648,7 +648,7 @@ SetupDiCreateDeviceInfoListExA(const GUID *ClassGuid, * with this list. * hwndParent [I] hwnd needed for interface related actions. * MachineName [I] name of machine to create emtpy DeviceInfoSet list, if NULL - * local regestry will be used. + * local registry will be used. * Reserved [I] must be NULL * * RETURNS @@ -772,6 +772,7 @@ BOOL WINAPI SetupDiEnumDeviceInfo( if(info->cbSize < sizeof(*info)) return FALSE; + SetLastError(ERROR_NO_MORE_ITEMS); return FALSE; } @@ -1008,32 +1009,11 @@ HDEVINFO WINAPI SetupDiGetClassDevsW( HWND parent, DWORD flags) { - HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; + TRACE("%s %s %p 0x%08x\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags); - TRACE("%s %s %p 0x%08x\n", debugstr_guid(class), debugstr_w(enumstr), - parent, flags); - - if(flags & DIGCF_DEVICEINTERFACE) - { - if(!class) - SetLastError(ERROR_INVALID_PARAMETER); - else - { - /* WinXP always succeeds, returns empty list for unknown classes */ - FIXME(": returning empty list\n"); - ret = SetupDiCreateDeviceInfoList(class, parent); - } - } - else if (enumstr) - FIXME(": unimplemented for enumerator strings (%s)\n", - debugstr_w(enumstr)); - else if (flags & DIGCF_ALLCLASSES) - FIXME(": unimplemented for DIGCF_ALLCLASSES\n"); - else - { - FIXME("(%s): stub\n", debugstr_guid(class)); - } - return ret; + /* WinXP always succeeds, returns empty list for unknown classes */ + FIXME("returning empty list\n"); + return SetupDiCreateDeviceInfoList(class, parent); } /***********************************************************************

1 0

Hans Leidekker : setupapi: Implement SetupCopyOEMInf{A,W}.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: 939e8e4ce279a24b2bc2f716b5fcb66748677434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=939e8e4ce279a24b2bc2f716b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Feb 20 12:03:23 2007 +0100 setupapi: Implement SetupCopyOEMInf{A,W}. --- dlls/setupapi/misc.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 27 --------------- include/setupapi.h | 3 ++ 3 files changed, 92 insertions(+), 27 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index d7febe5..0e9dbd1 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -877,3 +877,92 @@ void WINAPI AssertFail(LPCSTR lpFile, UINT uLine, LPCSTR lpMessage) { FIXME("%s %u %s\n", lpFile, uLine, lpMessage); } + +/*********************************************************************** + * SetupCopyOEMInfA (SETUPAPI.@) + */ +BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, + DWORD media_type, DWORD style, PSTR dest, + DWORD buffer_size, PDWORD required_size, PSTR *component ) +{ + BOOL ret = FALSE; + WCHAR destW[MAX_PATH], *sourceW = NULL, *locationW = NULL; + INT size = sizeof(destW); + + TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_a(source), debugstr_a(location), + media_type, style, dest, buffer_size, required_size, component); + + if (source && !(sourceW = strdupAtoW( source ))) return FALSE; + if (location && !(locationW = strdupAtoW( location ))) goto done; + + if (!(ret = SetupCopyOEMInfW( sourceW, locationW, media_type, style, destW, size, NULL, NULL ))) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, destW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (dest) + { + if (buffer_size >= size) + { + WideCharToMultiByte( CP_ACP, 0, destW, -1, dest, buffer_size, NULL, NULL ); + if (component) *component = strrchr( dest, '\\' ) + 1; + } + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + +done: + HeapFree( GetProcessHeap(), 0, sourceW ); + HeapFree( GetProcessHeap(), 0, locationW ); + return ret; +} + +/*********************************************************************** + * SetupCopyOEMInfW (SETUPAPI.@) + */ +BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, + DWORD media_type, DWORD style, PWSTR dest, + DWORD buffer_size, PDWORD required_size, PWSTR *component ) +{ + BOOL ret = FALSE; + WCHAR target[MAX_PATH], *p; + static const WCHAR inf_oem[] = { '\\','i','n','f','\\','O','E','M',0 }; + DWORD size; + + TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location), + media_type, style, dest, buffer_size, required_size, component); + + if (!GetWindowsDirectoryW( target, sizeof(target)/sizeof(WCHAR) )) return FALSE; + + strcatW( target, inf_oem ); + p = strrchrW( source, '\\' ) + 1; + strcatW( target, p ); + + size = strlenW( target ) + 1; + if (dest) + { + if (buffer_size >= size) + { + /* FIXME: honour style flags */ + if ((ret = CopyFileW( source, target, FALSE ))) + { + if (style & SP_COPY_DELETESOURCE) DeleteFileW( source ); + strcpyW( dest, target ); + } + } + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } + } + + if (component) *component = p; + if (required_size) *required_size = size; + + return ret; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index dbde71c..ed6caa2 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -112,33 +112,6 @@ DWORD WINAPI CM_Get_Device_ID_ListA( return CR_SUCCESS; } - -/*********************************************************************** - * SetupCopyOEMInfA (SETUPAPI.@) - */ -BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc, - DWORD mediatype, DWORD copystyle, PSTR destinfname, - DWORD destnamesize, PDWORD required, - PSTR *destinfnamecomponent) -{ - FIXME("stub: source %s location %s ...\n", debugstr_a(sourceinffile), - debugstr_a(sourcemedialoc)); - return FALSE; -} - -/*********************************************************************** - * SetupCopyOEMInfW (SETUPAPI.@) - */ -BOOL WINAPI SetupCopyOEMInfW(PCWSTR sourceinffile, PCWSTR sourcemedialoc, - DWORD mediatype, DWORD copystyle, PWSTR destinfname, - DWORD destnamesize, PDWORD required, - PWSTR *destinfnamecomponent) -{ - FIXME("stub: source %s location %s ...\n", debugstr_w(sourceinffile), - debugstr_w(sourcemedialoc)); - return FALSE; -} - /*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ diff --git a/include/setupapi.h b/include/setupapi.h index 1815324..8c7aaf5 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -723,6 +723,9 @@ BOOL WINAPI SetupCommitFileQueueW( HWND, HSPFILEQ, PSP_FILE_CALLBACK_W, PVOI UINT WINAPI SetupCopyErrorA( HWND, PCSTR, PCSTR, PCSTR, PCSTR, PCSTR, UINT, DWORD, PSTR, DWORD, PDWORD ); UINT WINAPI SetupCopyErrorW( HWND, PCWSTR, PCWSTR, PCWSTR, PCWSTR, PCWSTR, UINT, DWORD, PWSTR, DWORD, PDWORD ); #define SetupCopyError WINELIB_NAME_AW(SetupCopyError) +BOOL WINAPI SetupCopyOEMInfA( PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR * ); +BOOL WINAPI SetupCopyOEMInfW( PCWSTR, PCWSTR, DWORD, DWORD, PWSTR, DWORD, PDWORD, PWSTR * ); +#define SetupCopyOEMInf WINELIB_NAME_AW(SetupCopyOEMInf) UINT WINAPI SetupDefaultQueueCallbackA( PVOID, UINT, UINT_PTR, UINT_PTR ); UINT WINAPI SetupDefaultQueueCallbackW( PVOID, UINT, UINT_PTR, UINT_PTR ); #define SetupDefaultQueueCallback WINELIB_NAME_AW(SetupDefaultQueueCallback)

1 0

Hans Leidekker : userenv: Implement ExpandEnvironmentStringsForUser{A, W}.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: 0e59ff25926da84fdef0e53bfbf1657b3827fefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e59ff25926da84fdef0e53bf… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Feb 20 15:34:49 2007 +0100 userenv: Implement ExpandEnvironmentStringsForUser{A,W}. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 6cd6437..8fbe776 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,5 +1,7 @@ @ stdcall CreateEnvironmentBlock(ptr ptr long) @ stub DestroyEnvironmentBlock +@ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) +@ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) @ stdcall GetProfilesDirectoryA(ptr ptr) @ stdcall GetProfilesDirectoryW(ptr ptr) @ stdcall GetProfileType(ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index a147199..0c65a4d 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -53,6 +53,30 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, return FALSE; } +BOOL WINAPI ExpandEnvironmentStringsForUserA( HANDLE hToken, LPCSTR lpSrc, + LPSTR lpDest, DWORD dwSize ) +{ + BOOL ret; + + TRACE("%p %s %p %d\n", hToken, debugstr_a(lpSrc), lpDest, dwSize); + + ret = ExpandEnvironmentStringsA( lpSrc, lpDest, dwSize ); + TRACE("<- %s\n", debugstr_a(lpDest)); + return ret; +} + +BOOL WINAPI ExpandEnvironmentStringsForUserW( HANDLE hToken, LPCWSTR lpSrc, + LPWSTR lpDest, DWORD dwSize ) +{ + BOOL ret; + + TRACE("%p %s %p %d\n", hToken, debugstr_w(lpSrc), lpDest, dwSize); + + ret = ExpandEnvironmentStringsW( lpSrc, lpDest, dwSize ); + TRACE("<- %s\n", debugstr_w(lpDest)); + return ret; +} + BOOL WINAPI GetUserProfileDirectoryA( HANDLE hToken, LPSTR lpProfileDir, LPDWORD lpcchSize ) {

1 0

Rob Shearman : oleaut32: Re-arrange the position of functions and vtables in olefont. c to avoid forward-declarations.
by Alexandre Julliard Feb. 20, 2007

Feb. 20, 2007

Module: wine Branch: master Commit: e79b8b8fcd3cc68f824cbfe507a007dbc5e5acb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79b8b8fcd3cc68f824cbfe50… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 19 21:47:02 2007 +0000 oleaut32: Re-arrange the position of functions and vtables in olefont.c to avoid forward-declarations. --- dlls/oleaut32/olefont.c | 438 ++++++++++++++++++----------------------------- 1 files changed, 169 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79b8b8fcd3cc68f824cb…

1 0