wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview () is called from a custom action.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 4bb40d1a95e525c63f1f6f1f20f0c054d46f2fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bb40d1a95e525c63f1f6f1f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:05 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 14 ++------------ dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a3e5481..153ff21 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4216,19 +4216,9 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview ) TRACE("%d %p\n", hdb, phPreview); - db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if (!db) - { - MSIHANDLE remote_database = msi_get_remote( hdb ); - if (!remote_database) - return ERROR_INVALID_HANDLE; - - *phPreview = 0; - - WARN("MsiEnableUIPreview not allowed during a custom action!\n"); + if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; - return ERROR_FUNCTION_FAILED; - } preview = MSI_EnableUIPreview( db ); if (preview) { diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index b8da55e..454966e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1150,7 +1150,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); sprintf(package_name, "#%u", db); r = MsiOpenPackageA(package_name, &package);

1 0

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport( ) is called from a custom action.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 19420f5f7c146f0ade010b9fbfaf21f926ef10a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19420f5f7c146f0ade010b9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:04 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 13 ++----------- dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index d039903..11ed27d 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -870,17 +870,8 @@ UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFil TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename)); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote( handle ); - if ( !remote_database ) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseImport not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseImport( db, szFolder, szFilename ); msiobj_release( &db->hdr ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index d9d4689..b8da55e 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1138,7 +1138,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseImportA(db, path, "bogus.idt"); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseCommit(db); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r);

1 0

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport( ) is called from a custom action.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 3ff7d30520e4450fd9efbf5569eb28b82fb81aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff7d30520e4450fd9efbf55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:03 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 13 ++----------- dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 1992661..d039903 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1194,17 +1194,8 @@ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable, TRACE("%x %s %s %s\n", handle, debugstr_w(szTable), debugstr_w(szFolder), debugstr_w(szFilename)); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote(handle); - if ( !remote_database ) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseExport not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseExport( db, szTable, szFolder, szFilename ); msiobj_release( &db->hdr ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 526c4a2..d9d4689 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1135,7 +1135,7 @@ static void test_invalid_functions(MSIHANDLE hinst) GetCurrentDirectoryA(sizeof(path), path); r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseImportA(db, path, "bogus.idt"); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);

1 0

Zebediah Figura : msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() is called from a custom action.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: ed5f4bd14f5cece4bca63918b924606a09a3300d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5f4bd14f5cece4bca63918… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:02 2019 -0500 msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 14 ++------------ dlls/msi/tests/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index bea08c2..862805f 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -884,18 +884,8 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, i if (error_cond) FIXME( "ignoring error conditions\n" ); - db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if (!db) - { - MSIHANDLE remote; - - if (!(remote = msi_get_remote(hdb))) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseApplyTransform not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); msiobj_release( &db->hdr ); diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 9e9e2bf..526c4a2 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1128,7 +1128,7 @@ static void test_invalid_functions(MSIHANDLE hinst) todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r);

1 0

Zebediah Figura : msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 60b1fd7e8764ab63d79382c1805d4c007a6be332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b1fd7e8764ab63d79382c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:01 2019 -0500 msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46812 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 13 ++----------- dlls/msi/tests/custom.c | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 4537ed5..1992661 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1993,17 +1993,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) TRACE("%d\n", handle); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote(handle); - if ( !remote_database ) - return MSIDBSTATE_ERROR; - - WARN("MsiGetDatabaseState not allowed during a custom action!\n"); - - return MSIDBSTATE_READ; - } + if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) + return MSIDBSTATE_ERROR; if (db->mode != MSIDBOPEN_READONLY ) ret = MSIDBSTATE_WRITE; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6ae5bfc..9e9e2bf 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1119,7 +1119,7 @@ static void test_invalid_functions(MSIHANDLE hinst) UINT r; r = MsiGetDatabaseState(hinst); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); db = MsiGetActiveDatabase(hinst); ok(hinst, db, "MsiGetActiveDatabase failed\n"); @@ -1147,7 +1147,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiGetDatabaseState(db); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);

1 0

Zebediah Figura : msi/tests: Test calling more functions from custom actions.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: ae0298d46e8d4b7b689783b9c459ceafc3631780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0298d46e8d4b7b689783b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 25 22:42:00 2019 -0500 msi/tests: Test calling more functions from custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 54 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c7ce4d2..6ae5bfc 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1112,11 +1112,57 @@ static void test_costs(MSIHANDLE hinst) ok(hinst, sz == 2, "got size %u\n", sz); } +static void test_invalid_functions(MSIHANDLE hinst) +{ + char path[MAX_PATH], package_name[20]; + MSIHANDLE db, preview, package; + UINT r; + + r = MsiGetDatabaseState(hinst); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + db = MsiGetActiveDatabase(hinst); + ok(hinst, db, "MsiGetActiveDatabase failed\n"); + + r = MsiDatabaseGenerateTransformA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + + GetCurrentDirectoryA(sizeof(path), path); + r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseImportA(db, path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseCommit(db); + ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiDatabaseMergeA(db, db, "MergeErrors"); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiGetDatabaseState(db); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + r = MsiEnableUIPreview(db, &preview); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + sprintf(package_name, "#%u", db); + r = MsiOpenPackageA(package_name, &package); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + MsiCloseHandle(db); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) { - UINT res; IUnknown *unk = NULL; HRESULT hr; @@ -1131,11 +1177,6 @@ UINT WINAPI main_test(MSIHANDLE hinst) ok(hinst, hr == S_OK, "got %#x\n", hr); CoUninitialize(); - /* Test MsiGetDatabaseState() */ - res = MsiGetDatabaseState(hinst); - todo_wine - ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); - test_props(hinst); test_db(hinst); test_doaction(hinst); @@ -1144,6 +1185,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_feature_states(hinst); test_format_record(hinst); test_costs(hinst); + test_invalid_functions(hinst); return ERROR_SUCCESS; }

1 0

Ken Thomases : .editorconfig: Remove the trim_trailing_whitespace setting.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 692d7c6f5c2f5b5d96f1f6ab6889bac3695a9215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=692d7c6f5c2f5b5d96f1f6ab… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 25 19:17:09 2019 -0500 .editorconfig: Remove the trim_trailing_whitespace setting. Editors don't behave consistently. Some remove trailing whitespace from the entire file, not just touched lines, on save. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .editorconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 289038d..82f5734 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,6 @@ indent_style = space indent_size = 4 tab_width = 8 charset = utf-8 -trim_trailing_whitespace = true insert_final_newline = true max_line_length = 100

1 0

Hans Leidekker : msi: Avoid a crash in RemoveFiles if the component directory is invalid.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: c7f323107b3b956d206d8d0ee28851d60f19841c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f323107b3b956d206d8d0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 25 21:12:04 2019 +0100 msi: Avoid a crash in RemoveFiles if the component directory is invalid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46907 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 92a98f1..68b8954 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1645,7 +1645,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) else { MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (folder) remove_folder( folder ); } } return ERROR_SUCCESS;

1 0

Alexandre Julliard : imagehlp: Get rid of the custom heap.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: e4b2b82e6c7f84b347a12eaeb314b0026bed87f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4b2b82e6c7f84b347a12eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 25 22:09:07 2019 +0100 imagehlp: Get rid of the custom heap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/access.c | 7 +++---- dlls/imagehlp/imagehlp_main.c | 21 --------------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 66c3036..29315f1 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); */ static LIST_ENTRY image_list = { &image_list, &image_list }; -DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /*********************************************************************** * GetImageConfigInformation (IMAGEHLP.@) @@ -74,12 +73,12 @@ PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) TRACE("(%s, %s)\n", dll_name, dll_path); - image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + image = HeapAlloc(GetProcessHeap(), 0, sizeof(*image)); if (!image) return NULL; if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) { - HeapFree(IMAGEHLP_hHeap, 0, image); + HeapFree(GetProcessHeap(), 0, image); return NULL; } @@ -121,7 +120,7 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) entry->Flink->Blink = entry->Blink; UnMapAndLoad(loaded_image); - HeapFree(IMAGEHLP_hHeap, 0, loaded_image); + HeapFree(GetProcessHeap(), 0, loaded_image); return TRUE; } diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index e505126..183b744 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -25,27 +25,6 @@ #include "imagehlp.h" #include "wine/debug.h" -/**********************************************************************/ -DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; - -/*********************************************************************** - * DllMain (IMAGEHLP.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - IMAGEHLP_hHeap = HeapCreate(0, 0x10000, 0); - break; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - HeapDestroy(IMAGEHLP_hHeap); - break; - } - return TRUE; -} /*********************************************************************** * MarkImageAsRunFromSwap (IMAGEHLP.@)

1 0

Michael Müller : imagehlp: Implement ImageLoad and cleanup ImageUnload.
by Alexandre Julliard 25 Mar '19

25 Mar '19

Module: wine Branch: master Commit: 55a62c739c02135d18aa5af6ede304465cb0e030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a62c739c02135d18aa5af6… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Mar 23 02:20:54 2019 +0100 imagehlp: Implement ImageLoad and cleanup ImageUnload. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/access.c | 78 ++++++++++++++++++++++++--------------------- dlls/imagehlp/tests/image.c | 12 +++---- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 6a33c0c..66c3036 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** * Data */ - -static PLOADED_IMAGE IMAGEHLP_pFirstLoadedImage=NULL; +static LIST_ENTRY image_list = { &image_list, &image_list }; DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; @@ -69,57 +68,62 @@ DWORD WINAPI GetImageUnusedHeaderBytes( /*********************************************************************** * ImageLoad (IMAGEHLP.@) */ -PLOADED_IMAGE WINAPI ImageLoad(PCSTR DllName, PCSTR DllPath) +PLOADED_IMAGE WINAPI ImageLoad(PCSTR dll_name, PCSTR dll_path) { - PLOADED_IMAGE pLoadedImage; - - FIXME("(%s, %s): stub\n", DllName, DllPath); - - pLoadedImage = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(LOADED_IMAGE)); - if (pLoadedImage) - pLoadedImage->FileHeader = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(IMAGE_NT_HEADERS)); - - return pLoadedImage; + LOADED_IMAGE *image; + + TRACE("(%s, %s)\n", dll_name, dll_path); + + image = HeapAlloc(IMAGEHLP_hHeap, 0, sizeof(*image)); + if (!image) return NULL; + + if (!MapAndLoad(dll_name, dll_path, image, TRUE, TRUE)) + { + HeapFree(IMAGEHLP_hHeap, 0, image); + return NULL; + } + + image->Links.Flink = image_list.Flink; + image->Links.Blink = &image_list; + image_list.Flink->Blink = &image->Links; + image_list.Flink = &image->Links; + + return image; } /*********************************************************************** * ImageUnload (IMAGEHLP.@) */ -BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) +BOOL WINAPI ImageUnload(PLOADED_IMAGE loaded_image) { - LIST_ENTRY *pCurrent, *pFind; + LIST_ENTRY *entry, *mark; + PLOADED_IMAGE image; + + TRACE("(%p)\n", loaded_image); - TRACE("(%p)\n", pLoadedImage); - - if(!IMAGEHLP_pFirstLoadedImage || !pLoadedImage) + /* FIXME: do we really need to check this? */ + mark = &image_list; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) { - /* No image loaded or null pointer */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + image = CONTAINING_RECORD(entry, LOADED_IMAGE, Links); + if (image == loaded_image) + break; } - pFind=&pLoadedImage->Links; - pCurrent=&IMAGEHLP_pFirstLoadedImage->Links; - while((pCurrent != pFind) && - (pCurrent != NULL)) - pCurrent = pCurrent->Flink; - if(!pCurrent) + if (entry == mark) { - /* Not found */ - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + /* Not found */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; } - if(pCurrent->Blink) - pCurrent->Blink->Flink = pCurrent->Flink; - else - IMAGEHLP_pFirstLoadedImage = pCurrent->Flink?CONTAINING_RECORD( - pCurrent->Flink, LOADED_IMAGE, Links):NULL; + entry->Blink->Flink = entry->Flink; + entry->Flink->Blink = entry->Blink; - if(pCurrent->Flink) - pCurrent->Flink->Blink = pCurrent->Blink; + UnMapAndLoad(loaded_image); + HeapFree(IMAGEHLP_hHeap, 0, loaded_image); - return FALSE; + return TRUE; } /*********************************************************************** diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 4bc7a90..875d919 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -457,9 +457,9 @@ static void test_image_load(void) if (img) { - todo_wine ok(!strcmp(img->ModuleName, temp_file), + ok(!strcmp(img->ModuleName, temp_file), "unexpected ModuleName, got %s instead of %s\n", img->ModuleName, temp_file); - todo_wine ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); + ok(img->MappedAddress != NULL, "MappedAddress != NULL\n"); if (img->MappedAddress) { ok(!memcmp(img->MappedAddress, &bin.dos_header, sizeof(bin.dos_header)), @@ -468,10 +468,10 @@ static void test_image_load(void) ok(img->FileHeader != NULL, "FileHeader != NULL\n"); if (img->FileHeader) { - todo_wine ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), + ok(!memcmp(img->FileHeader, &bin.nt_headers, sizeof(bin.nt_headers)), "FileHeader doesn't point to IMAGE_NT_HEADERS32\n"); } - todo_wine ok(img->NumberOfSections == 3, + ok(img->NumberOfSections == 3, "unexpected NumberOfSections, got %d instead of 3\n", img->NumberOfSections); if (img->NumberOfSections >= 3) { @@ -485,7 +485,7 @@ static void test_image_load(void) "unexpected name for section 2, expected .idata, got %s\n", (const char *)img->Sections[2].Name); } - todo_wine ok(img->Characteristics == 0x102, + ok(img->Characteristics == 0x102, "unexpected Characteristics, got 0x%x instead of 0x102\n", img->Characteristics); ok(img->fSystemImage == 0, "unexpected fSystemImage, got %d instead of 0\n", img->fSystemImage); @@ -495,7 +495,7 @@ static void test_image_load(void) "unexpected fReadOnly, got %d instead of 1\n", img->fReadOnly); todo_wine ok(img->Version == 1 || broken(!img->Version) /* <= WinXP */, "unexpected Version, got %d instead of 1\n", img->Version); - todo_wine ok(img->SizeOfImage == 0x600, + ok(img->SizeOfImage == 0x600, "unexpected SizeOfImage, got 0x%x instead of 0x600\n", img->SizeOfImage); count = 0xdeadbeef;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019