--- 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);
Hi Carlos,
You submitted a patch with conflicts unresolved. Please resolvethem before submitting.
Re: [PATCH 2/2] Test for explorer.exe with Bugs fixed
If this is the 2/2 patch, I don't see the 1/2. And the naming scheme should be "explorer/tests: message". See git log for examples.
LPDWORD lpExitCode;
underscore is preferred over camel case.
char cmd[] = {'e','x','p','l','o','r','e','r',' ','C',':',92,'w','i','n','d','o','w','s',0};
I believe 92 is a ascii character, so why don't you use human readable form instead.
Here's my personal checklist for sending patches. Hope it would be of help to you.
# Send patch checklist pull master and rebase check compile warnings check test coverage git-clang-format --diff -f and then git-clang-format -f # static analyze cppcheck --enable=all [your code] make clean && scan-build --show-description --show-description make -j4 testbot final check line by line.
I know you are trying to get in GSoC. Please be patient and work on your patches because Alexandre has high standards of them.
Best Wishes, Zhiyi Zhang
_https://wiki.winehq.org/Code_Coverage https://testbot.winehq.org/ https://source.winehq.org/git/wine.git/shortlog?pg=1 _https://wiki.winehq.org/Submitting_Patches
On Fri 3 23 8:06, Carlos Vega García wrote:
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);
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=37111
Your paranoid android.
=== build (build) === Patch failed to apply