October 2013 - Wine-Devel - list.winehq.org

Re: I'm not sure why it was rejected

by Bruno Jesus

On Wed, Oct 2, 2013 at 12:17 PM, Akira Nakagawa <matyapiro31(a)gmail.com> wrote: > I cannnot make sure my patch 99266 was rejected. I can't really tell why it was rejected but I can tell there are mixed space/tabs in the SetLastError lines. I guess if you SetLastError to not implemented you cannot return S_OK too Try comparing your patch with other patches that added new dlls. It looks like you're missing the changes in configure and Makefile.in. http://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=commit&s=new+dll Regards, Bruno

Oct. 2, 2013

I'm not sure why it was rejected

by Akira Nakagawa

I cannnot make sure my patch 99266 <cid:part1.07050802.08000504(a)gmail.com> was rejected. From: Akira Nakagawa <matyapiro31(a)gmail.com> Subject: add ualapi directory(try 15) Message-Id: <52496BA8.1020908(a)gmail.com> Date: Mon, 30 Sep 2013 21:16:40 +0900 I think it has no problem without what Bruno said. So this is the last one. >From e7b788f927621f5d8544bbf73f1e155e05098387 Mon Sep 17 00:00:00 2001 Message-Id: <e7b788f927621f5d8544bbf73f1e155e05098387.1380543383.git.matyapiro31(a)gmail…> From: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Mon, 30 Sep 2013 21:13:52 +0900 Subject: [PATCH] add ual directory (try 15) --- dlls/ualapi/Makefile.in | 6 ++++ dlls/ualapi/main.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ualapi/ualapi.spec | 4 +++ include/ual.h | 47 +++++++++++++++++++++++++++ 4 files changed, 143 insertions(+) diff --git a/dlls/ualapi/Makefile.in b/dlls/ualapi/Makefile.in new file mode 100644 index 0000000..59e56fe --- /dev/null +++ b/dlls/ualapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = ualapi.dll +IMPORTLIB = ualapi + +C_SRCS = main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/ualapi/main.c b/dlls/ualapi/main.c new file mode 100644 index 0000000..7b3ff7b --- /dev/null +++ b/dlls/ualapi/main.c @@ -0,0 +1,86 @@ +/* + * main.c + * This file is part of wine + * + * Copyright (C) 2013 - Akira Nakagawa + * + * wine 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. + * + * wine 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 wine. If not, see <http://www.gnu.org/licenses/>. + */ +#include <stdio.h> +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wine/debug.h" +#include "ual.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ualapi); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + return TRUE; +} + +/* + * Return S_OK if succeed,or return error code + * It records Data of the user. + */ +HRESULT +WINAPI +UalStart( + PUAL_DATA_BLOB Data){ + FIXME("This function is not supported.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return S_OK; +} + +HRESULT +WINAPI +UalStop( + PUAL_DATA_BLOB Data){ + FIXME("This function is not supported.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return S_OK; +} + +HRESULT +WINAPI +UalInstrument( + PUAL_DATA_BLOB Data){ + FIXME("This function is not supported.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return S_OK; +} + +HRESULT +WINAPI +UalRegisterProduct( + const WCHAR* wszProductName, + const WCHAR* wszRoleName, + const WCHAR* wszGuid){ + FIXME("This function is not supported.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return S_OK; +} diff --git a/dlls/ualapi/ualapi.spec b/dlls/ualapi/ualapi.spec new file mode 100644 index 0000000..b7682fb --- /dev/null +++ b/dlls/ualapi/ualapi.spec @@ -0,0 +1,4 @@ +@ stdcall UalStart(ptr) +@ stdcall UalStop(ptr) +@ stdcall UalInstrument(ptr) +@ stdcall UalRegisterProduct(wstr wstr wstr) diff --git a/include/ual.h b/include/ual.h new file mode 100644 index 0000000..14f1c74 --- /dev/null +++ b/include/ual.h @@ -0,0 +1,47 @@ +/* + * ual.h: User Access Logging + * This file is part of wine + * + * Copyright (C) 2013 - Akira Nakagawa + * + * wine 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. + * + * wine 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 wine. If not, see <http://www.gnu.org/licenses/>. + */ + + +#ifndef _UAL_H_INCLUDED +#define _UAL_H_INCLUDED + +#include <winsock2.h> + +typedef struct tagUAL_DATA_BLOB +{ + DWORD Size; + GUID RoleGuid; + GUID TenantId; + SOCKADDR_STORAGE Address; + WCHAR UserName[MAX_PATH]; +} UAL_DATA_BLOB, *PUAL_DATA_BLOB; + +HRESULT WINAPI UalStart(PUAL_DATA_BLOB Data); + +HRESULT WINAPI UalStop(PUAL_DATA_BLOB Data); + +HRESULT WINAPI UalInstrument(PUAL_DATA_BLOB Data); + +HRESULT WINAPI UalRegisterProduct( + const WCHAR* wszProductName, + const WCHAR* wszRoleName, + const WCHAR* wszGuid); +#endif + -- 1.8.1.2

Oct. 2, 2013

Re: Re: kernel32/tests: Fix the test_waittxempty() timeout.

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2434 Your paranoid android. === wxppro (32 bit comm) === comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... No test summary line found Failure running script in VM: network read timed out === w2008s64 (32 bit comm) === comm.c:1670: test_AbortWaitCts timeout 500 handle 000000C4 comm.c:1637: Changing CommMask on the fly for handle 000000C4 after timeout 500 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 No test summary line found Failure running script in VM: network read timed out === w7pro64 (32 bit comm) === comm.c:1670: test_AbortWaitCts timeout 500 handle 00000130 comm.c:1637: Changing CommMask on the fly for handle 00000130 after timeout 500 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1094: Test failed: WriteFile failed with a timeout comm.c:1096: Test failed: GetOverlappedResult reported error 996 comm.c:1097: Test failed: expected 64000, written 0 Timeout === w2008s64 (64 bit comm) === comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 Timeout === w7pro64 (64 bit comm) === comm.c:887: WaitCommEvent for EV_TXEMPTY took 0 ms (timeout 1000) comm.c:1670: test_AbortWaitCts timeout 500 handle 00000000000000CC comm.c:1637: Changing CommMask on the fly for handle 00000000000000CC after timeout 500 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:1064: Test failed: WaitCommEvent failed with a timeout comm.c:1075: recovering after WAIT_TIMEOUT... comm.c:1086: Test failed: WaitCommEvent error 0 comm.c:1087: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 Timeout

Oct. 2, 2013

Re: Assorted spelling fixes.

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2433 Your paranoid android. === build (build) === Patch failed to apply

Oct. 2, 2013

Re: Assorted spelling fixes.

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2432 Your paranoid android. === build (build) === Patch failed to apply

Oct. 2, 2013

Re: Assorted spelling fixes.

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2431 Your paranoid android. === build (build) === Patch failed to apply

Oct. 2, 2013

Re: Assorted spelling fixes.

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2430 Your paranoid android. === build (build) === Patch failed to apply

Oct. 2, 2013

Re: Assorted spelling fixes.

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2429 Your paranoid android. === build (build) === Patch failed to apply

Oct. 2, 2013

Re: [5/5] gdi32: Don't modify output glyph metrics unless the function succeeds. (resend)

by Marvin

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://newtestbot.winehq.org/JobDetails.pl?Key=2426 Your paranoid android. === wvista (32 bit font) === The test timed out === w2008s64 (32 bit font) === Failure running script in VM: network read timed out === w2008s64 (64 bit font) === Failure running script in VM: network read timed out

Oct. 2, 2013

Re: kernel32: Add tests for job objects (try 3)

by Nikolay Sivov

On 10/2/2013 12:58, Andrew Cook wrote: > + if(!pCreateJobObjectW) { > + win_skip("No job object support\n"); > + return; > + } Once you checked that I suppose you don't need to check for pIsProcessInJob being null, or it still could happen? > + if (option && strcmp(option, "wait") == 0) { > + /* for job object tests */ > + Sleep(3000); > + return; > + } Is it really necessary?

Oct. 2, 2013