December 2014 - Wine-Commits

Alexandre Julliard : winspool.drv: Don' t crash if the ppd directory cannot be created.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: f1aea67d9578a1fcbc5f7ca13fb5424b7b36be43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1aea67d9578a1fcbc5f7ca13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 17 17:10:50 2014 +0100 winspool.drv: Don't crash if the ppd directory cannot be created. --- dlls/winspool.drv/info.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 073a8fb..7653d2f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -946,7 +946,11 @@ static BOOL CUPS_LoadPrinters(void) } else { BOOL added_driver = FALSE; - if (!ppd_dir) ppd_dir = get_ppd_dir(); + if (!ppd_dir && !(ppd_dir = get_ppd_dir())) + { + HeapFree( GetProcessHeap(), 0, port ); + break; + } ppd = get_ppd_filename( ppd_dir, nameW ); if (get_cups_ppd( dests[i].name, ppd )) { @@ -1098,7 +1102,11 @@ static BOOL update_driver( HANDLE printer ) queue_name = get_queue_name( printer, &is_cups ); if (!queue_name) return FALSE; - ppd_dir = get_ppd_dir(); + if (!(ppd_dir = get_ppd_dir())) + { + HeapFree( GetProcessHeap(), 0, queue_name ); + return FALSE; + } ppd = get_ppd_filename( ppd_dir, name ); #ifdef SONAME_LIBCUPS @@ -1224,7 +1232,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) sep_file[] = "<sep file?>"; BOOL added_driver = FALSE; - if (!ppd_dir) ppd_dir = get_ppd_dir(); + if (!ppd_dir && !(ppd_dir = get_ppd_dir())) goto end; ppd = get_ppd_filename( ppd_dir, devnameW ); if (get_fallback_ppd( devname, ppd )) {

1 0

Erich E. Hoover : ntdll: Unify retrieving the attributes of a file.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: ca51e113e4820f8b11016c13732b1a971d2b0054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca51e113e4820f8b11016c137… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Aug 19 20:31:00 2014 -0600 ntdll: Unify retrieving the attributes of a file. --- dlls/ntdll/directory.c | 12 ++---- dlls/ntdll/file.c | 103 ++++++++++++++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 4 +- 3 files changed, 79 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca51e113e4820f8b11016…

1 0

Andrew Eikum : mmdevapi: More accurately track device position.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: d301254e72f018c3e04272115e20ffc70ffcbc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d301254e72f018c3e04272115… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 17 09:28:13 2014 -0600 mmdevapi: More accurately track device position. --- dlls/mmdevapi/tests/render.c | 10 +- dlls/winealsa.drv/mmdevdrv.c | 384 ++++++++++++++++++++++++++----------------- dlls/wineoss.drv/mmdevdrv.c | 76 +++++---- 3 files changed, 283 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d301254e72f018c3e0427…

1 0

Ken Thomases : winemac: Ignore Cocoa child windows which aren' t instances of WineWindow.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: b8da8fa4b1a9362f87ed671c9cb8ebfa440ba1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8da8fa4b1a9362f87ed671c9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 17 08:59:09 2014 -0600 winemac: Ignore Cocoa child windows which aren't instances of WineWindow. On Yosemite, in full-screen mode, Cocoa adds child windows of its own to our windows. These windows are, of course, not instances of WineWindow. So, when we call WineWindow-specific methods on them, it throws exceptions. --- dlls/winemac.drv/cocoa_window.m | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b2238cb..57ae2b8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -195,6 +195,8 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @property (retain, nonatomic) NSTimer* liveResizeDisplayTimer; +(a)property (readonly, copy, nonatomic) NSArray* childWineWindows; + - (void) updateColorSpace; - (BOOL) becameEligibleParentOrChild; @@ -834,7 +836,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // Became non-floating. If parent of floating children, make that // relationship latent. WineWindow* child; - for (child in [[[self childWindows] copy] autorelease]) + for (child in [self childWineWindows]) { if (child.floating) [child becameIneligibleChild]; @@ -1012,7 +1014,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) becameIneligibleParentOrChild { - NSArray* childWindows = [self childWindows]; + NSArray* childWindows = [self childWineWindows]; [self becameIneligibleChild]; @@ -1020,7 +1022,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { WineWindow* child; - childWindows = [[childWindows copy] autorelease]; for (child in childWindows) { child.latentParentWindow = self; @@ -1101,7 +1102,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // Get our child windows and sort them in the reverse of the desired // z-order (back-to-front). - origChildren = [self childWindows]; + origChildren = [self childWineWindows]; children = [[origChildren mutableCopy] autorelease]; [children sortWithOptions:NSSortStable usingComparator:^NSComparisonResult(id obj1, id obj2){ @@ -1315,7 +1316,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; } - if (equalSizes && [[self childWindows] count]) + if (equalSizes && [[self childWineWindows] count]) { // If we change the window frame such that the origin moves // but the size doesn't change, then Cocoa moves child @@ -1611,6 +1612,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [super toggleFullScreen:sender]; } + - (NSArray*) childWineWindows + { + NSArray* childWindows = self.childWindows; + NSIndexSet* indexes = [childWindows indexesOfObjectsPassingTest:^BOOL(id child, NSUInteger idx, BOOL *stop){ + return [child isKindOfClass:[WineWindow class]]; + }]; + return [childWindows objectsAtIndexes:indexes]; + } + // We normally use the generic/calibrated RGB color space for the window, // rather than the device color space, to avoid expensive color conversion // which slows down drawing. However, for windows displaying OpenGL, having

1 0

Aric Stewart : usp10: Correct an off-by-one error in page cache allocation.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: b2ef87750646db7798ec23cc3030baf1f07efc38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ef87750646db7798ec23cc3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 17 08:48:12 2014 -0600 usp10: Correct an off-by-one error in page cache allocation. --- dlls/usp10/usp10_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 504bd55..f10a02d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -169,7 +169,7 @@ typedef struct { OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; - CacheGlyphPage *page[0x10]; + CacheGlyphPage *page[0x11]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0

Nikolay Sivov : dwrite: Added stub EUDC font collection.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: 00ea0b72b64a190014fcd507f1ed3b182b87c89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ea0b72b64a190014fcd507f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 17 09:54:13 2014 +0300 dwrite: Added stub EUDC font collection. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 22 +++++++++++++++++-- dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3558bf8..907a1c3 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -103,6 +103,7 @@ extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDE extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory2*,IDWriteFontCollection**) DECLSPEC_HIDDEN; +extern HRESULT get_eudc_fontcollection(IDWriteFactory2*,IDWriteFontCollection**) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 61d370b..80b7f07 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1968,6 +1968,58 @@ HRESULT get_system_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollectio return hr; } +static HRESULT WINAPI eudcfontfileenumerator_QueryInterface(IDWriteFontFileEnumerator *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IDWriteFontFileEnumerator) || IsEqualIID(riid, &IID_IUnknown)) { + IDWriteFontFileEnumerator_AddRef(iface); + *obj = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI eudcfontfileenumerator_AddRef(IDWriteFontFileEnumerator *iface) +{ + return 2; +} + +static ULONG WINAPI eudcfontfileenumerator_Release(IDWriteFontFileEnumerator *iface) +{ + return 1; +} + +static HRESULT WINAPI eudcfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) +{ + *file = NULL; + return E_FAIL; +} + +static HRESULT WINAPI eudcfontfileenumerator_MoveNext(IDWriteFontFileEnumerator *iface, BOOL *current) +{ + *current = FALSE; + return S_OK; +} + +static const struct IDWriteFontFileEnumeratorVtbl eudcfontfileenumeratorvtbl = +{ + eudcfontfileenumerator_QueryInterface, + eudcfontfileenumerator_AddRef, + eudcfontfileenumerator_Release, + eudcfontfileenumerator_MoveNext, + eudcfontfileenumerator_GetCurrentFontFile +}; + +static IDWriteFontFileEnumerator eudc_fontfile_enumerator = { &eudcfontfileenumeratorvtbl }; + +HRESULT get_eudc_fontcollection(IDWriteFactory2 *factory, IDWriteFontCollection **collection) +{ + TRACE("building EUDC font collection for factory %p\n", factory); + return create_font_collection(factory, &eudc_fontfile_enumerator, FALSE, collection); +} + static HRESULT WINAPI dwritefontfile_QueryInterface(IDWriteFontFile *iface, REFIID riid, void **obj) { struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index eeb8728..8ad5097 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -453,6 +453,7 @@ struct dwritefactory { LONG ref; IDWriteFontCollection *system_collection; + IDWriteFontCollection *eudc_collection; IDWriteGdiInterop *gdiinterop; IDWriteLocalFontFileLoader* localfontfileloader; @@ -505,6 +506,8 @@ static void release_dwritefactory(struct dwritefactory *factory) if (factory->system_collection) IDWriteFontCollection_Release(factory->system_collection); + if (factory->eudc_collection) + IDWriteFontCollection_Release(factory->eudc_collection); if (factory->gdiinterop) release_gdiinterop(factory->gdiinterop); heap_free(factory); @@ -1025,8 +1028,22 @@ static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *ifac BOOL check_for_updates) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %d): stub\n", This, collection, check_for_updates); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p %d)\n", This, collection, check_for_updates); + + if (check_for_updates) + FIXME("checking for eudc updates not implemented\n"); + + if (!This->eudc_collection) + hr = get_eudc_fontcollection(iface, &This->eudc_collection); + + if (SUCCEEDED(hr)) + IDWriteFontCollection_AddRef(This->eudc_collection); + + *collection = This->eudc_collection; + + return hr; } static HRESULT WINAPI dwritefactory1_CreateCustomRenderingParams(IDWriteFactory2 *iface, FLOAT gamma, @@ -1172,6 +1189,7 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP factory->ref = 1; factory->localfontfileloader = NULL; factory->system_collection = NULL; + factory->eudc_collection = NULL; factory->gdiinterop = NULL; list_init(&factory->collection_loaders); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f63ab1d..c3cad68 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2928,6 +2928,33 @@ static void test_GetGlyphRunOutline(void) DeleteFileW(test_fontfile); } +static void test_GetEudcFontCollection(void) +{ + IDWriteFontCollection *coll, *coll2; + IDWriteFactory1 *factory1; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory1, (void**)&factory1); + IDWriteFactory_Release(factory); + if (hr != S_OK) { + win_skip("GetEudcFontCollection() is not supported.\n"); + return; + } + + hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory1_GetEudcFontCollection(factory1, &coll2, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(coll == coll2, "got %p, %p\n", coll, coll2); + IDWriteFontCollection_Release(coll); + IDWriteFontCollection_Release(coll2); + + IDWriteFactory1_Release(factory1); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2965,6 +2992,7 @@ START_TEST(font) test_GetDesignGlyphAdvances(); test_IsMonospacedFont(); test_GetGlyphRunOutline(); + test_GetEudcFontCollection(); IDWriteFactory_Release(factory); }

1 0

Drew Ronneberg : winemenubuilder: Prevent recursion by calling open_module_icon() instead of open_icon()
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: e6a558ad820cc12d59bf0e71ad1ff5cfd021542e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a558ad820cc12d59bf0e71a… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sat Nov 22 13:39:43 2014 -0500 winemenubuilder: Prevent recursion by calling open_module_icon() instead of open_icon() --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5d3bb27..fae89f9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1028,13 +1028,13 @@ static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) *comma = 0; index = atoiW(comma + 1); } - hr = open_icon(icon, index, FALSE, ppStream); + hr = open_module_icon(icon, index, ppStream); } else { executable = assoc_query(ASSOCSTR_EXECUTABLE, extension, openW); if (executable) - hr = open_icon(executable, 0, FALSE, ppStream); + hr = open_module_icon(executable, 0, ppStream); } end:

1 0

Andrew Eikum : wineoss.drv: Don't use SNDCTL_DSP_GETISPACE.
by Alexandre Julliard Dec. 17, 2014

Dec. 17, 2014

Module: wine Branch: master Commit: 50cdc6d7f3d04fafcd7b859814653be403df98e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cdc6d7f3d04fafcd7b85981… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 17 09:28:21 2014 -0600 wineoss.drv: Don't use SNDCTL_DSP_GETISPACE. This shouldn't be needed as the device is opened in non-blocking mode, and it appears this function is unimplemented on PCBSD. --- dlls/wineoss.drv/mmdevdrv.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b111338..0688f9a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1493,20 +1493,11 @@ static void oss_write_data(ACImpl *This) static void oss_read_data(ACImpl *This) { UINT64 pos, readable; - audio_buf_info bi; ssize_t nread; - if(ioctl(This->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ - WARN("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); - return; - } - pos = (This->held_frames + This->lcl_offs_frames) % This->bufsize_frames; readable = (This->bufsize_frames - pos) * This->fmt->nBlockAlign; - if(bi.bytes < readable) - readable = bi.bytes; - nread = read(This->fd, This->local_buffer + pos * This->fmt->nBlockAlign, readable); if(nread < 0){

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.33
by Jeremy Newman Dec. 16, 2014

Dec. 16, 2014

Module: website Branch: master Commit: 01c51cfe7340f5e20147070219ef572cde827258 URL: http://source.winehq.org/git/website.git/?a=commit;h=01c51cfe7340f5e2014707… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Dec 13 03:39:42 2014 +0100 Polish translation for release 1.7.33 --- news/pl/2014121201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014121201.xml b/news/pl/2014121201.xml new file mode 100644 index 0000000..6032329 --- /dev/null +++ b/news/pl/2014121201.xml @@ -0,0 +1,16 @@ +<news> +<date>Grudzień 12, 2014</date> +<title>Wydano Wine 1.7.33</title> +<body> + Wydanie rozwojowe Wine 1.7.33 jest już dostępne. + <a href="{$root}/announce/1.7.33">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla poleceń kopiuj/wklej w MSHTML.</li> + <li>Rozszerzono wsparcie dla czcionek w DirectWrite.</li> + <li>Lepsza obsługa utraty uaktywninienia okien w Direct3D.</li> + <li>Kilka zestawów AP bibliotek DLL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Sebastian Lackner : shlwapi: Add implementation for StrCatChainW.
by Alexandre Julliard Dec. 16, 2014

Dec. 16, 2014

Module: wine Branch: master Commit: 4b33a339cc5328b1c117f5ed0cbde1a6c4f6b7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b33a339cc5328b1c117f5ed0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Dec 7 22:55:31 2014 +0100 shlwapi: Add implementation for StrCatChainW. Based on a patch by Huw Campbell. --- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 41 +++++++ dlls/shlwapi/tests/string.c | 122 +++++++++++++++++++++ 4 files changed, 165 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index 9d266fa..7736645 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -86,7 +86,7 @@ @ stdcall SHRegSetUSValueW( wstr wstr long ptr long long) shlwapi.SHRegSetUSValueW @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW -@ stub StrCatChainW +@ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW @ stdcall StrChrA(str long) shlwapi.StrChrA @ stdcall StrChrIA(str long) shlwapi.StrChrIA @ stdcall StrChrIW(wstr long) shlwapi.StrChrIW diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b7aac08..6b6ead2 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -759,6 +759,7 @@ @ stdcall StrCSpnW (wstr wstr) @ stdcall StrCatBuffA (str str long) @ stdcall StrCatBuffW (wstr wstr long) +@ stdcall StrCatChainW (ptr long long wstr) @ stdcall StrCatW (ptr wstr) @ stdcall StrChrA (str long) @ stdcall StrChrIA (str long) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 9ba6038..ca2f9b9 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -459,6 +459,47 @@ LPWSTR WINAPI StrCatW(LPWSTR lpszStr, LPCWSTR lpszSrc) } /************************************************************************* + * StrCatChainW [SHLWAPI.@] + * + * Concatenates two unicode strings. + * + * PARAMS + * lpszStr [O] Initial string + * cchMax [I] Length of destination buffer + * ichAt [I] Offset from the destination buffer to begin concatenation + * lpszCat [I] String to concatenate + * + * RETURNS + * The offset from the beginning of pszDst to the terminating NULL. + */ +DWORD WINAPI StrCatChainW(LPWSTR lpszStr, DWORD cchMax, DWORD ichAt, LPCWSTR lpszCat) +{ + TRACE("(%s,%u,%d,%s)\n", debugstr_w(lpszStr), cchMax, ichAt, debugstr_w(lpszCat)); + + if (ichAt == -1) + ichAt = strlenW(lpszStr); + + if (!cchMax) + return ichAt; + + if (ichAt == cchMax) + ichAt--; + + if (lpszCat && ichAt < cchMax) + { + lpszStr += ichAt; + while (ichAt < cchMax - 1 && *lpszCat) + { + *lpszStr++ = *lpszCat++; + ichAt++; + } + *lpszStr = 0; + } + + return ichAt; +} + +/************************************************************************* * StrCpyW [SHLWAPI.@] * * Copy a string to another string. diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index c72b774..ac14db0 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -48,6 +48,7 @@ static DWORD (WINAPI *pSHAnsiToAnsi)(LPCSTR,LPSTR,int); static DWORD (WINAPI *pSHUnicodeToUnicode)(LPCWSTR,LPWSTR,int); static LPSTR (WINAPI *pStrCatBuffA)(LPSTR,LPCSTR,INT); static LPWSTR (WINAPI *pStrCatBuffW)(LPWSTR,LPCWSTR,INT); +static DWORD (WINAPI *pStrCatChainW)(LPWSTR,DWORD,DWORD,LPCWSTR); static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); static LPSTR (WINAPI *pStrFormatByteSize64A)(LONGLONG,LPSTR,UINT); @@ -1481,6 +1482,125 @@ static void test_StrStrNIW(void) } } +static void test_StrCatChainW(void) +{ + static const WCHAR deadbeefW[] = {'D','e','A','d','B','e','E','f',0}; + static const WCHAR deadW[] = {'D','e','A','d',0}; + static const WCHAR beefW[] = {'B','e','E','f',0}; + + WCHAR buf[32 + 1]; + DWORD ret; + + if (!pStrCatChainW) + { + win_skip("StrCatChainW is not available\n"); + return; + } + + /* Test with NULL buffer */ + ret = pStrCatChainW(NULL, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + + /* Test with empty buffer */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 0, 0, beefW); + ok(ret == 0, "Expected StrCatChainW to return 0, got %u\n", ret); + ok(buf[0] == 0x1111, "Expected buf[0] = 0x1111, got %x\n", buf[0]); + + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 0, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data to existing string with offset = -1 */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, -1, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Append data at a fixed offset */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 32, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 32, 4, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + /* Buffer exactly sufficient for string + terminating null */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 5, 0, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Buffer too small, string will be truncated */ + memset(buf, 0x11, sizeof(buf)); + ret = pStrCatChainW(buf, 4, 0, deadW); + if (ret == 4) + { + /* Windows 2000 and XP uses a slightly different implementation + * for StrCatChainW, which doesn't ensure that strings are null- + * terminated. Skip test if we detect such an implementation. */ + win_skip("Windows2000/XP behaviour detected for StrCatChainW, skipping tests\n"); + return; + } + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(!memcmp(buf, deadW, 3 * sizeof(WCHAR)), "Buffer contains wrong data\n"); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Overwrite part of an existing string */ + ret = pStrCatChainW(buf, 4, 1, beefW); + ok(ret == 3, "Expected StrCatChainW to return 3, got %u\n", ret); + ok(buf[0] == 'D', "Expected buf[0] = 'D', got %x\n", buf[0]); + ok(buf[1] == 'B', "Expected buf[1] = 'B', got %x\n", buf[1]); + ok(buf[2] == 'e', "Expected buf[2] = 'e', got %x\n", buf[2]); + ok(!buf[3], "String is not nullterminated\n"); + ok(buf[4] == 0x1111, "Expected buf[4] = 0x1111, got %x\n", buf[4]); + + /* Test appending to full buffer */ + memset(buf, 0x11, sizeof(buf)); + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + memcpy(buf + 9, deadW, sizeof(deadW)); + ret = pStrCatChainW(buf, 9, 8, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points at the end of the buffer */ + ret = pStrCatChainW(buf, 9, 9, beefW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* Offset points outside of the buffer */ + ret = pStrCatChainW(buf, 9, 10, beefW); + ok(ret == 10, "Expected StrCatChainW to return 10, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + ok(!memcmp(buf + 9, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + + /* The same but without nullterminated string */ + memcpy(buf, deadbeefW, sizeof(deadbeefW)); + ret = pStrCatChainW(buf, 5, -1, deadW); + ok(ret == 8, "Expected StrCatChainW to return 8, got %u\n", ret); + ok(!memcmp(buf, deadbeefW, sizeof(deadbeefW)), "Buffer contains wrong data\n"); + + ret = pStrCatChainW(buf, 5, 5, deadW); + ok(ret == 4, "Expected StrCatChainW to return 4, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); + + ret = pStrCatChainW(buf, 5, 6, deadW); + ok(ret == 6, "Expected StrCatChainW to return 6, got %u\n", ret); + ok(!memcmp(buf, deadW, sizeof(deadW)), "Buffer contains wrong data\n"); + ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); +} + START_TEST(string) { HMODULE hShlwapi; @@ -1500,6 +1620,7 @@ START_TEST(string) pSHUnicodeToUnicode = (void *)GetProcAddress(hShlwapi, (LPSTR)346); pStrCatBuffA = (void *)GetProcAddress(hShlwapi, "StrCatBuffA"); pStrCatBuffW = (void *)GetProcAddress(hShlwapi, "StrCatBuffW"); + pStrCatChainW = (void *)GetProcAddress(hShlwapi, "StrCatChainW"); pStrCpyNXA = (void *)GetProcAddress(hShlwapi, (LPSTR)399); pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); pStrChrNW = (void *)GetProcAddress(hShlwapi, "StrChrNW"); @@ -1565,6 +1686,7 @@ START_TEST(string) test_StrStrIW(); test_StrStrNW(); test_StrStrNIW(); + test_StrCatChainW(); CoUninitialize(); }

1 0