wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Dmitry Timoshkov : include: Add taskschd.idl.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: bd51d5fcbafdae63cbdaf4f2a058cce90bb6cbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd51d5fcbafdae63cbdaf4f2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 16:58:20 2013 +0900 include: Add taskschd.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/taskschd.idl | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 2ba4396..399a8ec 100644 --- a/.gitignore +++ b/.gitignore @@ -244,6 +244,7 @@ include/stamp-h include/stdole2.tlb include/strmif.h include/structuredquerycondition.h +include/taskschd.h include/textstor.h include/tlogstg.h include/tom.h diff --git a/include/Makefile.in b/include/Makefile.in index d10ffc5..1f25159 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ PUBLIC_IDL_H_SRCS = \ shtypes.idl \ strmif.idl \ structuredquerycondition.idl \ + taskschd.idl \ textstor.idl \ tlogstg.idl \ tom.idl \ diff --git a/include/taskschd.idl b/include/taskschd.idl new file mode 100644 index 0000000..ad8a1bf --- /dev/null +++ b/include/taskschd.idl @@ -0,0 +1,185 @@ +/* + * Copyright 2013 Dmitry Timoshkov + * + * 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +cpp_quote("DEFINE_GUID(CLSID_TaskScheduler, 0xf87369f,0xa4e5,0x4cfc,0xbd,0x3e,0x73,0xe6,0x15,0x45,0x72,0xdd);") + +typedef enum _TASK_STATE +{ + TASK_STATE_UNKNOWN, + TASK_STATE_DISABLED, + TASK_STATE_QUEUED, + TASK_STATE_READY, + TASK_STATE_RUNNING +} TASK_STATE; + +typedef enum _TASK_ENUM_FLAGS +{ + TASK_ENUM_HIDDEN = 0x0001 +} TASK_ENUM_FLAGS; + +typedef enum _TASK_LOGON_TYPE +{ + TASK_LOGON_NONE, + TASK_LOGON_PASSWORD, + TASK_LOGON_S4U, + TASK_LOGON_INTERACTIVE_TOKEN, + TASK_LOGON_GROUP, + TASK_LOGON_SERVICE_ACCOUNT, + TASK_LOGON_INTERACTIVE_TOKEN_OR_PASSWORD +} TASK_LOGON_TYPE; + +typedef enum _TASK_RUNLEVEL +{ + TASK_RUNLEVEL_LUA, + TASK_RUNLEVEL_HIGHEST +} TASK_RUNLEVEL_TYPE; + +interface ITaskService; +interface IRegisteredTask; +interface IRegisteredTaskCollection; +interface ITaskFolder; +interface ITaskFolderCollection; +interface ITaskDefinition; +interface IRunningTask; +interface IRunningTaskCollection; + +[ + object, + oleautomation, + uuid(2faba4c7-4da9-4013-9697-20cc3fd40f85) +] +interface ITaskService : IDispatch +{ + HRESULT GetFolder([in] BSTR path, [out, retval] ITaskFolder **folder ); + HRESULT GetRunningTasks([in] LONG flags, [out, retval] IRunningTaskCollection **tasks ); + HRESULT NewTask([in] DWORD flags, [out, retval] ITaskDefinition **definition ); + HRESULT Connect([in, optional] VARIANT server, [in, optional] VARIANT user, [in, optional] VARIANT domain, [in, optional] VARIANT password); + [propget] HRESULT Connected([out, retval] VARIANT_BOOL *connected); + [propget] HRESULT TargetServer([out, retval] BSTR *server); + [propget] HRESULT ConnectedUser([out, retval] BSTR *user); + [propget] HRESULT ConnectedDomain([out, retval] BSTR *domain); + [propget] HRESULT HighestVersion([out, retval] DWORD *version); +} + +[ + object, + oleautomation, + uuid(9c86f320-dee3-4dd1-b972-a303f26b061e) +] +interface IRegisteredTask : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT Path([out, retval] BSTR *path); + [propget] HRESULT State([out, retval] TASK_STATE *state); + [propget] HRESULT Enabled([out, retval] VARIANT_BOOL *enabled); + [propput] HRESULT Enabled(VARIANT_BOOL enabled); + HRESULT Run([in] VARIANT params, [out, retval] IRunningTask **task); + HRESULT RunEx([in] VARIANT params, [in] LONG flags, [in] LONG sessionID, [in] BSTR user, [out, retval] IRunningTask **task); + HRESULT GetInstances([in] LONG flags, [out, retval] IRunningTaskCollection **tasks); + [propget] HRESULT LastRunTime([out, retval] DATE *date); + [propget] HRESULT LastTaskResult([out, retval] LONG *result); + [propget] HRESULT NumberOfMissedRuns([out, retval] LONG *runs); + [propget] HRESULT NextRunTime([out, retval] DATE *date); + [propget] HRESULT Definition([out, retval] ITaskDefinition **task); + [propget] HRESULT Xml([out, retval] BSTR *xml); + HRESULT GetSecurityDescriptor([in] LONG info, [out, retval] BSTR *sddl); + HRESULT SetSecurityDescriptor([in] BSTR sddl, [in] LONG flags); + HRESULT Stop([in] LONG flags); + HRESULT GetRunTimes([in] const LPSYSTEMTIME start, [in] const LPSYSTEMTIME end, [in, out] DWORD *count, [out] LPSYSTEMTIME *time); +} + +[ + object, + oleautomation, + uuid(86627eb4-42a7-41e4-a4d9-ac33a72f2d52) +] +interface IRegisteredTaskCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] IRegisteredTask **task); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(8cfac062-a080-4c15-9a88-aa7c2af80dfc) +] +interface ITaskFolder : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT Path([out, retval] BSTR *path); + HRESULT GetFolder([in] BSTR path, [out, retval] ITaskFolder **folder); + HRESULT GetFolders([in] LONG flags, [out, retval] ITaskFolderCollection **folders); + HRESULT CreateFolder([in] BSTR name, [in] VARIANT sddl, [out, retval] ITaskFolder **folder); + HRESULT DeleteFolder([in] BSTR name, [in] LONG flags); + HRESULT GetTask([in] BSTR path, [out, retval] IRegisteredTask **task); + HRESULT GetTasks([in] LONG flags, [out, retval] IRegisteredTaskCollection **tasks); + HRESULT DeleteTask([in] BSTR name, [in] LONG flags); + HRESULT RegisterTask([in] BSTR path, [in] BSTR xml, [in] LONG flags, [in] VARIANT user, [in] VARIANT password, + [in] TASK_LOGON_TYPE logonType, [in] VARIANT sddl, [out, retval] IRegisteredTask **task); + HRESULT RegisterTaskDefinition([in] BSTR path, [in] ITaskDefinition *definition, [in] LONG flags, + [in] VARIANT user, [in] VARIANT password, [in] TASK_LOGON_TYPE logon, + [in] VARIANT sddl, [out, retval] IRegisteredTask **task); + HRESULT GetSecurityDescriptor(LONG info, [out, retval] BSTR *sddl); + HRESULT SetSecurityDescriptor([in] BSTR sddl, [in] LONG flags); +} + +[ + object, + oleautomation, + uuid(79184a66-8664-423f-97f1-637356a5d812) +] +interface ITaskFolderCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] ITaskFolder **folder); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(653758fb-7b9a-4f1e-a471-beeb8e9b834e) +] +interface IRunningTask : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT InstanceGuid([out, retval] BSTR *guid); + [propget] HRESULT Path([out, retval] BSTR *path); + [propget] HRESULT State([out, retval] TASK_STATE *state); + [propget] HRESULT CurrentAction([out, retval] BSTR *name); + HRESULT Stop(void ); + HRESULT Refresh(void ); + [propget] HRESULT EnginePID([out, retval] DWORD *pid); +} + +[ + object, + oleautomation, + uuid(6a67614b-6828-4fec-aa54-6d52e8f1f2db) +] +interface IRunningTaskCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] IRunningTask **task); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +}

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: aaa0c692f1f283188b1dcff9a47f2ef285fe320d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa0c692f1f283188b1dcff9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 11:38:50 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/dosmem.c | 8 ++++---- dlls/krnl386.exe16/global.c | 2 +- dlls/krnl386.exe16/int2f.c | 4 ++-- dlls/krnl386.exe16/ioports.c | 6 +++--- dlls/krnl386.exe16/kernel.c | 17 ++++++++--------- dlls/krnl386.exe16/kernel16_private.h | 2 +- dlls/krnl386.exe16/ne_module.c | 4 ++-- dlls/krnl386.exe16/relay.c | 2 +- dlls/krnl386.exe16/resource.c | 2 +- dlls/krnl386.exe16/soundblaster.c | 12 ++++++------ dlls/krnl386.exe16/task.c | 2 +- dlls/krnl386.exe16/thunk.c | 2 +- dlls/krnl386.exe16/utthunk.c | 2 +- 13 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa0c692f1f283188b1dc…

1 0

Frédéric Delanoy : krnl386.exe16: Make VGA_[Set/ Get]Mode return TRUE on success.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: f24a5bc824e474165af7e4883a0c1cbcfe8956be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24a5bc824e474165af7e4883… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 11:38:49 2013 +0100 krnl386.exe16: Make VGA_[Set/Get]Mode return TRUE on success. --- dlls/krnl386.exe16/int10.c | 2 +- dlls/krnl386.exe16/int33.c | 2 +- dlls/krnl386.exe16/vga.c | 20 ++++++++++---------- dlls/krnl386.exe16/vga.h | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index dfba761..2ac9703 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -750,7 +750,7 @@ static BOOL INT10_SetVideoMode( BIOSDATA *data, WORD mode ) ptr->Width, ptr->Height, ptr->Depth, clearScreen ? "cleared" : "preserved" ); - if ( VGA_SetMode(mode) ) + if (!VGA_SetMode(mode)) return FALSE; } diff --git a/dlls/krnl386.exe16/int33.c b/dlls/krnl386.exe16/int33.c index 7226816..0f03ac7 100644 --- a/dlls/krnl386.exe16/int33.c +++ b/dlls/krnl386.exe16/int33.c @@ -295,7 +295,7 @@ void DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam) WORD mask = 0; unsigned Height, Width, SX=1, SY=1; - if (!VGA_GetMode(&Height,&Width,NULL)) { + if (VGA_GetMode(&Height, &Width, NULL)) { /* may need to do some coordinate scaling */ if (Width) SX = 640/Width; diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index f1b632e..ade19f7 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -735,7 +735,7 @@ static char*VGA_AlphaBuffer(void) typedef struct { unsigned Xres, Yres, Depth; - int ret; + BOOL ret; } ModeSet; @@ -780,7 +780,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) { HRESULT res; ModeSet *par = (ModeSet *)arg; - par->ret=1; + par->ret = FALSE; if (lpddraw) VGA_DoExit(0); if (!lpddraw) { @@ -845,7 +845,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) /* poll every 20ms (50fps should provide adequate responsiveness) */ VGA_InstallTimer(20); } - par->ret=0; + par->ret = TRUE; return; } @@ -872,7 +872,7 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode) return NULL; } -static int VGA_SetGraphicMode(WORD mode) +static BOOL VGA_SetGraphicMode(WORD mode) { ModeSet par; int newSize; @@ -954,7 +954,7 @@ static int VGA_SetGraphicMode(WORD mode) return par.ret; } -int VGA_SetMode(WORD mode) +BOOL VGA_SetMode(WORD mode) { const VGA_MODE *ModeInfo; /* get info on VGA mode & set appropriately */ @@ -980,17 +980,17 @@ int VGA_SetMode(WORD mode) { return VGA_SetGraphicMode(mode); } - return 0; /* assume all good & return zero */ + return TRUE; /* assume all good & return TRUE */ } -int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth) +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth) { - if (!lpddraw) return 1; - if (!lpddsurf) return 1; + if (!lpddraw) return FALSE; + if (!lpddsurf) return FALSE; if (Height) *Height=sdesc.dwHeight; if (Width) *Width=sdesc.dwWidth; if (Depth) *Depth=sdesc.ddpfPixelFormat.u1.dwRGBBitCount; - return 0; + return TRUE; } static void VGA_Exit(void) diff --git a/dlls/krnl386.exe16/vga.h b/dlls/krnl386.exe16/vga.h index 5d79567..b4976f6 100644 --- a/dlls/krnl386.exe16/vga.h +++ b/dlls/krnl386.exe16/vga.h @@ -52,10 +52,10 @@ extern const VGA_MODE VGA_modelist[]; /* all vga modes */ const VGA_MODE *VGA_GetModeInfo(WORD mode); -int VGA_SetMode(WORD mode); +BOOL VGA_SetMode(WORD mode); /* graphics mode */ -int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth); +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth); void VGA_SetPalette(PALETTEENTRY*pal,int start,int len); void VGA_SetColor16(int reg,int color); char VGA_GetColor16(int reg);

1 0

Dmitry Timoshkov : msiexec: MSI service should report SERVICE_STOPPED when appropriate.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 955de31fad16da6453d0a67d2510955cb255ab46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955de31fad16da6453d0a67d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:07 2013 +0900 msiexec: MSI service should report SERVICE_STOPPED when appropriate. --- programs/msiexec/service.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 4b72fe0..fdd29bd 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -81,6 +81,8 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, static void WINAPI ServiceCtrlHandler(DWORD code) { + DWORD state = SERVICE_RUNNING; + WINE_TRACE("%d\n", code); switch (code) @@ -89,13 +91,14 @@ static void WINAPI ServiceCtrlHandler(DWORD code) case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); + state = SERVICE_STOPPED; return; default: fprintf(stderr, "Unhandled service control code: %d\n", code); break; } - UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); + UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) @@ -135,12 +138,14 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) { fprintf(stderr, "Failed to create event\n"); KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } if (!StartServiceThread()) { KillService(); + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); return; } @@ -148,6 +153,8 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) WaitForSingleObject(kill_event, INFINITE); KillService(); + + UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); } DWORD DoService(void)

1 0

Dmitry Timoshkov : msiexec: Make service thread do nothing by waiting for the kill event instead of using an empty loop .
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 957f7013d2edba8d6928bfe725666073fdf94689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957f7013d2edba8d6928bfe72… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:01 2013 +0900 msiexec: Make service thread do nothing by waiting for the kill event instead of using an empty loop. --- programs/msiexec/service.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index ab419ca..4b72fe0 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -100,10 +100,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) static DWORD WINAPI ServiceExecutionThread(LPVOID param) { - while (TRUE) - { - /* do nothing */ - } + WaitForSingleObject(kill_event, INFINITE); return 0; }

1 0

Hans Leidekker : ntdll: Report the latest service pack for 64-bit Windows XP.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 0463d01f151fb3d7c7acf26c7628683fefb6c130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0463d01f151fb3d7c7acf26c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:50:19 2013 +0100 ntdll: Report the latest service pack for 64-bit Windows XP. --- dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index f4b1093..57e586a 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -138,8 +138,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WINXP64 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, - 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, + 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K3 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index fdb0a71..3b83860 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -56,7 +56,7 @@ static const struct { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, #ifdef _WIN64 - { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, + { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, #else { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"},

1 0

Hans Leidekker : wininet: Always store the SSL context.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 7ba776532d73a180130a33aee46e6182b535ce8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba776532d73a180130a33aee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:49:34 2013 +0100 wininet: Always store the SSL context. This allows applications to query certificate properties when verification has failed. --- dlls/wininet/netconnection.c | 18 ++++++++---------- dlls/wininet/tests/http.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c90ef69..86c9b08 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -369,6 +369,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; list_init(&netconn->pool_entry); + SecInvalidateHandle(&netconn->ssl_ctx); result = create_netconn_socket(server, netconn, timeout); if (result != ERROR_SUCCESS) { @@ -407,7 +408,8 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - DeleteSecurityContext(&netconn->ssl_ctx); + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); } heap_free(netconn); @@ -586,6 +588,10 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode TRACE("InitializeSecurityContext ret %08x\n", status); if(status == SEC_E_OK) { + if(SecIsValidHandle(&connection->ssl_ctx)) + DeleteSecurityContext(&connection->ssl_ctx); + connection->ssl_ctx = ctx; + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) FIXME("SECBUFFER_EXTRA not supported\n"); @@ -617,19 +623,14 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } } - if(status != SEC_E_OK || res != ERROR_SUCCESS) { - WARN("Failed to initialize security context failed: %08x\n", status); + WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; - DeleteSecurityContext(&ctx); return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } - TRACE("established SSL connection\n"); - connection->ssl_ctx = ctx; - connection->secure = TRUE; connection->security_flags |= SECURITY_FLAG_SECURE; @@ -963,9 +964,6 @@ LPCVOID NETCON_GetCert(netconn_t *connection) const CERT_CONTEXT *ret; SECURITY_STATUS res; - if (!connection->secure) - return NULL; - res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&ret); return res == SEC_E_OK ? ret : NULL; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eb09bc7..951460f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4137,6 +4137,7 @@ static void _set_secflags(unsigned line, HINTERNET req, BOOL use_undoc, DWORD fl static void test_security_flags(void) { + INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; char buf[100]; @@ -4259,6 +4260,30 @@ static void test_security_flags(void) ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); + size = 0; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); + ok(res || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %u\n", size); + cert = HeapAlloc(GetProcessHeap(), 0, size); + cert->lpszSubjectInfo = NULL; + cert->lpszIssuerInfo = NULL; + cert->lpszSignatureAlgName = (char *)0xdeadbeef; + cert->lpszEncryptionAlgName = (char *)0xdeadbeef; + cert->lpszProtocolName = (char *)0xdeadbeef; + cert->dwKeySize = 0xdeadbeef; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, cert, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + if (res) + { + ok(cert->lpszSubjectInfo && strlen(cert->lpszSubjectInfo) > 1, "expected a non-empty subject name\n"); + ok(cert->lpszIssuerInfo && strlen(cert->lpszIssuerInfo) > 1, "expected a non-empty issuer name\n"); + ok(!cert->lpszSignatureAlgName, "unexpected signature algorithm name\n"); + ok(!cert->lpszEncryptionAlgName, "unexpected encryption algorithm name\n"); + ok(!cert->lpszProtocolName, "unexpected protocol name\n"); + ok(cert->dwKeySize != 0xdeadbeef, "unexpected key size\n"); + } + HeapFree(GetProcessHeap(), 0, cert); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION);

1 0

Hans Leidekker : wininet: Separate socket destruction from destruction of the connection object.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 6c7c15059a5407769a9edefb88e18f5463897c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7c15059a5407769a9edefb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:48:41 2013 +0100 wininet: Separate socket destruction from destruction of the connection object. --- dlls/wininet/dialogs.c | 2 +- dlls/wininet/http.c | 29 ++++++++++++++--------------- dlls/wininet/internet.h | 3 +++ dlls/wininet/netconnection.c | 16 +++++++++++++++- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 4acda13..52a18f3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -457,7 +457,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( /* FIXME: Use helper function */ flags |= SECURITY_FLAG_SECURE; req->security_flags |= flags; - if(req->netconn) + if(is_valid_netconn(req->netconn)) req->netconn->security_flags |= flags; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 09a43f8..817fea1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1947,7 +1947,7 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) { TRACE("%p %p\n",req, req->netconn); - if(!req->netconn) + if(!is_valid_netconn(req->netconn)) return; if(reuse && req->netconn->keep_alive) { @@ -1988,8 +1988,7 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); - free_netconn(req->netconn); - req->netconn = NULL; + close_netconn(req->netconn); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); @@ -2092,7 +2091,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn && req->netconn->secure) + if (is_valid_netconn(req->netconn) && req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; @@ -2109,7 +2108,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); - flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; + flags = is_valid_netconn(req->netconn) ? req->netconn->security_flags : req->security_flags | req->server->security_flags; *(DWORD *)buffer = flags; TRACE("INTERNET_OPTION_SECURITY_FLAGS %x\n", flags); @@ -2314,7 +2313,7 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, TRACE("INTERNET_OPTION_SECURITY_FLAGS %08x\n", flags); flags &= SECURITY_SET_MASK; req->security_flags |= flags; - if(req->netconn) + if(is_valid_netconn(req->netconn)) req->netconn->security_flags |= flags; return ERROR_SUCCESS; } @@ -2626,7 +2625,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD avail = 0; - if(req->netconn) + if(is_valid_netconn(req->netconn)) NETCON_query_data_available(req->netconn, &avail); return netconn_stream->content_length == ~0u ? avail @@ -2636,7 +2635,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL netconn_end_of_data(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; - return netconn_stream->content_read == netconn_stream->content_length || !req->netconn; + return netconn_stream->content_read == netconn_stream->content_length || !is_valid_netconn(req->netconn); } static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2654,7 +2653,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = avail; } - if(size && req->netconn) { + if(size && is_valid_netconn(req->netconn)) { if((res = NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len))) len = 0; if(!len) @@ -2836,7 +2835,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(read_mode == READMODE_NOBLOCK) { DWORD avail; - if(!req->netconn || !NETCON_query_data_available(req->netconn, &avail) || !avail) + if(!is_valid_netconn(req->netconn) || !NETCON_query_data_available(req->netconn, &avail) || !avail) break; if(read_bytes > avail) read_bytes = avail; @@ -3037,7 +3036,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) { BOOL ret; - if(!req->netconn || req->contentLength == -1) + if(!is_valid_netconn(req->netconn) || req->contentLength == -1) return FALSE; if(!strcmpW(req->verb, szHEAD)) @@ -4790,7 +4789,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if (request->netconn) { - if (NETCON_is_alive(request->netconn)) + if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn)) { *reusing = TRUE; return ERROR_SUCCESS; @@ -4812,7 +4811,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) netconn = LIST_ENTRY(list_head(&request->server->conn_pool), netconn_t, pool_entry); list_remove(&netconn->pool_entry); - if(NETCON_is_alive(netconn)) + if(is_valid_netconn(netconn) && NETCON_is_alive(netconn)) break; TRACE("connection %p closed during idle\n", netconn); @@ -5219,7 +5218,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ INT responseLen; DWORD res = ERROR_SUCCESS; - if(!request->netconn) { + if(!is_valid_netconn(request->netconn)) { WARN("Not connected\n"); send_request_complete(request, 0, ERROR_INTERNET_OPERATION_CANCELLED); return ERROR_INTERNET_OPERATION_CANCELLED; @@ -5891,7 +5890,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) TRACE("-->\n"); - if(!request->netconn) + if(!is_valid_netconn(request->netconn)) goto lend; /* clear old response headers (eg. from a redirect response) */ diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3d948cf..28af0f7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -108,6 +108,9 @@ typedef struct struct list pool_entry; } netconn_t; +BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; +void close_netconn(netconn_t *) DECLSPEC_HIDDEN; + static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c8879b6..c90ef69 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -321,6 +321,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t if (!res) { closesocket(netconn->socket); + netconn->socket = -1; return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) @@ -333,7 +334,10 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t } } if(result == -1) + { closesocket(netconn->socket); + netconn->socket = -1; + } else { flag = 0; ioctlsocket(netconn->socket, FIONBIO, &flag); @@ -378,6 +382,17 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m return result; } +BOOL is_valid_netconn(netconn_t *netconn) +{ + return netconn && netconn->socket != -1; +} + +void close_netconn(netconn_t *netconn) +{ + closesocket(netconn->socket); + netconn->socket = -1; +} + void free_netconn(netconn_t *netconn) { server_release(netconn->server); @@ -395,7 +410,6 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } - closesocket(netconn->socket); heap_free(netconn); }

1 0

Hans Leidekker : wininet: Return an error when ensure_cred_handle fails.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 9373d4c5780aee66f4c463741e3d3de192aaef55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9373d4c5780aee66f4c463741… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:47:54 2013 +0100 wininet: Return an error when ensure_cred_handle fails. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b1368bf..c8879b6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -494,7 +494,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode |ISC_REQ_SEQUENCE_DETECT|ISC_REQ_REPLAY_DETECT|ISC_REQ_MANUAL_CRED_VALIDATION; if(!ensure_cred_handle()) - return FALSE; + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; if(compat_mode) { if(!have_compat_cred_handle)

1 0

Nikolay Sivov : shell32: Don't call comctl32 on unload time if it wasn' t used before.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: b5312b70f5c160b3aa3d374256f71ad4aa1f98e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5312b70f5c160b3aa3d37425… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 11 08:36:59 2013 +0400 shell32: Don't call comctl32 on unload time if it wasn't used before. --- dlls/shell32/iconcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index a2373fa..3d54508 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -405,8 +405,10 @@ void SIC_Destroy(void) if (sic_hdpa) DPA_DestroyCallback(sic_hdpa, sic_free, NULL ); - ImageList_Destroy(ShellSmallIconList); - ImageList_Destroy(ShellBigIconList); + if (ShellSmallIconList) + ImageList_Destroy(ShellSmallIconList); + if (ShellBigIconList) + ImageList_Destroy(ShellBigIconList); LeaveCriticalSection(&SHELL32_SicCS); DeleteCriticalSection(&SHELL32_SicCS);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013