diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-01-29 10:26:28 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-01-31 13:49:48 +0000 |
| commit | 4a79cf2e1ab056faaddd252aa56520435b318a56 (patch) | |
| tree | cd1c0201340669bf17a62212a2b9b7ad9edac352 /ui/gtk/main.c | |
| parent | 057b8d7dde25f638a13de45d8e3fcb51da7fb28d (diff) | |
Switch from QLibrary to ws_load_library.
From the comments in qlibrary_win.cpp:
// We make the following attempts at locating the library:
[ ... ]
// Windows
// if (absolute)
// fileName
// fileName + ".dll"
// else
// fileName + ".dll"
// fileName
We were passing "riched20.dll" to QLibrary, which meant that it searched
for "riched20.dll.dll" first.
Switch to ws_load_library, which we use elsewhere and which has much
safer default behavior.
Change-Id: Ic8f0cf5686c9b1856d37e76be4404d6236c076e5
Reviewed-on: https://code.wireshark.org/review/13607
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 7acbd6c2a2..fef29535bd 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -3440,7 +3440,7 @@ WinMain (struct HINSTANCE__ *hInstance, comm_ctrl.dwICC = ICC_WIN95_CLASSES; InitCommonControlsEx(&comm_ctrl); - /* RichEd20.DLL is needed for filter entries. */ + /* RichEd20.DLL is needed for native file dialog filter entries. */ ws_load_library("riched20.dll"); set_has_console(FALSE); |