wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Dmitry Timoshkov : gdiplus: Determine type of the path at the time the region data are written instead of the path creation time .
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: b0da54221047ffdb94d51d53b01682eec7a23731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0da54221047ffdb94d51d53b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 12 18:16:15 2013 +0900 gdiplus: Determine type of the path at the time the region data are written instead of the path creation time. --- dlls/gdiplus/region.c | 121 +++++++++++++++++++++++++------------------ dlls/gdiplus/tests/region.c | 13 ----- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4cd9636..4f16f62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -87,6 +87,22 @@ typedef struct packed_point short Y; } packed_point; +/* Test to see if the path could be stored as an array of shorts */ +static BOOL is_integer_path(const GpPath *path) +{ + int i; + + if (!path->pathdata.Count) return FALSE; + + for (i = 0; i < path->pathdata.Count; i++) + { + if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || + path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) + return FALSE; + } + return TRUE; +} + /* Everything is measured in DWORDS; round up if there's a remainder */ static inline INT get_pathtypes_size(const GpPath* path) { @@ -106,9 +122,20 @@ static inline INT get_element_size(const region_element* element) case RegionDataRect: return needed + sizeof(GpRect); case RegionDataPath: - needed += element->elementdata.pathdata.pathheader.size; - needed += sizeof(DWORD); /* Extra DWORD for pathheader.size */ - return needed; + { + const GpPath *path = element->elementdata.pathdata.path; + DWORD flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; + /* 3 for headers, once again size doesn't count itself */ + needed += sizeof(DWORD) * 3; + if (flags & FLAGS_INTPATH) + needed += 2 * sizeof(SHORT) * path->pathdata.Count; + else + needed += 2 * sizeof(FLOAT) * path->pathdata.Count; + + needed += get_pathtypes_size(path); + needed += sizeof(DWORD); /* Extra DWORD for pathheader.size */ + return needed; + } case RegionDataEmptyRect: case RegionDataInfiniteRect: return needed; @@ -128,7 +155,7 @@ static inline GpStatus init_region(GpRegion* region, const RegionType type) region->header.checksum = 0xdeadbeef; region->header.magic = VERSION_MAGIC; region->header.num_children = 0; - region->header.size = sizeheader_size + get_element_size(&region->node); + region->header.size = 0; return Ok; } @@ -426,8 +453,6 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) { region_element* element; GpStatus stat; - DWORD flags; - INT count, i; TRACE("%p, %p\n", path, region); @@ -444,20 +469,6 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) return stat; } element = &(*region)->node; - count = path->pathdata.Count; - - flags = count ? FLAGS_INTPATH : FLAGS_NOFLAGS; - - /* Test to see if the path is an Integer path */ - for (i = 0; i < count; i++) - { - if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || - path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) - { - flags = FLAGS_NOFLAGS; - break; - } - } stat = GdipClonePath(path, &element->elementdata.pathdata.path); if (stat != Ok) @@ -466,29 +477,6 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) return stat; } - /* 3 for headers, once again size doesn't count itself */ - element->elementdata.pathdata.pathheader.size = ((sizeof(DWORD) * 3)); - switch(flags) - { - /* Floats, sent out as floats */ - case FLAGS_NOFLAGS: - element->elementdata.pathdata.pathheader.size += - (sizeof(DWORD) * count * 2); - break; - /* INTs, sent out as packed shorts */ - case FLAGS_INTPATH: - element->elementdata.pathdata.pathheader.size += - (sizeof(DWORD) * count); - break; - default: - FIXME("Unhandled flags (%08x). Expect wrong results.\n", flags); - } - element->elementdata.pathdata.pathheader.size += get_pathtypes_size(path); - element->elementdata.pathdata.pathheader.magic = VERSION_MAGIC; - element->elementdata.pathdata.pathheader.count = count; - element->elementdata.pathdata.pathheader.flags = flags; - (*region)->header.size = sizeheader_size + get_element_size(element); - return Ok; } @@ -754,11 +742,30 @@ static void write_element(const region_element* element, DWORD *buffer, { INT i; const GpPath* path = element->elementdata.pathdata.path; + struct _pathheader + { + DWORD size; + DWORD magic; + DWORD count; + DWORD flags; + } *pathheader; + + pathheader = (struct _pathheader *)(buffer + *filled); + + pathheader->flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; + /* 3 for headers, once again size doesn't count itself */ + pathheader->size = sizeof(DWORD) * 3; + if (pathheader->flags & FLAGS_INTPATH) + pathheader->size += 2 * sizeof(SHORT) * path->pathdata.Count; + else + pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; + pathheader->size += get_pathtypes_size(path); + pathheader->magic = VERSION_MAGIC; + pathheader->count = path->pathdata.Count; + + *filled += 4; - memcpy(buffer + *filled, &element->elementdata.pathdata.pathheader, - sizeof(element->elementdata.pathdata.pathheader)); - *filled += sizeof(element->elementdata.pathdata.pathheader) / sizeof(DWORD); - switch (element->elementdata.pathdata.pathheader.flags) + switch (pathheader->flags & FLAGS_INTPATH) { case FLAGS_NOFLAGS: for (i = 0; i < path->pathdata.Count; i++) @@ -773,6 +780,7 @@ static void write_element(const region_element* element, DWORD *buffer, write_packed_point(buffer, filled, &path->pathdata.Points[i]); } + break; } write_path_types(buffer, filled, path); break; @@ -819,6 +827,13 @@ static void write_element(const region_element* element, DWORD *buffer, GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { + struct _region_header + { + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; + } *region_header; INT filled = 0; TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); @@ -826,8 +841,12 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, if (!(region && buffer && size)) return InvalidParameter; - memcpy(buffer, &region->header, sizeof(region->header)); - filled += sizeof(region->header) / sizeof(DWORD); + region_header = (struct _region_header *)buffer; + region_header->size = sizeheader_size + get_element_size(&region->node); + region_header->checksum = 0; + region_header->magic = VERSION_MAGIC; + region_header->num_children = region->header.num_children; + filled += 4; /* With few exceptions, everything written is DWORD aligned, * so use that as our base */ write_element(&region->node, (DWORD*)buffer, &filled); @@ -849,7 +868,7 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) return InvalidParameter; /* header.size doesn't count header.size and header.checksum */ - *needed = region->header.size + sizeof(DWORD) * 2; + *needed = sizeof(DWORD) * 2 + sizeheader_size + get_element_size(&region->node); return Ok; } diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index f509204..23c7a07 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -427,37 +427,24 @@ static void test_getregiondata(void) needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); -todo_wine expect(72, needed); -todo_wine expect_dword(buf, 64); expect_magic(buf + 2); expect_dword(buf + 3 , 0); expect_dword(buf + 4 , RGNDATA_PATH); -todo_wine expect_dword(buf + 5, 48); expect_magic(buf + 6); expect_dword(buf + 7, 4); /* flags 0 means that a path is an array of FLOATs */ -todo_wine expect_dword(buf + 8, 0); -todo_wine expect_float(buf + 9, 5.6); -todo_wine expect_float(buf + 10, 6.8); -todo_wine expect_float(buf + 11, 7.6); -todo_wine expect_float(buf + 12, 8.8); -todo_wine expect_float(buf + 13, 8.6); -todo_wine expect_float(buf + 14, 1.8); -todo_wine expect_float(buf + 15, 5.6); -todo_wine expect_float(buf + 16, 6.8); -todo_wine expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ status = GdipDeletePath(path);

1 0

Alexandre Julliard : msvcp71: Share part of the implementation with msvcp90 .
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 949a8afdaf394a588209c3ee7692630c90b32e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949a8afdaf394a588209c3ee7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 12 12:51:51 2013 +0100 msvcp71: Share part of the implementation with msvcp90. --- dlls/msvcp71/Makefile.in | 4 +- dlls/msvcp71/cxx.h | 446 ---------- dlls/msvcp71/exception.c | 563 ------------ dlls/msvcp71/math.c | 2169 ---------------------------------------------- dlls/msvcp71/memory.c | 102 --- dlls/msvcp71/misc.c | 190 ---- dlls/msvcp71/msvcp71.c | 105 --- 7 files changed, 3 insertions(+), 3576 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=949a8afdaf394a588209c…

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

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@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

Hans Leidekker : netapi32: Add support for remote computers in NetServerGetInfo.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: eaef76f041d529b5fb8cfe98b68c36baeab453cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaef76f041d529b5fb8cfe98b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:04:51 2013 +0100 netapi32: Add support for remote computers in NetServerGetInfo. --- configure | 68 +++++++++++++++++ configure.ac | 7 ++ dlls/netapi32/netapi32.c | 184 ++++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 3 + 4 files changed, 247 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaef76f041d529b5fb8cf…

1 0

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

12 Nov '13

Module: wine Branch: master Commit: edbf3ac0eedec4066ec1d102021581d31ec1faf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbf3ac0eedec4066ec1d1020… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:03:15 2013 +0100 netapi32: Merge local_group.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/local_group.c | 251 ------------------------------------------- dlls/netapi32/netapi32.c | 215 ++++++++++++++++++++++++++++++++++++ 3 files changed, 215 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edbf3ac0eedec4066ec1d…

1 0

Hans Leidekker : netapi32: Perform a case-insensitive string comparison in NETAPI_IsLocalComputer.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 65d12829b61227df3f4b26dff04ee00c41bd1f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d12829b61227df3f4b26dff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:03:54 2013 +0100 netapi32: Perform a case-insensitive string comparison in NETAPI_IsLocalComputer. --- dlls/netapi32/netapi32.c | 49 ++++++++++++++++----------------------------- 1 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 57bc58b..313d1ac 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -50,10 +50,27 @@ #include "dsgetdc.h" #include "wine/debug.h" #include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); +/************************************************************ + * NETAPI_IsLocalComputer + * + * Checks whether the server name indicates local machine. + */ +static BOOL NETAPI_IsLocalComputer( LMCSTR name ) +{ + WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD size = sizeof(buf) / sizeof(buf[0]); + BOOL ret; + + if (!name || !name[0]) return TRUE; + + ret = GetComputerNameW( buf, &size ); + if (ret && name[0] == '\\' && name[1] == '\\') name += 2; + return ret && !strcmpiW( name, buf ); +} BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -411,36 +428,6 @@ NET_API_STATUS WINAPI NetFileEnum( return ERROR_NOT_SUPPORTED; } -/************************************************************ - * NETAPI_IsLocalComputer - * - * Checks whether the server name indicates local machine. - */ -DECLSPEC_HIDDEN BOOL NETAPI_IsLocalComputer(LMCSTR ServerName) -{ - if (!ServerName) - { - return TRUE; - } - else if (ServerName[0] == '\0') - return TRUE; - else - { - DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1; - BOOL Result; - LPWSTR buf; - - NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &buf); - Result = GetComputerNameW(buf, &dwSize); - if (Result && (ServerName[0] == '\\') && (ServerName[1] == '\\')) - ServerName += 2; - Result = Result && !lstrcmpW(ServerName, buf); - NetApiBufferFree(buf); - - return Result; - } -} - static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow) { int i;

1 0

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

12 Nov '13

Module: wine Branch: master Commit: 192cc0aca4f84d4eaed7e5406eb89e86c1abcb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192cc0aca4f84d4eaed7e5406… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:02:40 2013 +0100 netapi32: Merge ds.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/ds.c | 156 --------------------------------------------- dlls/netapi32/netapi32.c | 127 ++++++++++++++++++++++++++++++++++++- 3 files changed, 126 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=192cc0aca4f84d4eaed7e…

1 0

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

12 Nov '13

Module: wine Branch: master Commit: 01fb3a1b90658ce9e3ee425c7e2e10f684bdf283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01fb3a1b90658ce9e3ee425c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:02:02 2013 +0100 netapi32: Merge browsr.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/browsr.c | 48 --------------------------------------------- dlls/netapi32/netapi32.c | 21 +++++++++++++++++++ 3 files changed, 21 insertions(+), 49 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 9d8531f..7ea1adc 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -4,7 +4,6 @@ IMPORTLIB = netapi32 IMPORTS = iphlpapi ws2_32 advapi32 C_SRCS = \ - browsr.c \ ds.c \ local_group.c \ nbcmdqueue.c \ diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c deleted file mode 100644 index 8b0a5ed..0000000 --- a/dlls/netapi32/browsr.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2002 Andriy Palamarchuk - * - * netapi32 browser functions - * - * 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 "winerror.h" -#include "lmcons.h" -#include "lmbrowsr.h" -#include "lmshare.h" - -/************************************************************ - * I_BrowserSetNetlogonState (NETAPI32.@) - */ -NET_API_STATUS WINAPI I_BrowserSetNetlogonState( - LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName, - DWORD Role) -{ - return ERROR_NOT_SUPPORTED; -} - -/************************************************************ - * I_BrowserQueryEmulatedDomains (NETAPI32.@) - */ -NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( - LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains, - LPDWORD EntriesRead) -{ - return ERROR_NOT_SUPPORTED; -} diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 857f5e0..9e9b478 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -37,6 +37,7 @@ #include "lmaccess.h" #include "lmat.h" #include "lmapibuf.h" +#include "lmbrowsr.h" #include "lmshare.h" #include "lmwksta.h" #include "netbios.h" @@ -1975,3 +1976,23 @@ NET_API_STATUS WINAPI NetUseDel(LMSTR servername, LMSTR usename, DWORD forcecond FIXME("%s %s %d stub\n", debugstr_w(servername), debugstr_w(usename), forcecond); return NERR_Success; } + +/************************************************************ + * I_BrowserSetNetlogonState (NETAPI32.@) + */ +NET_API_STATUS WINAPI I_BrowserSetNetlogonState( + LPWSTR ServerName, LPWSTR DomainName, LPWSTR EmulatedServerName, + DWORD Role) +{ + return ERROR_NOT_SUPPORTED; +} + +/************************************************************ + * I_BrowserQueryEmulatedDomains (NETAPI32.@) + */ +NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( + LPWSTR ServerName, PBROWSER_EMULATED_DOMAIN *EmulatedDomains, + LPDWORD EntriesRead) +{ + return ERROR_NOT_SUPPORTED; +}

1 0

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

12 Nov '13

Module: wine Branch: master Commit: 97bc30ae19dd9710752c3a55f2bf9519e5554c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bc30ae19dd9710752c3a55f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:01:20 2013 +0100 netapi32: Merge access.c into netapi32.c. --- dlls/netapi32/Makefile.in | 1 - dlls/netapi32/access.c | 1047 --------------------------------------------- dlls/netapi32/netapi32.c | 1002 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1002 insertions(+), 1048 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97bc30ae19dd9710752c3…

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013