November 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus: Get rid of no longer needed path and region fields.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: f5d807b7d7f284e2037397007c73e5d73f77138f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d807b7d7f284e2037397007… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 12 18:16:28 2013 +0900 gdiplus: Get rid of no longer needed path and region fields. --- dlls/gdiplus/gdiplus.c | 2 +- dlls/gdiplus/gdiplus_private.h | 20 +----------------- dlls/gdiplus/region.c | 41 ++++++++++++++++----------------------- 3 files changed, 20 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index a76143e..8cef167 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -459,7 +459,7 @@ void delete_element(region_element* element) case RegionDataRect: break; case RegionDataPath: - GdipDeletePath(element->elementdata.pathdata.path); + GdipDeletePath(element->elementdata.path); break; case RegionDataEmptyRect: case RegionDataInfiniteRect: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 19b2130..b2327f9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -404,17 +404,7 @@ struct region_element union { GpRectF rect; - struct - { - GpPath* path; - struct - { - DWORD size; - DWORD magic; - DWORD count; - DWORD flags; - } pathheader; - } pathdata; + GpPath *path; struct { struct region_element *left; /* the original region */ @@ -424,13 +414,7 @@ struct region_element }; struct GpRegion{ - struct - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } header; + DWORD num_children; region_element node; }; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4f16f62..aef2ac7 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -123,7 +123,7 @@ static inline INT get_element_size(const region_element* element) return needed + sizeof(GpRect); case RegionDataPath: { - const GpPath *path = element->elementdata.pathdata.path; + const GpPath *path = element->elementdata.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; @@ -151,11 +151,8 @@ static inline INT get_element_size(const region_element* element) /* Does not check parameters, caller must do that */ static inline GpStatus init_region(GpRegion* region, const RegionType type) { - region->node.type = type; - region->header.checksum = 0xdeadbeef; - region->header.magic = VERSION_MAGIC; - region->header.num_children = 0; - region->header.size = 0; + region->node.type = type; + region->num_children = 0; return Ok; } @@ -183,9 +180,7 @@ static inline GpStatus clone_element(const region_element* element, case RegionDataInfiniteRect: return Ok; case RegionDataPath: - (*element2)->elementdata.pathdata.pathheader = element->elementdata.pathdata.pathheader; - stat = GdipClonePath(element->elementdata.pathdata.path, - &(*element2)->elementdata.pathdata.path); + stat = GdipClonePath(element->elementdata.path, &(*element2)->elementdata.path); if (stat == Ok) return Ok; break; default: @@ -217,9 +212,7 @@ static inline void fuse_region(GpRegion* region, region_element* left, region->node.type = mode; region->node.elementdata.combine.left = left; region->node.elementdata.combine.right = right; - - region->header.size = sizeheader_size + get_element_size(&region->node); - region->header.num_children += 2; + region->num_children += 2; } /***************************************************************************** @@ -249,7 +242,7 @@ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) return OutOfMemory; element = &(*clone)->node; - (*clone)->header = region->header; + (*clone)->num_children = region->num_children; return clone_element(&region->node, &element); } @@ -406,7 +399,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, } fuse_region(region1, left, right, mode); - region1->header.num_children += region2->header.num_children; + region1->num_children += region2->num_children; return Ok; } @@ -470,7 +463,7 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) } element = &(*region)->node; - stat = GdipClonePath(path, &element->elementdata.pathdata.path); + stat = GdipClonePath(path, &element->elementdata.path); if (stat != Ok) { GdipDeleteRegion(*region); @@ -741,7 +734,7 @@ static void write_element(const region_element* element, DWORD *buffer, case RegionDataPath: { INT i; - const GpPath* path = element->elementdata.pathdata.path; + const GpPath* path = element->elementdata.path; struct _pathheader { DWORD size; @@ -845,7 +838,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, 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; + region_header->num_children = region->num_children; filled += 4; /* With few exceptions, everything written is DWORD aligned, * so use that as our base */ @@ -938,7 +931,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = CreateRectRgn(0, 0, 0, 0); return *hrgn ? Ok : OutOfMemory; case RegionDataPath: - return get_path_hrgn(element->elementdata.pathdata.path, graphics, hrgn); + return get_path_hrgn(element->elementdata.path, graphics, hrgn); case RegionDataRect: { GpPath* path; @@ -1298,12 +1291,12 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr } /* Fall-through to do the actual conversion. */ case RegionDataPath: - if (!element->elementdata.pathdata.path->pathdata.Count) + if (!element->elementdata.path->pathdata.Count) return Ok; stat = GdipTransformMatrixPoints(matrix, - element->elementdata.pathdata.path->pathdata.Points, - element->elementdata.pathdata.path->pathdata.Count); + element->elementdata.path->pathdata.Points, + element->elementdata.path->pathdata.Count); return stat; default: stat = transform_region_element(element->elementdata.combine.left, matrix); @@ -1338,9 +1331,9 @@ static void translate_region_element(region_element* element, REAL dx, REAL dy) element->elementdata.rect.Y += dy; return; case RegionDataPath: - for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){ - element->elementdata.pathdata.path->pathdata.Points[i].X += dx; - element->elementdata.pathdata.path->pathdata.Points[i].Y += dy; + for(i = 0; i < element->elementdata.path->pathdata.Count; i++){ + element->elementdata.path->pathdata.Points[i].X += dx; + element->elementdata.path->pathdata.Points[i].Y += dy; } return; default:

1 0

Henri Verbeet : d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: b83a0b9d3ee88b5a09700bc3a25d3ae3a49aa84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83a0b9d3ee88b5a09700bc3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:25 2013 +0100 d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails. This is a only slightly modified version of a patch by Lasse Rasinen. --- dlls/d3d8/surface.c | 12 ++++++++++-- dlls/d3d8/tests/device.c | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index a157c51..0b40c46 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -273,8 +273,16 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } + else + { + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } return hr; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a0fcd71..f5afbc4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4039,8 +4039,12 @@ static void test_lockrect_invalid(void) hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); + locked_rect.pBits = (void *)0xdeadbeef; + locked_rect.Pitch = 1; hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!locked_rect.pBits, "Got unexpected pBits %p.\n", locked_rect.pBits); + ok(!locked_rect.Pitch, "Got unexpected Pitch %u.\n", locked_rect.Pitch); hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);

1 0

Hans Leidekker : netapi32: Merge access.c into netapi32.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

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

Hans Leidekker : netapi32: Merge wksta.c into netapi32.c.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

Module: wine Branch: master Commit: cf597a76039d3c07cfe5db2fb6fb96cfc05bebf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf597a76039d3c07cfe5db2fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 12 10:00:47 2013 +0100 netapi32: Merge wksta.c into netapi32.c. --- dlls/netapi32/Makefile.in | 3 +- dlls/netapi32/netapi32.c | 593 ++++++++++++++++++++++++++++++++++++++++++- dlls/netapi32/wksta.c | 622 --------------------------------------------- 3 files changed, 592 insertions(+), 626 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf597a76039d3c07cfe5d…

1 0

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

Nov. 12, 2013

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

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

Nov. 12, 2013

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 Nov. 12, 2013

Nov. 12, 2013

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

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

Nov. 12, 2013

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 Nov. 12, 2013

Nov. 12, 2013

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: Perform a case-insensitive string comparison in NETAPI_IsLocalComputer.
by Alexandre Julliard Nov. 12, 2013

Nov. 12, 2013

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