January 2020 - Wine-Commits

Zebediah Figura : wininet/tests: Don't test that the URL cache is used for persistent cookies.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 4928c623dc7f3b7f2355cf61c9f97784ff2380fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4928c623dc7f3b7f2355cf61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 14:47:42 2020 -0600 wininet/tests: Don't test that the URL cache is used for persistent cookies. This seems to be an implementation detail, which is no longer true in Windows 1709+. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 13b2930988..b94c0647e2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -376,7 +376,6 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; - CHAR user[256]; WCHAR wbuf[1024]; static const WCHAR testing_example_comW[] = @@ -530,25 +529,16 @@ static void test_complicated_cookie(void) ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - len = sizeof(user); - ret = GetUserNameA(user, &len); - ok(ret, "GetUserName failed with error %d\n", GetLastError()); - for(; len>0; len--) - user[len-1] = tolower(user[len-1]); - - sprintf(buffer, "Cookie:%s(a)testing.example.com/", user); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + len = sizeof(buffer); + ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret, "got error %u\n", GetLastError()); + ok(len == 24, "got len %u\n", len); + ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); - /* try setting cookie for different domain */ ret = InternetSetCookieA("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); ok(!ret, "InternetSetCookie succeeded\n");

1 0

Erich E. Hoover : webservices: Use sscanf to convert strings to doubles.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 6d70b1a66e01315dedf27d65738b8f050552d7ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d70b1a66e01315dedf27d65… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Jan 7 12:11:25 2020 +0100 webservices: Use sscanf to convert strings to doubles. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 5 ++ dlls/webservices/reader.c | 105 +++++++++------------------------ dlls/webservices/tests/reader.c | 3 + dlls/webservices/webservices_private.h | 2 + include/msvcrt/stdio.h | 1 + 5 files changed, 39 insertions(+), 77 deletions(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 6801465f84..9b32369fd4 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -49,6 +50,8 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +_locale_t c_locale; + /****************************************************************** * DllMain (webservices.@) */ @@ -59,11 +62,13 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: webservices_instance = hinst; DisableThreadLibraryCalls( hinst ); + c_locale = _create_locale( LC_ALL, "C" ); break; case DLL_PROCESS_DETACH: if (reserved) break; if (winsock_loaded) WSACleanup(); + _free_locale( c_locale ); break; } return TRUE; diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 181739650e..b328bb779e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <assert.h> #include <float.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -3726,15 +3727,13 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) { + BOOL found_sign = FALSE, found_exponent = FALSE, found_digit = FALSE, found_decimal = FALSE; static const unsigned __int64 nan = 0xfff8000000000000; static const unsigned __int64 inf = 0x7ff0000000000000; static const unsigned __int64 inf_min = 0xfff0000000000000; - HRESULT hr = WS_E_INVALID_FORMAT; - const unsigned char *p = str, *q; - int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; - unsigned __int64 val = 0, tmp; - long double exp_val = 1.0, exp_mul = 10.0; - unsigned int fpword = _control87( 0, 0 ); + const char *p = (const char *)str; + double tmp; + ULONG i; while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3756,88 +3755,40 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) return S_OK; } - *ret = 0.0; - if (*p == '-') - { - sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - if (!len) return S_OK; - - _control87( _MCW_EM | _RC_NEAR | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); - - q = p; - while (len && isdigit( *q )) { q++; len--; } - have_digits = nb_digits = q - p; - for (i = 0; i < nb_digits; i++) + for (i = 0; i < len; i++) { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) + if (p[i] >= '0' && p[i] <= '9') { - for (; i < nb_digits; i++) exp++; - break; + found_digit = TRUE; + continue; } - val = tmp; - } - - if (len) - { - if (*q == '.') + if (!found_sign && !found_digit && (p[i] == '+' || p[i] == '-')) { - p = ++q; len--; - while (len && isdigit( *q )) { q++; len--; }; - have_digits |= nb_digits = q - p; - for (i = 0; i < nb_digits; i++) - { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) break; - val = tmp; - exp--; - } + found_sign = TRUE; + continue; } - if (len > 1 && tolower(*q) == 'e') + if (!found_exponent && found_digit && (p[i] == 'e' || p[i] == 'E')) { - if (!have_digits) goto done; - p = ++q; len--; - if (*p == '-') - { - exp_sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - - q = p; - while (len && isdigit( *q )) { q++; len--; }; - nb_digits = q - p; - if (!nb_digits || len) goto done; - for (i = 0; i < nb_digits; i++) - { - if (exp_tmp > MAX_INT32 / 10 || (exp_tmp = exp_tmp * 10 + p[i] - '0') < 0) - exp_tmp = MAX_INT32; - } - exp_tmp *= exp_sign; - - if (exp < 0 && exp_tmp < 0 && exp + exp_tmp >= 0) exp = MIN_INT32; - else if (exp > 0 && exp_tmp > 0 && exp + exp_tmp < 0) exp = MAX_INT32; - else exp += exp_tmp; + found_exponent = found_decimal = TRUE; + found_digit = found_sign = FALSE; + continue; + } + if (!found_decimal && p[i] == '.') + { + found_decimal = TRUE; + continue; } + return WS_E_INVALID_FORMAT; } - if (!have_digits || len) goto done; - - if ((neg_exp = exp < 0)) exp = -exp; - for (; exp; exp >>= 1) + if (!found_digit && !found_exponent) { - if (exp & 1) exp_val *= exp_mul; - exp_mul *= exp_mul; + *ret = 0; + return S_OK; } - *ret = sign * (neg_exp ? val / exp_val : val * exp_val); - hr = S_OK; - -done: - _control87( fpword, _MCW_EM | _MCW_RC | _MCW_PC ); - return hr; + if (_snscanf_l( p, len, "%lf", c_locale, &tmp ) != 1) return WS_E_INVALID_FORMAT; + *ret = tmp; + return S_OK; } static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 70623052de..96eee2cf77 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3650,7 +3650,10 @@ static void test_double(void) {"<t>-0.0</t>", S_OK, 0x8000000000000000}, {"<t>+0.0</t>", S_OK, 0}, {"<t>-</t>", S_OK, 0}, + {"<t>-.</t>", S_OK, 0}, {"<t>+</t>", S_OK, 0}, + {"<t>+.</t>", S_OK, 0}, + {"<t>.</t>", S_OK, 0}, {"<t>.0</t>", S_OK, 0}, {"<t>0.</t>", S_OK, 0}, {"<t>0</t>", S_OK, 0}, diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b12032060f..6f2b90dad2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,6 +18,8 @@ #include "winhttp.h" +_locale_t c_locale DECLSPEC_HIDDEN; + #define STREAM_BUFSIZE 4096 struct xmlbuf diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6d0aaeaa6c..fa81f3d536 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int WINAPIV sprintf_s(char*,size_t,const char*,...); int WINAPIV _scprintf(const char *, ...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); +int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*);

1 0

Zebediah Figura : wininet/tests: Simplify test_InternetErrorDlg().
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: af9d246952b7aaf8f557ec1b85cbb4bce1245227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af9d246952b7aaf8f557ec1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 14:47:43 2020 -0600 wininet/tests: Simplify test_InternetErrorDlg(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index b94c0647e2..c7525f796b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1459,7 +1459,7 @@ static void test_Option_PerConnectionOptionA(void) static void test_InternetErrorDlg(void) { HINTERNET ses, con, req; - DWORD res, flags; + DWORD res; HWND hwnd; ULONG i; static const struct { @@ -1486,12 +1486,9 @@ static void test_InternetErrorDlg(void) { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO }, { ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION, ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_SEC_CERT_REVOKED , ERROR_CANCELLED, 0 }, - { 0, ERROR_NOT_SUPPORTED } }; - flags = 0; - - res = InternetErrorDlg(NULL, NULL, 12055, flags, NULL); + res = InternetErrorDlg(NULL, NULL, ERROR_INTERNET_SEC_CERT_ERRORS, 0, NULL); ok(res == ERROR_INVALID_HANDLE, "Got %d\n", res); ses = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -1504,27 +1501,28 @@ static void test_InternetErrorDlg(void) /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */ for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - res = InternetErrorDlg(NULL, req, i, flags, NULL); + res = InternetErrorDlg(NULL, req, i, 0, NULL); ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); } hwnd = GetDesktopWindow(); ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError()); - flags = FLAGS_ERROR_UI_FLAGS_NO_UI; for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected, test_flags, j; + DWORD expected = ERROR_NOT_SUPPORTED, test_flags = 0, j; - for(j = 0; no_ui_res[j].error != 0; ++j) - if(no_ui_res[j].error == i) - break; - - test_flags = no_ui_res[j].test_flags; - expected = no_ui_res[j].res; + for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) + { + if (no_ui_res[j].error == i) + { + test_flags = no_ui_res[j].test_flags; + expected = no_ui_res[j].res; + } + } /* Try an invalid request handle */ - res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, flags, NULL); + res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); if(res == ERROR_CALL_NOT_IMPLEMENTED) { ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); @@ -1540,7 +1538,7 @@ static void test_InternetErrorDlg(void) if(i == ERROR_INTERNET_SEC_CERT_REVOKED) continue; /* Interactive (XP, Win7) */ - res = InternetErrorDlg(hwnd, req, i, flags, NULL); + res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); /* Handle some special cases */ switch(i) @@ -1571,7 +1569,7 @@ static void test_InternetErrorDlg(void) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ - res = InternetErrorDlg(NULL, req, i, flags, NULL); + res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1580,7 +1578,7 @@ static void test_InternetErrorDlg(void) if(test_flags & FLAG_NEEDREQ) expected = ERROR_INVALID_PARAMETER; - res = InternetErrorDlg(hwnd, NULL, i, flags, NULL); + res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); }

1 0

Jacek Caban : include: Add roerrorapi.h header.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: c1e73583111f83d03898f73c9c2283040dab8638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e73583111f83d03898f73c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 7 20:45:17 2020 +0100 include: Add roerrorapi.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/roerrorapi.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cbad4d604f..8a05f5d01c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -558,6 +558,7 @@ SOURCES = \ rmxfguid.h \ rmxftmpl.x \ roapi.h \ + roerrorapi.h \ roparameterizediid.idl \ row.idl \ rowchg.idl \ diff --git a/include/roerrorapi.h b/include/roerrorapi.h new file mode 100644 index 0000000000..dd9c7f16ec --- /dev/null +++ b/include/roerrorapi.h @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ROERROR_H +#define _ROERROR_H + +#include <hstring.h> +#include <restrictederrorinfo.h> +#include <rpc.h> + +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); + +#endif /* _ROERROR_H */

1 0

Nikolay Sivov : kernel32: Fix spec entries for GetLongPathName().
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 47c691a27c5e8d3ea16f517147fd900d91f590a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c691a27c5e8d3ea16f5171… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 12:48:29 2020 +0300 kernel32: Fix spec entries for GetLongPathName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec | 4 ++-- dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec | 4 ++-- dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec | 4 ++-- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec index 612e491f89..9298909a70 100644 --- a/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec +++ b/dlls/api-ms-win-core-file-l1-1-0/api-ms-win-core-file-l1-1-0.spec @@ -45,8 +45,8 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives -@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA -@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetLongPathNameA(str ptr long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr ptr long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetVolumeInformationByHandleW(ptr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationByHandleW diff --git a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec index 1aba68d18b..878c1db5da 100644 --- a/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec +++ b/dlls/api-ms-win-core-file-l1-2-0/api-ms-win-core-file-l1-2-0.spec @@ -45,8 +45,8 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives -@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA -@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetLongPathNameA(str ptr long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr ptr long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec index 5bf5cb3b55..61fedddd34 100644 --- a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -47,8 +47,8 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW @ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives -@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA -@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetLongPathNameA(str ptr long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr ptr long) kernel32.GetLongPathNameW @ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW @ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW @ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c115fd3d75..a14bed04be 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -711,10 +711,10 @@ @ stdcall GetLogicalDrives() @ stdcall -import GetLogicalProcessorInformation(ptr ptr) @ stdcall -import GetLogicalProcessorInformationEx(long ptr ptr) -@ stdcall -import GetLongPathNameA (str long long) +@ stdcall -import GetLongPathNameA(str ptr long) # @ stub GetLongPathNameTransactedA # @ stub GetLongPathNameTransactedW -@ stdcall -import GetLongPathNameW (wstr long long) +@ stdcall -import GetLongPathNameW(wstr ptr long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index afa3b0192f..f36d4d525c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -549,8 +549,8 @@ @ stdcall GetLogicalDrives() kernel32.GetLogicalDrives @ stdcall GetLogicalProcessorInformation(ptr ptr) @ stdcall GetLogicalProcessorInformationEx(long ptr ptr) -@ stdcall GetLongPathNameA(str long long) -@ stdcall GetLongPathNameW(wstr long long) +@ stdcall GetLongPathNameA(str ptr long) +@ stdcall GetLongPathNameW(wstr ptr long) # @ stub GetMappedFileNameA # @ stub GetMappedFileNameW # @ stub GetMemoryErrorHandlingCapabilities

1 0

Nikolay Sivov : jscript/tests: Add missing checks for Close() calls (Coverity).
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: aa3eb3015f7af9e6260d137163424ceb933d3748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa3eb3015f7af9e6260d1371… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 22:34:06 2020 +0300 jscript/tests: Add missing checks for Close() calls (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e3f272d46c..d8c74d4b17 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -230,6 +230,18 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } +static void close_script(IActiveScript *script) +{ + HRESULT hres; + ULONG ref; + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + ref = IActiveScript_Release(script); + ok(!ref, "ref=%u\n", ref); +} + static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -2408,23 +2420,22 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * IActiveScriptParse_Release(parser); - if(engine_ret) { + if(engine_ret) *engine_ret = engine; - }else { - IActiveScript_Close(engine); - IActiveScript_Release(engine); - } + else + close_script(engine); + return hres; } static void test_retval(void) { - BSTR str = a2bstr("reportSuccess(), true"); IActiveScriptParse *parser; IActiveScript *engine; SCRIPTSTATE state; VARIANT res; HRESULT hres; + BSTR str; engine = create_script(); if(!engine) @@ -2445,6 +2456,7 @@ static void test_retval(void) ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); CHECK_CALLED(GetItemInfo_testVal); + str = a2bstr("reportSuccess(), true"); V_VT(&res) = VT_NULL; SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); @@ -2453,6 +2465,7 @@ static void test_retval(void) CHECK_CALLED(global_success_i); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&res) == VT_EMPTY, "V_VT(&res) = %d\n", V_VT(&res)); + SysFreeString(str); hres = IActiveScript_GetScriptState(engine, &state); ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); @@ -2461,12 +2474,9 @@ static void test_retval(void) hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); - hres = IActiveScript_Close(engine); - ok(hres == S_OK, "Close failed: %08x\n", hres); - IActiveScriptParse_Release(parser); - IActiveScript_Release(engine); - SysFreeString(str); + + close_script(engine); } static void test_default_value(void) @@ -2697,8 +2707,7 @@ static void test_eval(void) IDispatchEx_Release(script_dispex); IActiveScriptParse_Release(parser); - IActiveScript_Close(engine); - IActiveScript_Release(engine); + close_script(engine); } struct bom_test

1 0

Nikolay Sivov : shell32/tests: Remove workarounds for SHGetFolderLocation().
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 5b66af0204f2b0567b83835bf0d7ed379a432c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b66af0204f2b0567b83835b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 00:08:21 2020 +0300 shell32/tests: Remove workarounds for SHGetFolderLocation(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 62 ++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4ea2ef14cd..8161330b1e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -86,8 +86,6 @@ struct shellExpectedValues { static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderLocation)(HWND, int, HANDLE, DWORD, - LPITEMIDLIST *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); @@ -196,7 +194,6 @@ static void loadShell32(void) GET_PROC(DllGetVersion) GET_PROC(SHGetFolderPathA) GET_PROC(SHGetFolderPathEx) - GET_PROC(SHGetFolderLocation) GET_PROC(SHGetKnownFolderPath) GET_PROC(SHSetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) @@ -1318,22 +1315,19 @@ static void test_parameters(void) char path[MAX_PATH]; HRESULT hr; - if (pSHGetFolderLocation) - { - /* check a bogus CSIDL: */ - pidl = NULL; - hr = pSHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); - ok(hr == E_INVALIDARG, "got 0x%08x, expected E_INVALIDARG\n", hr); - if (hr == S_OK) IMalloc_Free(pMalloc, pidl); + /* check a bogus CSIDL: */ + pidl = NULL; + hr = SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); + ok(hr == E_INVALIDARG, "got 0x%08x, expected E_INVALIDARG\n", hr); + if (hr == S_OK) IMalloc_Free(pMalloc, pidl); - /* check a bogus user token: */ - pidl = NULL; - hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); - ok(hr == E_FAIL || hr == E_HANDLE, "got 0x%08x, expected E_FAIL or E_HANDLE\n", hr); - if (hr == S_OK) IMalloc_Free(pMalloc, pidl); + /* check a bogus user token: */ + pidl = NULL; + hr = SHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); + ok(hr == E_FAIL || hr == E_HANDLE, "got 0x%08x, expected E_FAIL or E_HANDLE\n", hr); + if (hr == S_OK) IMalloc_Free(pMalloc, pidl); - /* a NULL pidl pointer crashes, so don't test it */ - } + /* a NULL pidl pointer crashes, so don't test it */ if (pSHGetSpecialFolderLocation) { @@ -1381,11 +1375,8 @@ static BYTE testSHGetFolderLocation(int folder) HRESULT hr; BYTE ret = 0xff; - /* treat absence of function as success */ - if (!pSHGetFolderLocation) return TRUE; - pidl = NULL; - hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, folder, NULL, 0, &pidl); if (hr == S_OK) { if (pidl) @@ -1399,6 +1390,7 @@ static BYTE testSHGetFolderLocation(int folder) IMalloc_Free(pMalloc, pidl); } } + return ret; } @@ -1468,16 +1460,14 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], int j; BOOL foundTypeMatch = FALSE; - if (pSHGetFolderLocation) - { - type = testSHGetFolderLocation(testEntries[i].folder); - for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) - if (testEntries[i].types[j] == type) - foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, - "%s has unexpected type %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type); - } + type = testSHGetFolderLocation(testEntries[i].folder); + for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) + if (testEntries[i].types[j] == type) + foundTypeMatch = TRUE; + ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + "%s has unexpected type %d (0x%02x)\n", + getFolderName(testEntries[i].folder), type, type); + type = testSHGetSpecialFolderLocation(testEntries[i].folder); for (j = 0, foundTypeMatch = FALSE; !foundTypeMatch && j < testEntries[i].numTypes; j++) @@ -1533,11 +1523,10 @@ static void matchGUID(int folder, const GUID *guid, const GUID *guid_alt) LPITEMIDLIST pidl; HRESULT hr; - if (!pSHGetFolderLocation) return; if (!guid) return; pidl = NULL; - hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, folder, NULL, 0, &pidl); if (hr == S_OK) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -1710,7 +1699,7 @@ static void doChild(const char *arg) "SHGetFolderPath returned 0x%08x, expected 0x80070002\n", hr); pidl = NULL; - hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHGetFolderLocation returned 0x%08x\n", hr); if (hr == S_OK && pidl) IMalloc_Free(pMalloc, pidl); @@ -1780,7 +1769,6 @@ static void test_NonExistentPath(void) HKEY key; if (!pSHGetFolderPathA) return; - if (!pSHGetFolderLocation) return; if (!pSHGetSpecialFolderPathA) return; if (!pSHGetSpecialFolderLocation) return; if (!pSHFileOperationA) return; @@ -2993,10 +2981,6 @@ START_TEST(shellpath) doChild(myARGV[2]); else { - /* Report missing functions once */ - if (!pSHGetFolderLocation) - win_skip("SHGetFolderLocation is not available\n"); - /* first test various combinations of parameters: */ test_parameters();

1 0

Nikolay Sivov : shell32/tests: Use GetLongPathNameA() directly in tests.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: d259c56c8074c55e13b07dfd945ee8a01279b8c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d259c56c8074c55e13b07dfd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 00:08:24 2020 +0300 shell32/tests: Use GetLongPathNameA() directly in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 983c51bbd9..0cf24524a5 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); -static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); static BOOL (WINAPI *pIsProcessDPIAware)(void); @@ -170,19 +169,12 @@ static void test_get_set(void) ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); ok(finddata.cFileName[0] == 0, "unexpected filename '%s'\n", finddata.cFileName); - r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - &IID_IShellLinkW, (LPVOID*)&slW); + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (void **)&slW); ok(r == S_OK, "CoCreateInstance failed (0x%08x)\n", r); - if (!slW /* Win9x */ || !pGetLongPathNameA /* NT4 */) - skip("SetPath with NULL parameter crashes on Win9x and some NT4\n"); - else - { - IShellLinkW_Release(slW); - r = IShellLinkA_SetPath(sl, NULL); - ok(r==E_INVALIDARG || - broken(r==S_OK), /* Some Win95 and NT4 */ - "SetPath returned wrong error (0x%08x)\n", r); - } + IShellLinkW_Release(slW); + + r = IShellLinkA_SetPath(sl, NULL); + ok(r == E_INVALIDARG, "Unexpected hr %#x.\n", r); r = IShellLinkA_SetPath(sl, ""); ok(r==S_OK, "SetPath failed (0x%08x)\n", r); @@ -643,12 +635,6 @@ static void test_load_save(void) HANDLE hf; DWORD r; - if (!pGetLongPathNameA) - { - win_skip("GetLongPathNameA is not available\n"); - return; - } - /* Don't used a fixed path for the test.lnk file */ GetTempPathA(MAX_PATH, lnkfileA); lstrcatA(lnkfileA, lnkfileA_name); @@ -687,7 +673,8 @@ static void test_load_save(void) *p='\0'; /* IShellLink returns path in long form */ - if (!pGetLongPathNameA(mypath, realpath, MAX_PATH)) strcpy( realpath, mypath ); + if (!GetLongPathNameA(mypath, realpath, MAX_PATH)) + strcpy( realpath, mypath ); /* Overwrite the existing lnk file and point it to existing files */ desc.description="test 2"; @@ -755,7 +742,7 @@ static void test_load_save(void) /* Create a temporary non-executable file */ r=GetTempPathA(sizeof(mypath), mypath); ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError()); - r=pGetLongPathNameA(mypath, mydir, sizeof(mydir)); + r = GetLongPathNameA(mypath, mydir, sizeof(mydir)); ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError()); p=strrchr(mydir, '\\'); if (p) @@ -895,13 +882,8 @@ static void test_datalink(void) ok( r == E_FAIL, "CopyDataBlock failed\n"); ok( dar == NULL, "should be null\n"); - if (!pGetLongPathNameA /* NT4 */) - skip("SetPath with NULL parameter crashes on NT4\n"); - else - { - r = IShellLinkW_SetPath(sl, NULL); - ok(r == E_INVALIDARG, "SetPath returned wrong error (0x%08x)\n", r); - } + r = IShellLinkW_SetPath(sl, NULL); + ok(r == E_INVALIDARG, "Unexpected hr %#x.\n", r); r = IShellLinkW_SetPath(sl, lnk); ok(r == S_OK, "SetPath failed\n"); @@ -1478,7 +1460,6 @@ START_TEST(shelllink) pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); - pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); pIsProcessDPIAware = (void *)GetProcAddress(huser32, "IsProcessDPIAware");

1 0

Nikolay Sivov : shell32/tests: Get rid of SHGetMalloc() in tests.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 9a2e36b2141096bcc1a68c84b9c5ddd29207b832 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a2e36b2141096bcc1a68c84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 00:08:22 2020 +0300 shell32/tests: Get rid of SHGetMalloc() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 12 +++--------- dlls/shell32/tests/shellpath.c | 23 +++------------------- dlls/shell32/tests/shlfolder.c | 44 ++++++++++++++++++------------------------ 3 files changed, 25 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a2e36b2141096bcc1a6…

1 0

Nikolay Sivov : shell32/tests: Use GetShortPathNameA() directly in tests.
by Alexandre Julliard Jan. 7, 2020

Jan. 7, 2020

Module: wine Branch: master Commit: 6bfc988ea47966737803c35b981ea367dd7a4562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bfc988ea47966737803c35b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 00:08:25 2020 +0300 shell32/tests: Use GetShortPathNameA() directly in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 0cf24524a5..2c2ee94c17 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); -static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); static BOOL (WINAPI *pIsProcessDPIAware)(void); @@ -767,7 +766,7 @@ static void test_load_save(void) create_lnk(lnkfile, &desc, 0); check_lnk(lnkfile, &desc, 0x0); - r=pGetShortPathNameA(mydir, mypath, sizeof(mypath)); + r = GetShortPathNameA(mydir, mypath, sizeof(mypath)); ok(r<sizeof(mypath), "GetShortPathName failed (%d), err %d\n", r, GetLastError()); strcpy(realpath, mypath); @@ -1452,7 +1451,6 @@ START_TEST(shelllink) { HRESULT r; HMODULE hmod = GetModuleHandleA("shell32.dll"); - HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); HMODULE huser32 = GetModuleHandleA("user32.dll"); pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); @@ -1460,7 +1458,6 @@ START_TEST(shelllink) pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); - pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); pIsProcessDPIAware = (void *)GetProcAddress(huser32, "IsProcessDPIAware");

1 0