November 2013 - Wine-commits

Alexandre Julliard : makefiles: Add support for building from source files from a parent directory.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 517d274e3a259974fbf51275b5da8963262ffc73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517d274e3a259974fbf51275b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 12 11:03:09 2013 +0100 makefiles: Add support for building from source files from a parent directory. --- Make.rules.in | 4 ++-- tools/make_makefiles | 45 ++++++++++++++++++++++++++++++++++++++++++++- tools/makedep.c | 26 ++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index a853afe..ed2d8cf 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,7 +11,7 @@ # First some useful definitions -INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) +INCLUDES = -I$(srcdir) $(PARENTSRC:%=-I(a)srcdir@/%) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) DEFS = -D__WINESRC__ $(EXTRADEFS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) @@ -88,7 +88,7 @@ DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) depend: dummy - $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(EXTRAINCL) $(DEPEND_SRCS) + $(MAKEDEP) $(MAKEDEPFLAGS) -C$(srcdir) -S$(top_srcdir) -T$(top_builddir) $(PARENTSRC:%=-P%) $(EXTRAINCL) $(DEPEND_SRCS) .PHONY: depend diff --git a/tools/make_makefiles b/tools/make_makefiles index b61d403..72c2254 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -322,7 +322,7 @@ sub parse_makefile($) $make{"=rules"} = $makerules{$var} || $var; next; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|MANPAGE)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|MANPAGE|PARENTSRC)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -386,6 +386,38 @@ sub get_makedep_flags($) return %flags; } +sub get_parent_makefile($) +{ + my $file = shift; + my %make = %{$makefiles{$file}}; + my $reldir = $make{"PARENTSRC"} || ""; + return "" unless $reldir; + (my $path = $file) =~ s/\/Makefile$/\//; + while ($reldir =~ /^\.\.\//) + { + $reldir =~ s/^\.\.\///; + $path =~ s/[^\/]+\/$//; + } + return "$path$reldir/Makefile"; +} + +# preserve shared source files that are listed in the existing makefile +sub preserve_shared_source_files($$$) +{ + my ($make, $parent, $var) = @_; + my %srcs; + + return unless defined ${$parent}{"=$var"}; + foreach my $file (@{${$parent}{"=$var"}}) { $srcs{$file} = 1; } + foreach my $file (@{${$make}{"=$var"}}) { $srcs{$file} = 0; } + + foreach my $file (@{${$make}{$var}}) + { + next unless defined $srcs{$file} && $srcs{$file} == 1; + push @{${$make}{"=$var"}}, $file; + } +} + # assign source files to their respective makefile sub assign_sources_to_makefiles(@) { @@ -474,6 +506,17 @@ sub assign_sources_to_makefiles(@) unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; + + # preserve shared source files from the parent makefile + foreach my $file (@makefiles) + { + my %make = %{$makefiles{$file}}; + my $parent = get_parent_makefile( $file ); + next unless $parent; + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); + } } ################################################################ diff --git a/tools/makedep.c b/tools/makedep.c index 945ba26..3b441be 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -107,6 +107,7 @@ struct strarray static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; +static const char *parent_dir; static const char *OutputFileName = "Makefile"; static const char *Separator = "### Dependencies"; static const char *input_file_name; @@ -121,6 +122,7 @@ static const char Usage[] = " -Cdir Search for source files in directory 'dir'\n" " -Sdir Set the top source directory\n" " -Tdir Set the top object directory\n" + " -Pdir Set the parent source directory\n" " -R from to Compute the relative path between two directories\n" " -fxxx Store output in file 'xxx' (default: Makefile)\n" " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; @@ -536,6 +538,16 @@ static FILE *open_src_file( struct incl_file *pFile ) pFile->filename = strmake( "%s/%s", src_dir, pFile->name ); file = fopen( pFile->filename, "r" ); } + /* now try parent dir */ + if (!file && parent_dir) + { + if (src_dir) + pFile->filename = strmake( "%s/%s/%s", src_dir, parent_dir, pFile->name ); + else + pFile->filename = strmake( "%s/%s", parent_dir, pFile->name ); + if ((file = fopen( pFile->filename, "r" ))) return file; + file = fopen( pFile->filename, "r" ); + } if (!file) fatal_perror( "open %s", pFile->name ); return file; } @@ -601,6 +613,17 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } + /* now try in parent source dir */ + if (parent_dir) + { + if (src_dir) + filename = strmake( "%s/%s/%s", src_dir, parent_dir, pFile->name ); + else + filename = strmake( "%s/%s", parent_dir, pFile->name ); + if ((file = fopen( filename, "r" ))) goto found; + free( filename ); + } + /* check for corresponding idl file in global includes */ if (strendswith( pFile->name, ".h" )) @@ -1410,6 +1433,9 @@ static void parse_option( const char *opt ) case 'T': top_obj_dir = opt + 2; break; + case 'P': + parent_dir = opt + 2; + break; case 'f': if (opt[2]) OutputFileName = opt + 2; break;

1 0

Alexandre Julliard : msvcp80: Share the implementation with msvcp90.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 4c4a654552aed4ba64b6291c3620ef4e6fdc62e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a654552aed4ba64b6291c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 12 13:56:07 2013 +0100 msvcp80: Share the implementation with msvcp90. --- dlls/msvcp80/Makefile.in | 4 +- dlls/msvcp80/cxx.h | 447 - dlls/msvcp80/exception.c | 563 -- dlls/msvcp80/ios.c |13327 ------------------------- dlls/msvcp80/locale.c | 9621 ------------------ dlls/msvcp80/math.c | 2169 ---- dlls/msvcp80/memory.c | 338 - dlls/msvcp80/misc.c | 231 - dlls/msvcp80/msvcp.h | 483 - dlls/msvcp80/msvcp80.spec | 48 +- dlls/msvcp80/msvcp80_main.c | 124 - dlls/msvcp80/string.c | 4456 --------- dlls/msvcp90/Makefile.in | 3 +- dlls/msvcp90/locale.c | 148 + dlls/msvcp90/{msvcp90_main.c => msvcp_main.c} | 0 dlls/msvcp90/string.c | 34 +- 16 files changed, 209 insertions(+), 31787 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c4a654552aed4ba64b62…

1 0

Frédéric Delanoy : mscms: Use BOOL type where appropriate.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 685b931c2a11219da3949cd1ad5a1fa9d7db26cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=685b931c2a11219da3949cd1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:38 2013 +0100 mscms: Use BOOL type where appropriate. --- dlls/mscms/transform.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 1bd4e02..aed7011 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -58,7 +58,7 @@ static DWORD from_profile( HPROFILE profile ) static DWORD from_bmformat( BMFORMAT format ) { - static int quietfixme = 0; + static BOOL quietfixme = FALSE; TRACE( "bitmap format: 0x%08x\n", format ); switch (format) @@ -69,10 +69,10 @@ static DWORD from_bmformat( BMFORMAT format ) case BM_xRGBQUADS: return TYPE_ARGB_8; case BM_xBGRQUADS: return TYPE_ABGR_8; default: - if (quietfixme == 0) + if (!quietfixme) { FIXME("unhandled bitmap format 0x%x\n", format); - quietfixme = 1; + quietfixme = TRUE; } return TYPE_RGB_8; }

1 0

Frédéric Delanoy : shell32: Use BOOL type where appropriate.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: b6f934fe337fe5567203080e2687307f1db184e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f934fe337fe5567203080e2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 01:16:39 2013 +0100 shell32: Use BOOL type where appropriate. --- dlls/shell32/shfldr_desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index c4072b7..2910106 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -615,7 +615,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, { if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) { - int bWantsForParsing; + BOOL bWantsForParsing; /* * We can only get a filesystem path from a shellfolder if the

1 0

Qian Hong : wscript: Get extension name by strrchrW instead of strchrW.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: fa9fec618d647e22da3e33b7ad8c7b7053d73fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9fec618d647e22da3e33b7a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Nov 12 16:19:59 2013 +0800 wscript: Get extension name by strrchrW instead of strchrW. --- programs/wscript/main.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3d97bde..cebabed 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -361,7 +361,7 @@ static BOOL set_host_properties(const WCHAR *prop) int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { - const WCHAR *ext, *filename = NULL; + WCHAR *ext, *filepart, *filename = NULL; IActiveScriptParse *parser; IActiveScript *script; WCHAR **argv; @@ -391,14 +391,12 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm WINE_FIXME("No file name specified\n"); return 1; } - res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, NULL); + res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) return 1; - ext = strchrW(filename, '.'); - if(!ext) - ext = filename; - if(!get_engine_clsid(ext, &clsid)) { + ext = strrchrW(filepart, '.'); + if(!ext || !get_engine_clsid(ext, &clsid)) { WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); return 1; }

1 0

Hans Leidekker : netapi32: Move NetBios functions to netbios.c.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: fe3669e823d2e815733d51da271954c6da5649d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3669e823d2e815733d51da2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 09:59:03 2013 +0100 netapi32: Move NetBios functions to netbios.c. --- dlls/netapi32/netapi32.c | 47 +--------------------------------------------- dlls/netapi32/netbios.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index a5f1c03..6d3e913 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -23,7 +23,7 @@ #include "lmat.h" #include "netbios.h" -WINE_DEFAULT_DEBUG_CHANNEL(netbios); +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); @@ -179,51 +179,6 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, return NERR_InternalError; } -DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc) -{ - DWORD ret; - - switch (nrc) - { - case NRC_GOODRET: - ret = NO_ERROR; - break; - case NRC_NORES: - ret = NERR_NoNetworkResource; - break; - case NRC_DUPNAME: - ret = NERR_AlreadyExists; - break; - case NRC_NAMTFUL: - ret = NERR_TooManyNames; - break; - case NRC_ACTSES: - ret = NERR_DeleteLater; - break; - case NRC_REMTFUL: - ret = ERROR_REM_NOT_LIST; - break; - case NRC_NOCALL: - ret = NERR_NameNotFound; - break; - case NRC_NOWILD: - ret = ERROR_INVALID_PARAMETER; - break; - case NRC_INUSE: - ret = NERR_DuplicateName; - break; - case NRC_NAMERR: - ret = ERROR_INVALID_PARAMETER; - break; - case NRC_NAMCONF: - ret = NERR_DuplicateName; - break; - default: - ret = NERR_NetworkError; - } - return ret; -} - NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index 94f0ae6..e16c5dc 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -858,3 +858,48 @@ UCHAR WINAPI Netbios(PNCB ncb) TRACE("returning 0x%02x\n", ret); return ret; } + +DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc) +{ + DWORD ret; + + switch (nrc) + { + case NRC_GOODRET: + ret = NO_ERROR; + break; + case NRC_NORES: + ret = NERR_NoNetworkResource; + break; + case NRC_DUPNAME: + ret = NERR_AlreadyExists; + break; + case NRC_NAMTFUL: + ret = NERR_TooManyNames; + break; + case NRC_ACTSES: + ret = NERR_DeleteLater; + break; + case NRC_REMTFUL: + ret = ERROR_REM_NOT_LIST; + break; + case NRC_NOCALL: + ret = NERR_NameNotFound; + break; + case NRC_NOWILD: + ret = ERROR_INVALID_PARAMETER; + break; + case NRC_INUSE: + ret = NERR_DuplicateName; + break; + case NRC_NAMERR: + ret = ERROR_INVALID_PARAMETER; + break; + case NRC_NAMCONF: + ret = NERR_DuplicateName; + break; + default: + ret = NERR_NetworkError; + } + return ret; +}

1 0

Hans Leidekker : netapi32: Merge apibuf.c into netapi32.c.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: a746b826f42754684e3ed2556fc89e1ca38308dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a746b826f42754684e3ed2556… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 09:59:42 2013 +0100 netapi32: Merge apibuf.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/apibuf.c | 99 --------------------------------------------- dlls/netapi32/netapi32.c | 69 +++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 100 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index fd4e531..1b6b33c 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -5,7 +5,6 @@ IMPORTS = iphlpapi ws2_32 advapi32 C_SRCS = \ access.c \ - apibuf.c \ browsr.c \ ds.c \ local_group.c \ diff --git a/dlls/netapi32/apibuf.c b/dlls/netapi32/apibuf.c deleted file mode 100644 index a88c6f4..0000000 --- a/dlls/netapi32/apibuf.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright 2002 Andriy Palamarchuk - * - * Net API buffer calls - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "lmcons.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "winerror.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); - -/************************************************************ - * NetApiBufferAllocate (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) -{ - TRACE("(%d, %p)\n", ByteCount, Buffer); - - if (Buffer == NULL) return ERROR_INVALID_PARAMETER; - *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); - if (*Buffer) - return NERR_Success; - else - return GetLastError(); -} - -/************************************************************ - * NetApiBufferFree (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) -{ - TRACE("(%p)\n", Buffer); - HeapFree(GetProcessHeap(), 0, Buffer); - return NERR_Success; -} - -/************************************************************ - * NetApiBufferReallocate (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, - LPVOID* NewBuffer) -{ - TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); - if (NewByteCount) - { - if (OldBuffer) - *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); - else - *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); - return *NewBuffer ? NERR_Success : GetLastError(); - } - else - { - if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); - *NewBuffer = 0; - return NERR_Success; - } -} - -/************************************************************ - * NetApiBufferSize (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount) -{ - DWORD dw; - - TRACE("(%p, %p)\n", Buffer, ByteCount); - if (Buffer == NULL) - return ERROR_INVALID_PARAMETER; - dw = HeapSize(GetProcessHeap(), 0, Buffer); - TRACE("size: %d\n", dw); - if (dw != 0xFFFFFFFF) - *ByteCount = dw; - else - *ByteCount = 0; - - return NERR_Success; -} diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 6d3e913..6aa1e39 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1,4 +1,5 @@ /* Copyright 2001 Mike McCormack + * Copyright 2002 Andriy Palamarchuk * Copyright 2003 Juan Lang * * This library is free software; you can redistribute it and/or @@ -208,3 +209,71 @@ NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYT return ERROR_NOT_SUPPORTED; } + +/************************************************************ + * NetApiBufferAllocate (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) +{ + TRACE("(%d, %p)\n", ByteCount, Buffer); + + if (Buffer == NULL) return ERROR_INVALID_PARAMETER; + *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); + if (*Buffer) + return NERR_Success; + else + return GetLastError(); +} + +/************************************************************ + * NetApiBufferFree (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) +{ + TRACE("(%p)\n", Buffer); + HeapFree(GetProcessHeap(), 0, Buffer); + return NERR_Success; +} + +/************************************************************ + * NetApiBufferReallocate (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, + LPVOID* NewBuffer) +{ + TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); + if (NewByteCount) + { + if (OldBuffer) + *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); + else + *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); + return *NewBuffer ? NERR_Success : GetLastError(); + } + else + { + if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); + *NewBuffer = 0; + return NERR_Success; + } +} + +/************************************************************ + * NetApiBufferSize (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount) +{ + DWORD dw; + + TRACE("(%p, %p)\n", Buffer, ByteCount); + if (Buffer == NULL) + return ERROR_INVALID_PARAMETER; + dw = HeapSize(GetProcessHeap(), 0, Buffer); + TRACE("size: %d\n", dw); + if (dw != 0xFFFFFFFF) + *ByteCount = dw; + else + *ByteCount = 0; + + return NERR_Success; +}

1 0

André Hentschel : include: Add more vfw error codes.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: e218462fd996a27aef6c1ac7fde03f2c33d44752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e218462fd996a27aef6c1ac7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 11 22:23:25 2013 +0100 include: Add more vfw error codes. --- include/vfwmsgs.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/vfwmsgs.h b/include/vfwmsgs.h index 660ee40..be5ff84 100644 --- a/include/vfwmsgs.h +++ b/include/vfwmsgs.h @@ -155,8 +155,18 @@ #define VFW_E_VMR_NOT_IN_MIXER_MODE ((HRESULT)0x80040296) #define VFW_E_VMR_NO_AP_SUPPLIED ((HRESULT)0x80040297) #define VFW_E_VMR_NO_DEINTERLACE_HW ((HRESULT)0x80040298) +#define VFW_E_VMR_NO_PROCAMP_HW ((HRESULT)0x80040299) #define VFW_E_DVD_VMR9_INCOMPATIBLEDEC ((HRESULT)0x8004029A) #define VFW_E_NO_COPP_HW ((HRESULT)0x8004029B) +#define VFW_E_DVD_NONBLOCKING ((HRESULT)0x8004029C) +#define VFW_E_DVD_TOO_MANY_RENDERERS_IN_FILTER_GRAPH ((HRESULT)0x8004029D) +#define VFW_E_DVD_NON_EVR_RENDERER_IN_FILTER_GRAPH ((HRESULT)0x8004029E) +#define VFW_E_DVD_RESOLUTION_ERROR ((HRESULT)0x8004029F) +#define VFW_E_CODECAPI_LINEAR_RANGE ((HRESULT)0x80040310) +#define VFW_E_CODECAPI_ENUMERATED ((HRESULT)0x80040311) +#define VFW_E_CODECAPI_NO_DEFAULT ((HRESULT)0x80040313) +#define VFW_E_CODECAPI_NO_CURRENT_VALUE ((HRESULT)0x80040314) +#define VFW_E_DVD_CHAPTER_DOES_NOT_EXIST ((HRESULT)0x80040315) #define VFW_E_BAD_KEY ((HRESULT)0x800403F2) #ifndef E_PROP_ID_UNSUPPORTED

1 0

André Hentschel : kernel32/tests: Improved tests for the ResolveDelayLoadedAPI callback.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: c6f70ca8535cdf77e5fa9d3284d1ec9450af3f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f70ca8535cdf77e5fa9d328… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 11 23:17:55 2013 +0100 kernel32/tests: Improved tests for the ResolveDelayLoadedAPI callback. --- dlls/kernel32/tests/loader.c | 54 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 02853fd..ab99e52 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2191,8 +2191,55 @@ if (0) static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) { + ok(ul == 4, "expected 4, got %u\n", ul); + ok(!!pd, "no delayload info supplied\n"); + if (pd) + { + ok(pd->Size == sizeof(*pd), "got %u\n", pd->Size); + ok(!!pd->DelayloadDescriptor, "no DelayloadDescriptor supplied\n"); + if (pd->DelayloadDescriptor) + { + ok(pd->DelayloadDescriptor->Attributes.AllAttributes == 1, + "expected 1, got %u\n", pd->DelayloadDescriptor->Attributes.AllAttributes); + ok(pd->DelayloadDescriptor->DllNameRVA == 0x2000, + "expected 0x2000, got %x\n", pd->DelayloadDescriptor->DllNameRVA); + ok(pd->DelayloadDescriptor->ModuleHandleRVA == 0x201a, + "expected 0x201a, got %x\n", pd->DelayloadDescriptor->ModuleHandleRVA); + ok(pd->DelayloadDescriptor->ImportAddressTableRVA > pd->DelayloadDescriptor->ModuleHandleRVA, + "expected %x > %x\n", pd->DelayloadDescriptor->ImportAddressTableRVA, + pd->DelayloadDescriptor->ModuleHandleRVA); + ok(pd->DelayloadDescriptor->ImportNameTableRVA > pd->DelayloadDescriptor->ImportAddressTableRVA, + "expected %x > %x\n", pd->DelayloadDescriptor->ImportNameTableRVA, + pd->DelayloadDescriptor->ImportAddressTableRVA); + ok(pd->DelayloadDescriptor->BoundImportAddressTableRVA == 0, + "expected 0, got %x\n", pd->DelayloadDescriptor->BoundImportAddressTableRVA); + ok(pd->DelayloadDescriptor->UnloadInformationTableRVA == 0, + "expected 0, got %x\n", pd->DelayloadDescriptor->UnloadInformationTableRVA); + ok(pd->DelayloadDescriptor->TimeDateStamp == 0, + "expected 0, got %x\n", pd->DelayloadDescriptor->TimeDateStamp); + } + + ok(!!pd->ThunkAddress, "no ThunkAddress supplied\n"); + if (pd->ThunkAddress) + ok(pd->ThunkAddress->u1.Ordinal == 0, "expected 0, got %x\n", (UINT)pd->ThunkAddress->u1.Ordinal); + + ok(!!pd->TargetDllName, "no TargetDllName supplied\n"); + if (pd->TargetDllName) + ok(!strcmp(pd->TargetDllName, "secur32.dll"), + "expected \"secur32.dll\", got \"%s\"\n", pd->TargetDllName); + + ok(pd->TargetApiDescriptor.ImportDescribedByName == 0, + "expected 0, got %x\n", pd->TargetApiDescriptor.ImportDescribedByName); + ok(pd->TargetApiDescriptor.Description.Ordinal == 0 || + pd->TargetApiDescriptor.Description.Ordinal == 999, + "expected 0, got %x\n", pd->TargetApiDescriptor.Description.Ordinal); + + ok(!!pd->TargetModuleBase, "no TargetModuleBase supplied\n"); + ok(pd->Unused == NULL, "expected NULL, got %p\n", pd->Unused); + ok(pd->LastError, "no LastError supplied\n"); + } cb_count++; - return NULL; + return (void*)0xdeadbeef; } static void test_ResolveDelayLoadedAPI(void) @@ -2228,6 +2275,9 @@ static void test_ResolveDelayLoadedAPI(void) { FALSE, IMAGE_ORDINAL_FLAG | 0, FALSE }, + { + FALSE, IMAGE_ORDINAL_FLAG | 999, FALSE + }, }; if (!pResolveDelayLoadedAPI) @@ -2433,7 +2483,7 @@ static void test_ResolveDelayLoadedAPI(void) } else { - ok(ret == NULL, "Test %u: ResolveDelayLoadedAPI succeeded\n", i); + ok(ret == (void*)0xdeadbeef, "Test %u: ResolveDelayLoadedAPI succeeded with %p\n", i, ret); ok(cb_count, "Test %u: Wrong callback count: %d\n", i, cb_count); } }

1 0

André Hentschel : ntdll: Implement LdrResolveDelayLoadedAPI.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: b6b9050d58d8baaea843c633f5968be9090214e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b9050d58d8baaea843c633f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 11 23:20:41 2013 +0100 ntdll: Implement LdrResolveDelayLoadedAPI. --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/loader.c | 65 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + 3 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 08b225f..7779a75 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1030,6 +1030,7 @@ @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) @ stdcall ResetWriteWatch(ptr long) +@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) ntdll.LdrResolveDelayLoadedAPI @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0455df4..a4552bb 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -36,6 +36,7 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" +#include "delayloadhandler.h" #include "wine/exception.h" #include "wine/library.h" @@ -2383,6 +2384,70 @@ BOOLEAN WINAPI RtlDllShutdownInProgress(void) return process_detaching; } +/**************************************************************************** + * LdrResolveDelayLoadedAPI (NTDLL.@) + */ +void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, void* syshook, + IMAGE_THUNK_DATA* addr, ULONG flags ) +{ + IMAGE_THUNK_DATA *pIAT, *pINT; + DELAYLOAD_INFO delayinfo; + UNICODE_STRING mod; + const CHAR* name; + HMODULE *phmod; + NTSTATUS nts; + FARPROC fp; + DWORD id; + + FIXME("(%p, %p, %p, %p, %p, 0x%08x), partial stub\n", base, desc, dllhook, syshook, addr, flags); + + phmod = get_rva(base, desc->ModuleHandleRVA); + pIAT = get_rva(base, desc->ImportAddressTableRVA); + pINT = get_rva(base, desc->ImportNameTableRVA); + name = get_rva(base, desc->DllNameRVA); + id = addr - pIAT; + + if (!*phmod) + { + if (!RtlCreateUnicodeStringFromAsciiz(&mod, name)) + { + nts = STATUS_NO_MEMORY; + goto fail; + } + nts = LdrLoadDll(NULL, 0, &mod, phmod); + RtlFreeUnicodeString(&mod); + if (nts) goto fail; + } + + if (IMAGE_SNAP_BY_ORDINAL(pINT[id].u1.Ordinal)) + nts = LdrGetProcedureAddress(*phmod, NULL, LOWORD(pINT[id].u1.Ordinal), (void**)&fp); + else + { + const IMAGE_IMPORT_BY_NAME* iibn = get_rva(base, pINT[id].u1.AddressOfData); + ANSI_STRING fnc; + + RtlInitAnsiString(&fnc, (char*)iibn->Name); + nts = LdrGetProcedureAddress(*phmod, &fnc, 0, (void**)&fp); + } + if (!nts) + { + pIAT[id].u1.Function = (ULONG_PTR)fp; + return fp; + } + +fail: + delayinfo.Size = sizeof(delayinfo); + delayinfo.DelayloadDescriptor = desc; + delayinfo.ThunkAddress = addr; + delayinfo.TargetDllName = name; + delayinfo.TargetApiDescriptor.ImportDescribedByName = !IMAGE_SNAP_BY_ORDINAL(pINT[id].u1.Ordinal); + delayinfo.TargetApiDescriptor.Description.Ordinal = LOWORD(pINT[id].u1.Ordinal); + delayinfo.TargetModuleBase = *phmod; + delayinfo.Unused = NULL; + delayinfo.LastError = nts; + return dllhook(4, &delayinfo); +} /****************************************************************** * LdrShutdownProcess (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 860b4c6..70bf94f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -75,6 +75,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber @ stdcall LdrShutdownProcess()

1 0