March 2018 - Wine-devel - list.winehq.org

[PATCH] include: Add WinInet error codes
by Nikolay Sivov 24 Mar '18

24 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/winerror.h | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 2c6ce20b3d..886182ff3d 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3010,6 +3010,85 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define WININET_E_OUT_OF_HANDLES _HRESULT_TYPEDEF_(0x80072ee1) +#define WININET_E_TIMEOUT _HRESULT_TYPEDEF_(0x80072ee2) +#define WININET_E_EXTENDED_ERROR _HRESULT_TYPEDEF_(0x80072ee3) +#define WININET_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x80072ee4) +#define WININET_E_INVALID_URL _HRESULT_TYPEDEF_(0x80072ee5) +#define WININET_E_UNRECOGNIZED_SCHEME _HRESULT_TYPEDEF_(0x80072ee6) +#define WININET_E_NAME_NOT_RESOLVED _HRESULT_TYPEDEF_(0x80072ee7) +#define WININET_E_PROTOCOL_NOT_FOUND _HRESULT_TYPEDEF_(0x80072ee8) +#define WININET_E_INVALID_OPTION _HRESULT_TYPEDEF_(0x80072ee9) +#define WININET_E_BAD_OPTION_LENGTH _HRESULT_TYPEDEF_(0x80072eea) +#define WININET_E_OPTION_NOT_SETTABLE _HRESULT_TYPEDEF_(0x80072eeb) +#define WININET_E_SHUTDOWN _HRESULT_TYPEDEF_(0x80072eec) +#define WININET_E_INCORRECT_USER_NAME _HRESULT_TYPEDEF_(0x80072eed) +#define WININET_E_INCORRECT_PASSWORD _HRESULT_TYPEDEF_(0x80072eee) +#define WININET_E_LOGIN_FAILURE _HRESULT_TYPEDEF_(0x80072eef) +#define WININET_E_INVALID_OPERATION _HRESULT_TYPEDEF_(0x80072ef0) +#define WININET_E_OPERATION_CANCELLED _HRESULT_TYPEDEF_(0x80072ef1) +#define WININET_E_INCORRECT_HANDLE_TYPE _HRESULT_TYPEDEF_(0x80072ef2) +#define WININET_E_INCORRECT_HANDLE_STATE _HRESULT_TYPEDEF_(0x80072ef3) +#define WININET_E_NOT_PROXY_REQUEST _HRESULT_TYPEDEF_(0x80072ef4) +#define WININET_E_REGISTRY_VALUE_NOT_FOUND _HRESULT_TYPEDEF_(0x80072ef5) +#define WININET_E_BAD_REGISTRY_PARAMETER _HRESULT_TYPEDEF_(0x80072ef6) +#define WININET_E_NO_DIRECT_ACCESS _HRESULT_TYPEDEF_(0x80072ef7) +#define WININET_E_NO_CONTEXT _HRESULT_TYPEDEF_(0x80072ef8) +#define WININET_E_NO_CALLBACK _HRESULT_TYPEDEF_(0x80072ef9) +#define WININET_E_REQUEST_PENDING _HRESULT_TYPEDEF_(0x80072efa) +#define WININET_E_INCORRECT_FORMAT _HRESULT_TYPEDEF_(0x80072efb) +#define WININET_E_ITEM_NOT_FOUND _HRESULT_TYPEDEF_(0x80072efc) +#define WININET_E_CANNOT_CONNECT _HRESULT_TYPEDEF_(0x80072efd) +#define WININET_E_CONNECTION_ABORTED _HRESULT_TYPEDEF_(0x80072efe) +#define WININET_E_CONNECTION_RESET _HRESULT_TYPEDEF_(0x80072eff) +#define WININET_E_FORCE_RETRY _HRESULT_TYPEDEF_(0x80072f00) +#define WININET_E_INVALID_PROXY_REQUREST _HRESULT_TYPEDEF_(0x80072f01) +#define WININET_E_NEED_UI _HRESULT_TYPEDEF_(0x80072f02) +#define WININET_E_HANDLE_EXISTS _HRESULT_TYPEDEF_(0x80072f04) +#define WININET_E_SEC_CERT_DATE_INVALID _HRESULT_TYPEDEF_(0x80072f05) +#define WININET_E_SEC_CERT_CN_INVALID _HRESULT_TYPEDEF_(0x80072f06) +#define WININET_E_HTTP_TO_HTTPS_ON_REDIR _HRESULT_TYPEDEF_(0x80072f07) +#define WININET_E_HTTPS_TO_HTTP_ON_REDIR _HRESULT_TYPEDEF_(0x80072f08) +#define WININET_E_MIXED_SECURITY _HRESULT_TYPEDEF_(0x80072f09) +#define WININET_E_CHG_POST_IS_NON_SECURE _HRESULT_TYPEDEF_(0x80072f0a) +#define WININET_E_POST_IS_NON_SECURE _HRESULT_TYPEDEF_(0x80072f0b) +#define WININET_E_CLIENT_AUTH_CERT_NEEDED _HRESULT_TYPEDEF_(0x80072f0c) +#define WININET_E_INVALID_CA _HRESULT_TYPEDEF_(0x80072f0d) +#define WININET_E_CLIENT_AUTH_NOT_SETUP _HRESULT_TYPEDEF_(0x80072f0e) +#define WININET_E_ASYNC_THREAD_FAILED _HRESULT_TYPEDEF_(0x80072f0f) +#define WININET_E_REDIRECT_SCHEME_CHANGE _HRESULT_TYPEDEF_(0x80072f10) +#define WININET_E_DIALOG_PENDING _HRESULT_TYPEDEF_(0x80072f11) +#define WININET_E_RETRY_DIALOG _HRESULT_TYPEDEF_(0x80072f12) +#define WININET_E_NO_NEW_CONTAINERS _HRESULT_TYPEDEF_(0x80072f13) +#define WININET_E_HTTPS_HTTP_SUBMIT_REDIR _HRESULT_TYPEDEF_(0x80072f14) +#define WININET_E_SEC_CERT_ERRORS _HRESULT_TYPEDEF_(0x80072f17) +#define WININET_E_SEC_CERT_REV_FAILED _HRESULT_TYPEDEF_(0x80072f19) +#define WININET_E_HEADER_NOT_FOUND _HRESULT_TYPEDEF_(0x80072f76) +#define WININET_E_DOWNLEVEL_SERVER _HRESULT_TYPEDEF_(0x80072f77) +#define WININET_E_INVALID_SERVER_RESPONSE _HRESULT_TYPEDEF_(0x80072f78) +#define WININET_E_INVALID_HEADER _HRESULT_TYPEDEF_(0x80072f79) +#define WININET_E_INVALID_QUERY_REQUEST _HRESULT_TYPEDEF_(0x80072f7a) +#define WININET_E_HEADER_ALREADY_EXISTS _HRESULT_TYPEDEF_(0x80072f7b) +#define WININET_E_REDIRECT_FAILED _HRESULT_TYPEDEF_(0x80072f7c) +#define WININET_E_SECURITY_CHANNEL_ERROR _HRESULT_TYPEDEF_(0x80072f7d) +#define WININET_E_UNABLE_TO_CACHE_FILE _HRESULT_TYPEDEF_(0x80072f7e) +#define WININET_E_TCPIP_NOT_INSTALLED _HRESULT_TYPEDEF_(0x80072f7f) +#define WININET_E_NOT_REDIRECTED _HRESULT_TYPEDEF_(0x80072f80) +#define WININET_E_COOKIE_NEEDS_CONFIRMATION _HRESULT_TYPEDEF_(0x80072f81) +#define WININET_E_COOKIE_DECLINED _HRESULT_TYPEDEF_(0x80072f82) +#define WININET_E_DISCONNECTED _HRESULT_TYPEDEF_(0x80072f83) +#define WININET_E_SERVER_UNREACHABLE _HRESULT_TYPEDEF_(0x80072f84) +#define WININET_E_PROXY_SERVER_UNREACHABLE _HRESULT_TYPEDEF_(0x80072f85) +#define WININET_E_BAD_AUTO_PROXY_SCRIPT _HRESULT_TYPEDEF_(0x80072f86) +#define WININET_E_UNABLE_TO_DOWNLOAD_SCRIPT _HRESULT_TYPEDEF_(0x80072f87) +#define WININET_E_REDIRECT_NEEDS_CONFIRMATION _HRESULT_TYPEDEF_(0x80072f88) +#define WININET_E_SEC_INVALID_CERT _HRESULT_TYPEDEF_(0x80072f89) +#define WININET_E_SEC_CERT_REVOKED _HRESULT_TYPEDEF_(0x80072f8a) +#define WININET_E_FAILED_DUETOSECURITYCHECK _HRESULT_TYPEDEF_(0x80072f8b) +#define WININET_E_NOT_INITIALIZED _HRESULT_TYPEDEF_(0x80072f8c) +#define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) +#define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.16.2

1 0

Re: Student preparing for GSoC
by Kieran Duggan 24 Mar '18

24 Mar '18

I think the output I attached was misleading. Really I'm just not understanding the output that I'm getting from valgrind. Namely is seems like the memory leaks are happening outside of wine. Should I even care if a memory leak happens in libfontconfig? Does a memory leak there imply that there is an error in Wine? Also now that I'm playing with it more, I'm not even sure if valgrind is actually testing anything. I'll attach the log in case anyone can point me in the right direction On Wed, Mar 21, 2018 at 9:10 PM, Josh DuBois <duboisj(a)codeweavers.com> wrote: > Hi Kieran, > > Someone else on the list is likely to be better help, but in case you're > in a hurry and don't get a quick response: it looks to me like > libfontconfig lacks debug symbols (which makes sense, as I'd not expect > your copy in /usr/lib to have those). Do you have debug symbols for the > wine functions (and if not, are you sure your wine object files include > them)? > > I don't use Valgrind often, but I would guess you might be able to 1.) > build fontconfig yourself, with debug symbols; and then 2.) cause wine to > use your debug version instead of the system one by setting LD_LIBRARY_PATH > or somesuch. However, I'd also expect that the traces you most want to see > are those from wine. > Again, a wine hacker and more regular Valgrind user from the list may > easily have better advice. > > On 3/21/18 7:27 PM, Kieran Duggan wrote: > > So I'm trying to run the tests with valgrind to find memory leaks but when > I use valgrind I end up getting output looking something like this > ==14135== 288 (256 direct, 32 indirect) bytes in 1 blocks are definitely > lost in loss record 166 of 278 > ==14135== at 0x442EB8F: malloc (in /usr/lib/valgrind/vgpreload_ > memcheck-amd64-linux.so) > ==14135== by 0x96B50B9: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x96B5829: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x96B6D4A: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x96BC19B: ??? (in /usr/lib/x86_64-linux-gnu/ > libfontconfig.so.1.9.0) > ==14135== by 0x98E3A9B: ??? (in /lib/x86_64-linux-gnu/ > libexpat.so.1.6.0) > > but this isn't nearly as useful as the output I see on bugzilla, which > includes function calls and such > I tried recompiling my build with valgrind installed on my computer > and checked to be sure that the make config was detected it with > grep VALGRIND include/config.h and I get > > #define HAVE_VALGRIND_MEMCHECK_H 1 > #define HAVE_VALGRIND_VALGRIND_H 1 > > so I don't think that is the problem. > > It seems to me like valgrind is expecting there to be some flags or > something for it to find but they aren't there. > Can anyone offer some assistance? > > On Mon, Mar 19, 2018 at 5:51 AM, Henri Verbeet <hverbeet(a)gmail.com> wrote: > >> On 19 March 2018 at 10:01, Kieran Duggan <kieranduggan15(a)gmail.com> >> wrote: >> > Yes that is very useful! >> > I took a look at the first one I saw on the list. It goes: >> > >> > ==3551== 8 bytes in 1 blocks are definitely lost in loss record 63 of >> 766 >> > ==3551== at 0x7BC51061: notify_alloc (heap.c:254) >> > ==3551== by 0x7BC5554F: RtlAllocateHeap (heap.c:1716) >> > ==3551== by 0x5C85281: XAudio2Create (xaudio_dll.c:2159) >> > ==3551== by 0x4A1B741: func_xaudio2 (xaudio2.c:1150) >> > ==3551== by 0x4A1C74F: run_test (test.h:603) >> > ==3551== by 0x4A1CBAD: main (test.h:687) >> > ==3551== >> > >> > To fix it I looked at the XAudio2Create function and noticed that >> > IClassFactory *cf was assigned in the call >> > make_xaudio2_factory(&IID_IClassFactory, (void**)&cf); >> > which contains >> > struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct >> > xaudio2_cf)); >> > >> > Later in the code IClassFactory_Release(cf); is used, but this wouldn't >> free >> > up the space on the heap because of how that function is implemented. >> > >> I believe it does. Commit 45babd780f586eb8d0a93205d0998d6ce3f8396d >> (which was committed after the bug report), changed >> make_xaudio2_factory() to no longer return class factories with a zero >> reference count. That happens sometimes. >> >> Unfortunately, looking over the first couple of entries in the list, >> it seems likely most of them are similarly already fixed. If you have >> the time and inclination it would certainly be useful to go over that >> list to figure out which ones are already fixed and which ones aren't, >> but that would make this a bit more of a challenge than I had >> intended. Sorry about that. >> >> Still, bugzilla is not a bad place to look for things to fix. The >> "download" keyword should limit searches to bugs that can be >> reproduced with free downloads. We also have various small cleanup >> tasks like e.g. replacing HeapAlloc() usage with the heap_alloc() >> helper, or introducing usage of the ARRAY_SIZE macro. The "patches" >> page [1] and git log may have other examples. >> >> [1] https://source.winehq.org/patches/ >> > > > > >

3 9

[PATCH] kernel32: Add forward slash path handling to GetVolumePathNameW.
by Mark White 24 Mar '18

24 Mar '18

From: Mark White <chopinbig2(a)gmail.com> Fixes https://bugs.winehq.org/show_bug.cgi?id=42446 GetVolumePathNameW is causing some incompatibity problems with some Windows applications such as Native Instruments "Native Access" because of an inability to handle path names containing forward slash's whereas the Windows GetVolumePathName's behaviour handles path names with both forward and back slash's. Tested on Debian Stretch and Windows Vista Signed-off-by: Mark White <chopinbig2(a)gmail.com> --- dlls/kernel32/tests/volume.c | 4 ++++ dlls/kernel32/volume.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 365e38c444..c47043d288 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -772,6 +772,10 @@ static void test_GetVolumePathNameA(void) "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, + { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + "C:/windows/system32", "C:\\", sizeof(volume_path), + NO_ERROR, NO_ERROR + }, }; BOOL ret, success; DWORD error; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b4163f02eb..ac887b2f3f 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1670,6 +1670,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu WCHAR fallbackpathW[] = { 'C',':','\\',0 }; NTSTATUS status = STATUS_SUCCESS; WCHAR *volumenameW = NULL, *c; + WCHAR *fwdslash; int pos, last_pos, stop_pos; UNICODE_STRING nt_name; ANSI_STRING unix_name; @@ -1693,6 +1694,8 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } strcpyW( volumenameW, filename ); + /* forward slash backslash replace */ + for (fwdslash = volumenameW; *fwdslash; fwdslash++) if (*fwdslash == '/') *fwdslash = '\\'; stop_pos = 0; /* stop searching slashes early for NT-type and nearly NT-type paths */ if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) -- 2.11.0

1 0

[PATCH 2/2] Test for explorer.exe with Bugs fixed
by Carlos Vega García 24 Mar '18

24 Mar '18

--- programs/explorer/tests/explorer.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c index 28e1ad3..032ef6f 100755 --- a/programs/explorer/tests/explorer.c +++ b/programs/explorer/tests/explorer.c @@ -132,8 +132,13 @@ int explorer_available(void) STARTUPINFOA si; PROCESS_INFORMATION pi; LPDWORD lpExitCode; +<<<<<<< HEAD char cmd[] = {'e','x','p','l','o','r','e','r',' ','/','r','o','o','t',0}; char windowName[] = {'r','o','o','t',0}; +======= + char cmd[] = {'e','x','p','l','o','r','e','r',' ','C',':',92,'w','i','n','d','o','w','s',0}; + char windowName[] = {'w','i','n','d','o','w','s',0}; +>>>>>>> b2b5eab... Test for explorer with Bugs fixed memset(&si, 0, sizeof(si)); si.cb = sizeof(si); -- 2.7.4

3 2

[PATCH 1/2] explorer.c: Test for explorer.exe (try 2)
by Carlos Vega García 24 Mar '18

24 Mar '18

Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/explorer.c | 180 +++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 programs/explorer/tests/explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 0000000..d195486 --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,180 @@ +/* + * Unit tests for explorer.exe + * + * + * + * 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 + */ + +#include "dde.h" +#include "ddeml.h" +#include "shlobj.h" +#include "wine/test.h" +#include "winuser.h" +#include <stdio.h> +#include <winbase.h> + +/* We test the explorer.exe. This will be the base for start making other tests + * for future + * funtionalities for the explorer (drag&drop). + * + * Tests already implemented: + * - BOOL explorer_available() + */ + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL(WINAPI * pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void *)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before + * Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) + * or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + + strcpy(title, name); + trace("\n \n Window name: %s \n \n", name); + + /* In the next lines we want to ceck if te specified windows has created. We + * don't know exactly how long it will + * take to open the window so we use a loop and sleep function to wait until + * the window opens. + */ + for (i = 0; i < 10; i++) + { + Sleep(20 + 20 * i); + if ((window = FindWindowA("ExplorerWClass", title)) + || (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*I test two window name because in some Windows versions when I open the explorer it creates +*the window with another header. +*/ +BOOL explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + BOOL is_window_created; + + char cmd[] = {'e', 'x', 'p', 'l', 'o', 'r', 'e', 'r', ' ', 'C', + ':', 92, 'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name[] = {'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + char window_name_alternative[] = {'C',':',92,'W', 'I', 'N', 'D', 'O', 'W', 'S', 0}; + /*I use the character 92 = '\' because if you write the character the gcc + * compiler misunderstand it*/ + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + is_window_created = check_window_exists(window_name); + + /*Checks if the window has been created*/ + if (is_window_created) + { + return TRUE; + } + + /*If the first window has not been detected it checks with the alterntive name*/ + if (!is_window_created) + { + if(check_window_exists(window_name_alternative)){ + return TRUE; + } + } + return FALSE; +} + +START_TEST(explorer) +{ + BOOL is_explorer_available; + + /*First we initialize and get th Programs Directoy*/ + init_strings(); + + /*We get if the explorer is avaible and correctcly opens, the we save it into a varible*/ + is_explorer_available = explorer_available(); + + ok(is_explorer_available == TRUE, "No explorer window has opened \n"); + if (!is_explorer_available) + { + win_skip("Explorer.exe is not available \n"); + } +} -- 2.7.4

2 2

[PATCH] Makefile.in: Makefile for explorer.exe tests
by Carlos Vega García 24 Mar '18

24 Mar '18

Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/Makefile.in | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 programs/explorer/tests/Makefile.in diff --git a/programs/explorer/tests/Makefile.in b/programs/explorer/tests/Makefile.in new file mode 100755 index 0000000..422465b --- /dev/null +++ b/programs/explorer/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = explorer.exe +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 shlwapi + +C_SRCS = \ + explorer.c -- 2.7.4

2 1

Help with Git
by Carlos Vega García 24 Mar '18

24 Mar '18

I’m trying to submit my patch and I had an error in the build. The tests Works properly and I have tested in the Testbot and I had non errors. This is correction of a patch that I sent on Wednesday. Could someone explain me why I got it wrong this time? Thank you very much for your attention and I hope not to disturb too much. Regards, Carlos Vega

2 1

[PATCH v2] explorer.c: Test for explorer.exe
by Carlos Vega García 24 Mar '18

24 Mar '18

Changes: Now everything follows code rules. The test runs on every windows version. Is prepared for continue making more tests in it. Signed-off-by: Carlos Vega García <carlosvegagc(a)gmail.com> --- programs/explorer/tests/explorer.c | 166 +++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 programs/explorer/tests/explorer.c diff --git a/programs/explorer/tests/explorer.c b/programs/explorer/tests/explorer.c new file mode 100644 index 0000000..857589d --- /dev/null +++ b/programs/explorer/tests/explorer.c @@ -0,0 +1,166 @@ +/* + * Unit tests for explorer.exe + * + * + * + * 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 + */ + +#include "dde.h" +#include "ddeml.h" +#include "shlobj.h" +#include "wine/test.h" +#include "winuser.h" +#include <stdio.h> +#include <winbase.h> + +/* We test the explorer.exe. This will be the base for start making other tests + * for future + * funtionalities for the explorer (drag&drop). + * + * Tests already implemented: + * - BOOL explorer_available() + */ + +static BOOL use_common(void) +{ + HMODULE hmod; + static BOOL(WINAPI * pIsNTAdmin)(DWORD, LPDWORD); + + /* IsNTAdmin() is available on all platforms. */ + hmod = LoadLibraryA("advpack.dll"); + pIsNTAdmin = (void *)GetProcAddress(hmod, "IsNTAdmin"); + + if (!pIsNTAdmin(0, NULL)) + { + /* We are definitely not an administrator */ + FreeLibrary(hmod); + return FALSE; + } + FreeLibrary(hmod); + + return TRUE; +} + +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + ReadCabinetState(&cs, sizeof(cs)); + + return (cs.fFullPathTitle == -1); +} + +static char ProgramsDir[MAX_PATH]; +static void init_strings(void) +{ + char commonprograms[MAX_PATH]; + char programs[MAX_PATH]; + + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); + + /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before + * Vista + * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) + * or + * not (CSIDL_PROGRAMS). + */ + + if (use_common()) + lstrcpyA(ProgramsDir, commonprograms); + else + lstrcpyA(ProgramsDir, programs); +} + +static BOOL check_window_exists(const char *name) +{ + char title[MAX_PATH]; + HWND window = NULL; + int i; + + if (full_title()) + { + strcpy(title, ProgramsDir); + strcat(title, "\\"); + strcat(title, name); + } + else + + strcpy(title, name); + trace("\n \n Window name: %s \n \n", name); + + /* In the next lines we want to ceck if te specified windows has created. We + * don't know exactly how long it will + * take to open the window so we use a loop and sleep function to wait until + * the window opens. + */ + for (i = 0; i < 20; i++) + { + Sleep(20 + 20 * i); + if ((window = FindWindowA("ExplorerWClass", title)) + || (window = FindWindowA("CabinetWClass", title))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + } + + return (window != NULL); +} + +/* +*We make a call to open a new explorer window and we test if it finally opens. +*/ +BOOL explorer_available(void) +{ + STARTUPINFOA si; + PROCESS_INFORMATION pi; + + char cmd[] = {'e', 'x', 'p', 'l', 'o', 'r', 'e', 'r', ' ', 'C', + ':', 92, 'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + /*I use the character 92 = '\' because if you write the character the gcc + * compiler misunderstand it*/ + char windowName[] = {'w', 'i', 'n', 'd', 'o', 'w', 's', 0}; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + /*Checks if the window has been created*/ + if (check_window_exists(windowName)) + { + return TRUE; + } + return FALSE; +} + +START_TEST(explorer) +{ + BOOL is_explorer_available; + + /*First we initialize and get th Programs Directoy*/ + init_strings(); + + /*We get if the explorer is avaible and correctcly opens, the we save it into a varible*/ + is_explorer_available = explorer_available(); + + ok(is_explorer_available == TRUE, "No explorer window has opened \n"); + if (!is_explorer_available) + { + win_skip("Explorer.exe is not available \n"); + } +} -- 2.7.4

2 1

[PATCH 4/4] wsdapi: Add SequenceId to SOAP header, add test.
by Owen Rudge 23 Mar '18

23 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 29 +++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 15 +++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-)

1 0

[PATCH 3/4] wsdapi: Add InstanceId and MessageNumber to SOAP header.
by Owen Rudge 23 Mar '18

23 Mar '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 127 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 126 insertions(+), 3 deletions(-)

1 0