August 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Add an option to set the syscall table id.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 3513a176fd325492e5b5e498e4eebf3f820f8cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3513a176fd325492e5b5e498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 11:46:51 2021 +0200 winebuild: Add an option to set the syscall table id. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 12 +++++++----- tools/winebuild/main.c | 15 +++++++++++++++ tools/winebuild/utils.c | 1 + tools/winebuild/winebuild.man.in | 5 +++++ 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 1918932ad1f..52472958d31 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int syscall_table; /* syscall table id */ int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6a158578143..84738fc9135 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1458,6 +1458,8 @@ void output_syscalls( DLLSPEC *spec ) { ORDDEF *odp = syscalls[i]; const char *name = get_link_name(odp); + unsigned int id = (spec->syscall_table << 12) + i; + output( "\t.align %d\n", get_alignment(16) ); output( "\t%s\n", func_declaration(name) ); output( "%s\n", asm_globl(name) ); @@ -1469,12 +1471,12 @@ void output_syscalls( DLLSPEC *spec ) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "1:\tmovl %s-1b(%%eax),%%edx\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tmovl $%u,%%eax\n", i ); + output( "\tmovl $%u,%%eax\n", id ); needs_get_pc_thunk = 1; } else { - output( "\tmovl $%u,%%eax\n", i ); + output( "\tmovl $%u,%%eax\n", id ); output( "\tmovl $%s,%%edx\n", asm_name("__wine_syscall") ); } output( "\tcall *%%edx\n" ); @@ -1488,7 +1490,7 @@ void output_syscalls( DLLSPEC *spec ) * validate that instruction, we can just put a jmp there instead. */ output( "\t.byte 0x4c,0x8b,0xd1\n" ); /* movq %rcx,%r10 */ output( "\t.byte 0xb8\n" ); /* movl $i,%eax */ - output( "\t.long %u\n", i ); + output( "\t.long %u\n", id ); output( "\t.byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n" ); /* testb $1,0x7ffe0308 */ output( "\t.byte 0x75,0x03\n" ); /* jne 1f */ output( "\t.byte 0x0f,0x05\n" ); /* syscall */ @@ -1509,14 +1511,14 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM: output( "\tpush {r0-r3}\n" ); - output( "\tmovw ip, #%u\n", i ); + output( "\tmovw ip, #%u\n", id ); output( "\tmov r3, lr\n" ); output( "\tbl %s\n", asm_name("__wine_syscall") ); output( "\tadd sp, #16\n" ); output( "\tbx lr\n" ); break; case CPU_ARM64: - output( "\tmov x8, #%u\n", i ); + output( "\tmov x8, #%u\n", id ); output( "\tmov x9, x30\n" ); output( "\tbl %s\n", asm_name("__wine_syscall" )); output( "\tret\n" ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 8c0e77030b6..84923249c66 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -202,6 +202,15 @@ static void set_subsystem( const char *subsystem, DLLSPEC *spec ) free( str ); } +/* set the syscall table id */ +static void set_syscall_table( const char *id, DLLSPEC *spec ) +{ + int val = atoi( id ); + + if (val < 0 || val > 3) fatal_error( "Invalid syscall table id '%s', must be 0-3\n", id ); + spec->syscall_table = val; +} + /* set the target CPU and platform */ static void set_target( const char *target ) { @@ -303,6 +312,7 @@ static const char usage_str[] = " --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" +" --syscall-table=ID Set the syscall table id (between 0 and 3)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" @@ -340,6 +350,7 @@ enum long_options_values LONG_OPT_SAVE_TEMPS, LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, + LONG_OPT_SYSCALL_TABLE, LONG_OPT_VERSION }; @@ -367,6 +378,7 @@ static const struct option long_options[] = { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, + { "syscall-table", 1, 0, LONG_OPT_SYSCALL_TABLE }, { "version", 0, 0, LONG_OPT_VERSION }, /* aliases for short options */ { "target", 1, 0, 'b' }, @@ -595,6 +607,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_SUBSYSTEM: set_subsystem( optarg, spec ); break; + case LONG_OPT_SYSCALL_TABLE: + set_syscall_table( optarg, spec ); + break; case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 441e84aa092..709ffb9e28d 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -911,6 +911,7 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem = 0; spec->subsystem_major = 4; spec->subsystem_minor = 0; + spec->syscall_table = 0; if (get_ptr_size() > 4) spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; else diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index d55c00b2d24..d9a05fc99d9 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -255,6 +255,11 @@ argument array to use Unicode strings. A graphical executable has a Optionally a major and minor subsystem version can also be specified; the default subsystem version is 4.0. .TP +.BI --syscall-table= id +Set the system call table id, between 0 and 3. The default is 0, the +ntdll syscall table. Only useful in modules that define syscall entry +points. +.TP .BI \-u,\ --undefined= symbol Add \fIsymbol\fR to the list of undefined symbols when invoking the linker. This makes it possible to force a specific module of a static

1 0

Akihiro Sagawa : ntdll: Fix use-after-free.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 8a3e0d686ea4cbff33dc45bb63e71f132c22797a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3e0d686ea4cbff33dc45bb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Aug 29 21:35:14 2021 +0900 ntdll: Fix use-after-free. Fixes a regression introduced by 76f949577aac88bbde4e9e7b904587f5bc8c808d. nt_name or redir is used in open_unix_file() because attr.ObjectName points to either of them. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51702 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index d7f3edf4330..f5b8b5315cd 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -368,16 +368,18 @@ static int get_unix_curdir( const RTL_USER_PROCESS_PARAMETERS *params ) InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); get_redirect( &attr, &redir ); status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN ); - free( nt_name.Buffer ); - free( redir.Buffer ); - if (status) return -1; + if (status) goto done; status = open_unix_file( &handle, unix_name, FILE_TRAVERSE | SYNCHRONIZE, &attr, 0, FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); free( unix_name ); - if (status) return -1; + if (status) goto done; wine_server_handle_to_fd( handle, FILE_TRAVERSE, &fd, NULL ); NtClose( handle ); + +done: + free( nt_name.Buffer ); + free( redir.Buffer ); return fd; }

1 0

Zebediah Figura : shlwapi/tests: Use Wine names for ordinal functions.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 00df0edb15dfc87178e977c370d0f9c184c5c372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00df0edb15dfc87178e977c3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 28 17:10:46 2021 -0500 shlwapi/tests: Use Wine names for ordinal functions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/clist.c | 153 ++++++++++++++++++++++----------------------- dlls/shlwapi/tests/clsid.c | 27 ++++---- 2 files changed, 88 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00df0edb15dfc87178e9…

1 0

Nikolay Sivov : comctl32/listview: Remove description headers from Edit box helpers.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 8df5e1bc5c72e4ea660d0af15572daf156bf6747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8df5e1bc5c72e4ea660d0af1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 29 13:45:29 2021 +0300 comctl32/listview: Remove description headers from Edit box helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 63 ------------------------------------------------ 1 file changed, 63 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8cbfee834ce..41e3db5f9be 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5966,20 +5966,6 @@ cleanup: return res; } -/*** - * DESCRIPTION: - * Subclassed edit control windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * [I] isW : TRUE if input is Unicode - * - * RETURN: - * Zero. - */ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL isW) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(GetParent(hwnd), 0); @@ -6022,52 +6008,16 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara return 0; } -/*** - * DESCRIPTION: - * Subclassed edit control Unicode windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * - * RETURN: - */ static LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditLblWndProcT(hwnd, uMsg, wParam, lParam, TRUE); } -/*** - * DESCRIPTION: - * Subclassed edit control ANSI windproc function - * - * PARAMETER(S): - * [I] hwnd : the edit window handle - * [I] uMsg : the message that is to be processed - * [I] wParam : first message parameter - * [I] lParam : second message parameter - * - * RETURN: - */ static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditLblWndProcT(hwnd, uMsg, wParam, lParam, FALSE); } -/*** - * DESCRIPTION: - * Creates a subclassed edit control - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] text : initial text for the edit - * [I] style : the window style - * [I] isW : TRUE if input is Unicode - * - * RETURN: - */ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) { static const DWORD style = WS_CHILDWINDOW|WS_CLIPSIBLINGS|ES_LEFT|ES_AUTOHSCROLL|WS_BORDER|WS_VISIBLE; @@ -6094,19 +6044,6 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW) return hedit; } -/*** - * DESCRIPTION: - * Begin in place editing of specified list view item - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * [I] nItem : item index - * [I] isW : TRUE if it's a Unicode req, FALSE if ASCII - * - * RETURN: - * SUCCESS : TRUE - * FAILURE : FALSE - */ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) { WCHAR disptextW[DISP_TEXT_SIZE] = { 0 };

1 0

Esme Povirk : mscoree: Always base the config file path on the main exe.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 052113c0b6d076019e9e2ba5e0641caed68d041d URL: https://source.winehq.org/git/wine.git/?a=commit;h=052113c0b6d076019e9e2ba5… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Aug 27 15:20:25 2021 -0500 mscoree: Always base the config file path on the main exe. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 51522c57d83..d47492b7d4d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -137,7 +137,7 @@ static void domain_restore(MonoDomain *prev_domain) static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *config_path, MonoDomain **result) { - WCHAR config_dir[MAX_PATH]; + WCHAR exe_config[MAX_PATH]; WCHAR base_dir[MAX_PATH]; char *base_dirA, *config_pathA, *slash; HRESULT res=S_OK; @@ -151,18 +151,10 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf if (!config_path) { - DWORD len = ARRAY_SIZE(config_dir); + GetModuleFileNameW(NULL, exe_config, MAX_PATH); + lstrcatW(exe_config, L".config"); - static const WCHAR machine_configW[] = {'\\','C','O','N','F','I','G','\\','m','a','c','h','i','n','e','.','c','o','n','f','i','g',0}; - - res = ICLRRuntimeInfo_GetRuntimeDirectory(&This->version->ICLRRuntimeInfo_iface, - config_dir, &len); - if (FAILED(res)) - goto end; - - lstrcatW(config_dir, machine_configW); - - config_path = config_dir; + config_path = exe_config; } config_pathA = WtoA(config_path);

1 0

Michael Stefaniuc : dhtmled.ocx: Forward ConnectionPoint_Release() to a release method.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 8756ae39632cba6d6548d4c1e4eaa21e98353813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8756ae39632cba6d6548d4c1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Aug 29 14:00:16 2021 +0200 dhtmled.ocx: Forward ConnectionPoint_Release() to a release method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 9e08a4f5c95..226fc7856ed 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -1647,7 +1647,7 @@ static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - return IConnectionPointContainer_AddRef(&This->dhed->IConnectionPointContainer_iface); + return IConnectionPointContainer_Release(&This->dhed->IConnectionPointContainer_iface); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid)

1 0

Michael Stefaniuc : riched20/tests: Don't cast NULL.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: b701c3df99fbd6d4df7eaa11327bb11db95d8676 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b701c3df99fbd6d4df7eaa11… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 27 22:46:37 2021 +0200 riched20/tests: Don't cast NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d5a9844b1fc..9449c6b58cc 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3323,7 +3323,7 @@ static void test_InsertObject(void) received_reo.polesite = (IOleClientSite *)0xdeadbeef; hr = IRichEditOle_GetObject(reole, 2, &received_reo, REO_GETOBJ_NO_INTERFACES); ok(hr == S_OK, "IRichEditOle_GetObject failed: 0x%08x\n", hr); - ok(received_reo.polesite == (IOleClientSite *)NULL, "Got wrong site interface.\n"); + ok(received_reo.polesite == NULL, "Got wrong site interface.\n"); CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, REO_IOB_USE_CP, REO_GETOBJ_ALL_INTERFACES, 1, NULL, NULL, reo3.polesite, 3);

1 0

Zebediah Figura : shlwapi/tests: Use the public definition of DATABLOCK_HEADER.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: cc588ac8b1c21974044b80995a81ccdbd9e251e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc588ac8b1c21974044b8099… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Aug 28 17:10:45 2021 -0500 shlwapi/tests: Use the public definition of DATABLOCK_HEADER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/clist.c | 121 +++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc588ac8b1c21974044b…

1 0

Piotr Caban : concrt140: Avoid forwarding to msvcp120 by duplicating msvcp90/details.c.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 05235df044157f23174860aa27680eec3aa960bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=05235df044157f23174860aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Aug 28 19:28:18 2021 +0200 concrt140: Avoid forwarding to msvcp120 by duplicating msvcp90/details.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/Makefile.in | 3 +- dlls/concrt140/concrt140.c | 64 ++- dlls/concrt140/concrt140.spec | 110 ++-- dlls/concrt140/details.c | 1112 +++++++++++++++++++++++++++++++++++++++++ dlls/concrt140/details.h | 35 ++ dlls/msvcp90/details.c | 2 + 6 files changed, 1264 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05235df044157f231748…

1 0

Hermès Bélusca-Maïto : shlwapi: SHAddDataBlock() returns BOOL, not HRESULT.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 2b37b075a6924cb1d4c6c0b7de59ff3c51dcf9eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b37b075a6924cb1d4c6c0b7… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Sat Aug 28 17:10:47 2021 -0500 shlwapi: SHAddDataBlock() returns BOOL, not HRESULT. Signed-off-by: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/clist.c | 10 +++++----- dlls/shlwapi/tests/clist.c | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index 52bee37c9e4..47bd8d7392f 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -65,7 +65,7 @@ static inline LPDATABLOCK_HEADER NextItem(LPDBLIST lpList) * the call returns S_OK but does not actually add the element. * See SHWriteDataBlockList. */ -HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) +BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) { LPDATABLOCK_HEADER lpInsertAt = NULL; ULONG ulSize; @@ -73,11 +73,11 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt TRACE("(%p,%p)\n", lppList, lpNewItem); if(!lppList || !lpNewItem ) - return E_INVALIDARG; + return FALSE; if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || lpNewItem->dwSignature == CLIST_ID_CONTAINER) - return S_OK; + return FALSE; ulSize = lpNewItem->cbSize; @@ -134,9 +134,9 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt lpInsertAt = NextItem(lpInsertAt); lpInsertAt->cbSize = 0; - return lpNewItem->cbSize; + return TRUE; } - return S_OK; + return FALSE; } /************************************************************************* diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 8c63f31af7b..0c914d608e5 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -289,6 +289,7 @@ static void test_CList(void) DATABLOCK_HEADER *inserted; BYTE buff[64]; unsigned int i; + BOOL ret; if (!pSHWriteDataBlockList || !pSHReadDataBlockList || !pSHFreeDataBlockList || !pSHAddDataBlock || !pSHRemoveDataBlock || !pSHFindDataBlock) @@ -304,10 +305,10 @@ static void test_CList(void) for (i = 0; i < item->cbSize; i++) buff[sizeof(DATABLOCK_HEADER) + i] = i * 2; - hRet = pSHAddDataBlock(&list, inserted); - ok(hRet > S_OK, "failed list add\n"); + ret = pSHAddDataBlock(&list, inserted); + ok(ret == TRUE, "got %d\n", ret); - if (hRet > S_OK) + if (ret == TRUE) { ok(list && list->cbSize, "item not added\n"); @@ -381,10 +382,11 @@ static void test_CList(void) inserted->cbSize = sizeof(DATABLOCK_HEADER) - 1; inserted->dwSignature = 33; - /* The call succeeds but the item is not inserted, except on some early - * versions which return failure. Wine behaves like later versions. - */ - pSHAddDataBlock(&list, inserted); + ret = pSHAddDataBlock(NULL, inserted); + ok(!ret, "got %d\n", ret); + + ret = pSHAddDataBlock(&list, inserted); + ok(!ret, "got %d\n", ret); inserted = pSHFindDataBlock(list, 33); ok(inserted == NULL, "inserted bad element size\n"); @@ -393,8 +395,8 @@ static void test_CList(void) inserted->cbSize = 44; inserted->dwSignature = ~0U; - /* See comment above, some early versions fail this call */ - pSHAddDataBlock(&list, inserted); + ret = pSHAddDataBlock(&list, inserted); + ok(!ret, "got %d\n", ret); item = clist_items;

1 0