On 05/31/2018 02:32 AM, Alexandre Julliard wrote:
Zebediah Figura <zfigura(a)codeweavers.com> writes:
@@ -75,9 +75,16 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) return ++ptr; }
+static BOOL is_wine_loader(const WCHAR *module) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR wine64W[] = {'w','i','n','e','6','4',0}; + const WCHAR *filename = get_filename(module, NULL); + return !strcmpW(filename, wineW) || !strcmpW(filename, wine64W); +} + static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { - const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l;
You still need to use get_wine_loader_name(). The loader isn't necessarily named "wine", that's why we have the WINELOADER variable.
Thanks; I'll send an updated patch that checks WINELOADER.