February 2016 - Wine-Commits

Alistair Leslie-Hughes : msi: Refreh controls after spawned dialog is closed.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 76130609961f269e7ba61d071c6135203678f7df URL: http://source.winehq.org/git/wine.git/?a=commit;h=76130609961f269e7ba61d071… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 22 20:49:30 2016 +1100 msi: Refreh controls after spawned dialog is closed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 434f0f7cb18cc5068be0d48c0c6c981f36c82bd9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/dialog.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 9b61937..245bfdc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -556,6 +556,17 @@ static void msi_dialog_update_controls( msi_dialog *dialog, LPCWSTR property ) } } +static void msi_dialog_update_all_controls( msi_dialog *dialog ) +{ + msi_control *control; + + LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + { + if ( control->property && control->update ) + control->update( dialog, control ); + } +} + static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCWSTR value ) { UINT r = msi_set_property( package->db, property, value, -1 ); @@ -4389,7 +4400,11 @@ static UINT event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) { /* don't destroy a modeless dialogs that might be our parent */ event_do_dialog( dialog->package, argument, dialog, FALSE ); - if (dialog->package->CurrentInstallState != ERROR_SUCCESS) msi_dialog_end_dialog( dialog ); + if (dialog->package->CurrentInstallState != ERROR_SUCCESS) + msi_dialog_end_dialog( dialog ); + else + msi_dialog_update_all_controls(dialog); + return ERROR_SUCCESS; }

1 0

Sebastian Lackner : ntdll: Receive debug registers from server on x86_64.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 946ef1530a1b9344e9647b5d3847c58f33217907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=946ef1530a1b9344e9647b5d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:41:01 2016 +0100 ntdll: Receive debug registers from server on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c468f8eca3af45eb8d8422f161c3f9782e55370) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/thread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index aaf7a71..1455eb1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -830,9 +830,11 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) DWORD needed_flags = context->ContextFlags; BOOL self = (handle == GetCurrentThread()); + /* on i386/amd64 debug registers always require a server call */ #ifdef __i386__ - /* on i386 debug registers always require a server call */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) self = FALSE; +#elif defined(__x86_64__) + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) self = FALSE; #endif if (!self)

1 0

Nikolay Sivov : comctl32/tests: Separate individual Trackbar tests from each other.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: fb648022d8f0982054da38787a1b78817efd5d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb648022d8f0982054da38787… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 15:47:07 2016 +0300 comctl32/tests: Separate individual Trackbar tests from each other. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1fce80024bab34a0828cb8f04c69819d3452ade9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 202 ++++++++++++++++++++++++++++------------- 1 file changed, 138 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb648022d8f0982054da3…

1 0

Stefan Dösinger : wined3d: Prepare GL textures in surface_load_ds_location.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 916570d44e1ff7d0319fea9107ae93763ab417d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916570d44e1ff7d0319fea910… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jan 17 14:40:04 2016 +0000 wined3d: Prepare GL textures in surface_load_ds_location. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 638f6c1ac81a4be0ff3f290a81bc5d3472262839) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f8a1ba1..072c0ee 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3661,10 +3661,10 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co return; } + wined3d_surface_prepare(surface, context, location); if (surface->locations & WINED3D_LOCATION_DISCARDED) { TRACE("Surface was discarded, no need copy data.\n"); - wined3d_surface_prepare(surface, context, location); surface->locations &= ~WINED3D_LOCATION_DISCARDED; surface->locations |= location; surface->ds_current_size.cx = surface->resource.width;

1 0

Alistair Leslie-Hughes : msi: Allow PathEdit controls to be updated.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: ae45a7def16e7fdcfee5e4375252d205618ec147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae45a7def16e7fdcfee5e4375… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 22 20:49:29 2016 +1100 msi: Allow PathEdit controls to be updated. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e90b34e131446c356ae5c5f49fc376eb294f1ac1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/dialog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 64cbbbc..9b61937 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2229,6 +2229,7 @@ static UINT msi_dialog_pathedit_control( msi_dialog *dialog, MSIRECORD *rec ) control->attributes = MSI_RecordGetInteger( rec, 8 ); prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + control->update = msi_dialog_update_pathedit; info->dialog = dialog; info->control = control;

1 0

Nikolay Sivov : msvcrt: Fix char to int promotion that breaks pattern lookup.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 505941520793786cdd96ef4165a644a04dd7ab8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=505941520793786cdd96ef416… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 01:14:28 2015 +0300 msvcrt: Fix char to int promotion that breaks pattern lookup. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d99727bcb3f211b39421b1d738a3d3165fb82d78) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/scanf.h | 8 ++++++++ dlls/msvcrt/tests/scanf.c | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 9322704..5bf91a6 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -68,7 +68,11 @@ #undef _EOF_ #define _EOF_ 0 #ifdef STRING_LEN +#ifdef WIDE_CHAR #define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) +#else /* WIDE_CHAR */ +#define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++)) +#endif /* WIDE_CHAR */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) @@ -86,7 +90,11 @@ #endif /* SECURE */ #endif /* WIDE_SCANF */ #else /* STRING_LEN */ +#ifdef WIDE_CHAR #define _GETC_(file) (consumed++, *file++) +#else /* WIDE_CHAR */ +#define _GETC_(file) (consumed++, (unsigned char)*file++) +#endif /* WIDE_CHAR */ #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) #define _LOCK_FILE_(file) do {} while(0) #define _UNLOCK_FILE_(file) do {} while(0) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 3c5a05e..6cb85fa 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -244,6 +244,13 @@ static void test_sscanf( void ) ret = sscanf(buffer, "%d:%d%n", &hour, &min, &number_so_far); ok(ret == 2, "Wrong number of arguments read: %d\n", ret); ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far); + + buffer[0] = 0; + buffer1[0] = 0; + ret = sscanf("test=value\xda", "%[^=] = %[^;]", buffer, buffer1); + ok(ret == 2, "got %d\n", ret); + ok(!strcmp(buffer, "test"), "buf %s\n", buffer); + ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); } static void test_sscanf_s(void)

1 0

Piotr Caban : ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 360c56a361fa93ee675fadc0a39368e51cf6ca02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360c56a361fa93ee675fadc0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 21 18:42:04 2015 +0100 ntdll: Fix NtQueryDirectoryFile behavior on short file names on case insensitive file systems. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8ef26149308f577151f14a2d359868754c7ea20) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/directory.c | 14 -------------- dlls/ntdll/tests/directory.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 4faafe9..23ebf48 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2120,15 +2120,6 @@ static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if (!case_sensitive && ret && (errno == ENOENT || errno == ENOTDIR)) - { - /* If the file does not exist, return that info. - * If the file DOES exist, return failure and fallback to the next - * read_directory_* function (we need to return the case-preserved - * filename stored on the filesystem). */ - ret = 0; - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - } else { ret = -1; @@ -2214,11 +2205,6 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) - { - io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; - ret = 0; - } } else ret = -1; diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 730b0f1..7b1002a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -60,6 +60,7 @@ static struct testfile_s { int nfound; /* How many were found (expect 1) */ WCHAR nameW[20]; /* unicode version of name (filled in later) */ } testfiles[] = { + { 0, 0, FILE_ATTRIBUTE_NORMAL, "longfilename.tmp", NULL, "normal" }, { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, @@ -234,10 +235,17 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char static void test_NtQueryDirectoryFile(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING ntdirname; + UNICODE_STRING ntdirname, mask; char testdirA[MAX_PATH]; WCHAR testdirW[MAX_PATH]; int i; + IO_STATUS_BLOCK io; + WCHAR short_name[12]; + UINT data_size; + BYTE data[8192]; + FILE_BOTH_DIRECTORY_INFORMATION *fbdi = (FILE_BOTH_DIRECTORY_INFORMATION*)data; + DWORD status; + HANDLE dirh; /* Clean up from prior aborted run, if any, then set up test files */ ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); @@ -260,8 +268,6 @@ static void test_NtQueryDirectoryFile(void) for (i = 0; testfiles[i].name; i++) { - UNICODE_STRING mask; - if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ mask.Buffer = testfiles[i].nameW; mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); @@ -271,6 +277,35 @@ static void test_NtQueryDirectoryFile(void) test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); } + /* short path passed as mask */ + status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); + ok(status == STATUS_SUCCESS, "failed to open dir '%s'\n", testdirA); + if (status != STATUS_SUCCESS) { + skip("can't test if we can't open the directory\n"); + return; + } + mask.Buffer = testfiles[0].nameW; + mask.Length = mask.MaximumLength = lstrlenW(testfiles[0].nameW) * sizeof(WCHAR); + data_size = offsetof(FILE_BOTH_DIRECTORY_INFORMATION, FileName[256]); + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, FALSE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); + ok(fbdi->ShortName[0], "ShortName is empty\n"); + + mask.Length = mask.MaximumLength = fbdi->ShortNameLength; + memcpy(short_name, fbdi->ShortName, mask.Length); + mask.Buffer = short_name; + pNtQueryDirectoryFile(dirh, 0, NULL, NULL, &io, data, data_size, + FileBothDirectoryInformation, TRUE, &mask, TRUE); + ok(U(io).Status == STATUS_SUCCESS, "failed to query directory status %x\n", U(io).Status); + ok(fbdi->FileNameLength == strlen(testfiles[0].name)*sizeof(WCHAR) && + !memcmp(fbdi->FileName, testfiles[0].nameW, fbdi->FileNameLength), + "incorrect long file name: %s\n", wine_dbgstr_wn(fbdi->FileName, + fbdi->FileNameLength/sizeof(WCHAR))); + + pNtClose(dirh); + done: tear_down_attribute_test(testdirA); pRtlFreeUnicodeString(&ntdirname);

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAllocData().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 47d2d8213ef06f21e1a1edd5cdfe3ff9793bf0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d2d8213ef06f21e1a1edd5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 11:49:30 2016 +0300 ole2disp: Implement SafeArrayAllocData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit beceaa82ca28b99ef49a3b34f691ff234f001344) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 34 +++++++++++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 539b515..5831d86 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -72,6 +72,23 @@ static void safearray_free(SEGPTR ptr) WOWGlobalUnlockFree16(ptr); } +static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) +{ + const SAFEARRAYBOUND16 *sab = sa->rgsabound; + USHORT count = sa->cDims; + ULONG cells = 1; + + while (count--) + { + if (!sab->cElements) + return 0; + cells *= sab->cElements; + sab++; + } + + return cells; +} + /****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ @@ -96,6 +113,23 @@ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) } /****************************************************************************** + * SafeArrayAllocData [OLE2DISP.39] + */ +HRESULT WINAPI SafeArrayAllocData16(SAFEARRAY16 *sa) +{ + ULONG size; + + TRACE("%p\n", sa); + + if (!sa) + return E_INVALIDARG16; + + size = safearray_getcellcount(sa); + sa->pvData = safearray_alloc(size * sa->cbElements); + return sa->pvData ? S_OK : E_OUTOFMEMORY16; +} + +/****************************************************************************** * SafeArrayDestroyDescriptor [OLE2DISP.40] */ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 997de31..919583d 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -36,7 +36,7 @@ 36 stub REVOKEACTIVEOBJECT 37 stub GETACTIVEOBJECT 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 -39 stub SAFEARRAYALLOCDATA +39 pascal SafeArrayAllocData(ptr) SafeArrayAllocData16 40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 41 stub SAFEARRAYDESTROYDATA 42 stub SAFEARRAYREDIM

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayDestroyDescriptor().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: f2e755166f7ce4a7241bb008ae0db639e8f4aca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e755166f7ce4a7241bb008a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 11:49:29 2016 +0300 ole2disp: Implement SafeArrayDestroyDescriptor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1529f082e6ee5e7a897b41e112b219480df6f82e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 25 +++++++++++++++++++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 1774211..539b515 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -67,6 +67,11 @@ static SEGPTR safearray_alloc(ULONG size) return WOWGlobalAllocLock16(GPTR, size, &h); } +static void safearray_free(SEGPTR ptr) +{ + WOWGlobalUnlockFree16(ptr); +} + /****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ @@ -90,6 +95,26 @@ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) return S_OK; } +/****************************************************************************** + * SafeArrayDestroyDescriptor [OLE2DISP.40] + */ +HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) +{ + TRACE("0x%08x\n", s); + + if (s) + { + SAFEARRAY16 *sa = MapSL(s); + + if (sa->cLocks) + return DISP_E_ARRAYISLOCKED; + + safearray_free(s); + } + + return S_OK; +} + /* This implementation of the BSTR API is 16-bit only. It represents BSTR as a 16:16 far pointer, and the strings as ISO-8859 */ diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 08372c5..997de31 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -37,7 +37,7 @@ 37 stub GETACTIVEOBJECT 38 pascal SafeArrayAllocDescriptor(word ptr) SafeArrayAllocDescriptor16 39 stub SAFEARRAYALLOCDATA -40 stub SAFEARRAYDESTROYDESCRIPTOR +40 pascal SafeArrayDestroyDescriptor(segptr) SafeArrayDestroyDescriptor16 41 stub SAFEARRAYDESTROYDATA 42 stub SAFEARRAYREDIM 43 stub VARI2FROMI4

1 0

Nikolay Sivov : ole2: Fix error handling in ReadClassStg().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: stable Commit: 31263da4365984d6d55bee28b0726801d9a144be URL: http://source.winehq.org/git/wine.git/?a=commit;h=31263da4365984d6d55bee28b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:45:48 2016 +0300 ole2: Fix error handling in ReadClassStg(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 995fe92652650a708fb56c58392ed4c7679c5ae1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 0052142..422469d 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define E_INVALIDARG16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 3) static HICON convert_icon_to_32( HICON16 icon16 ) { @@ -296,8 +297,14 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) TRACE("(%x, %p)\n", pstg, pclsid); - if(pclsid==NULL) - return E_POINTER; + if (!pclsid) + return E_INVALIDARG16; + + memset(pclsid, 0, sizeof(*pclsid)); + + if (!pstg) + return E_INVALIDARG16; + /* * read a STATSTG structure (contains the clsid) from the storage */

1 0