Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 39274: Take into account environment variables specified by gina DLL
by hpoussin＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: hpoussin Date: Sun Feb 1 13:52:41 2009 New Revision: 39274 URL: http://svn.reactos.org/svn/reactos?rev=39274&view=rev Log: Take into account environment variables specified by gina DLL Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Feb 1 13:52:41 2009 @@ -170,6 +170,9 @@ { PROFILEINFOW ProfileInfo; LPVOID lpEnvironment = NULL; + LPWSTR lpFullEnv = NULL; + LPCWSTR wstr; + SIZE_T EnvBlockSize = 0, ProfileSize = 0; BOOLEAN Old; BOOL ret = FALSE; @@ -215,7 +218,48 @@ WARN("WL: CreateEnvironmentBlock() failed\n"); goto cleanup; } - /* FIXME: Append variables of Session->Profile->pszEnvironment */ + + if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment) + { + /* Count required size for full environment */ + wstr = (LPCWSTR)lpEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + EnvBlockSize += size; + } + wstr = Session->Profile->pszEnvironment; + while (*wstr != UNICODE_NULL) + { + SIZE_T size = wcslen(wstr) + 1; + wstr += size; + ProfileSize += size; + } + + /* Allocate enough memory */ + lpFullEnv = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + if (!lpFullEnv) + { + TRACE("HeapAlloc() failed\n"); + goto cleanup; + } + + /* Fill user environment block */ + CopyMemory( + lpFullEnv, + lpEnvironment, + EnvBlockSize * sizeof(WCHAR)); + CopyMemory( + &lpFullEnv[EnvBlockSize], + Session->Profile->pszEnvironment, + ProfileSize * sizeof(WCHAR)); + lpFullEnv[EnvBlockSize + ProfileSize] = UNICODE_NULL; + } + else + { + lpFullEnv = (LPWSTR)lpEnvironment; + } DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); @@ -236,7 +280,7 @@ Session->Gina.Context, L"Default", NULL, /* FIXME */ - lpEnvironment)) + lpFullEnv)) { //WCHAR StatusMsg[256]; WARN("WL: WlxActivateUserShell() failed\n"); @@ -263,6 +307,8 @@ { UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); } + if (lpFullEnv != lpEnvironment) + HeapFree(GetProcessHeap(), 0, lpFullEnv); if (lpEnvironment) DestroyEnvironmentBlock(lpEnvironment); RemoveStatusMessage(Session);

1 0

[cfinck] 39273: Merge 39259 to finally get netshell working again for Czech
by cfinck＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cfinck Date: Sun Feb 1 13:31:51 2009 New Revision: 39273 URL: http://svn.reactos.org/svn/reactos?rev=39273&view=rev Log: Merge 39259 to finally get netshell working again for Czech Modified: branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc Modified: branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_8/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/ros-branch-0_3_8/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Sun Feb 1 13:31:51 2009 @@ -1,22 +1,22 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Pøipojit prostøednictvím:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Popis", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Tak tady bude popis komponenty...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Po pøipojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + CHECKBOX "Po pøipojení zobrazit ikonu na hlavním panelu", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Upozornit, kdy bude pøipojení omezené nebo pøeruené", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 @@ -42,7 +42,7 @@ LTEXT "Bytù:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Vlastnosti", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Zakázat", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8

1 0

[cwittich] 39272: sync pdh with wine 1.1.14
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 11:20:58 2009 New Revision: 39272 URL: http://svn.reactos.org/svn/reactos?rev=39272&view=rev Log: sync pdh with wine 1.1.14 Modified: trunk/reactos/dll/win32/pdh/pdh.spec trunk/reactos/dll/win32/pdh/pdh_main.c trunk/reactos/include/psdk/pdh.h trunk/reactos/include/psdk/pdhmsg.h Modified: trunk/reactos/dll/win32/pdh/pdh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Sun Feb 1 11:20:58 2009 @@ -28,10 +28,10 @@ @ stub PdhEnumMachinesHA @ stub PdhEnumMachinesHW @ stub PdhEnumMachinesW -@ stub PdhEnumObjectItemsA +@ stdcall PdhEnumObjectItemsA(str str str ptr ptr ptr ptr long long) @ stub PdhEnumObjectItemsHA @ stub PdhEnumObjectItemsHW -@ stub PdhEnumObjectItemsW +@ stdcall PdhEnumObjectItemsW(wstr wstr wstr ptr ptr ptr ptr long long) @ stub PdhEnumObjectsA @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW Modified: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Sun Feb 1 11:20:58 2009 @@ -1059,3 +1059,31 @@ } return PdhValidatePathW( path ); } + +/*********************************************************************** + * PdhEnumObjectItemsA (PDH.@) + */ +PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPCSTR szObjectName, + LPSTR mszCounterList, LPDWORD pcchCounterListLength, LPSTR mszInstanceList, + LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) +{ + FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), + debugstr_a(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, + pcchInstanceListLength, dwDetailLevel, dwFlags); + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhEnumObjectItemsW (PDH.@) + */ +PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineName, LPCWSTR szObjectName, + LPWSTR mszCounterList, LPDWORD pcchCounterListLength, LPWSTR mszInstanceList, + LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) +{ + FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), + debugstr_w(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, + pcchInstanceListLength, dwDetailLevel, dwFlags); + + return PDH_NOT_IMPLEMENTED; +} Modified: trunk/reactos/include/psdk/pdh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdh.h?rev=392… ============================================================================== --- trunk/reactos/include/psdk/pdh.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pdh.h [iso-8859-1] Sun Feb 1 11:20:58 2009 @@ -175,6 +175,9 @@ PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE); PDH_STATUS WINAPI PdhCollectQueryDataWithTime(PDH_HQUERY,LONGLONG *); +PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR, LPCSTR, LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, DWORD, DWORD); +PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, DWORD, DWORD); +#define PdhEnumObjectItems WINELIB_NAME_AW(PdhEnumObjectItems) PDH_STATUS WINAPI PdhGetCounterInfoA(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_A); PDH_STATUS WINAPI PdhGetCounterInfoW(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_W); #define PdhGetCounterInfo WINELIB_NAME_AW(PdhGetCounterInfo) Modified: trunk/reactos/include/psdk/pdhmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdhmsg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/pdhmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pdhmsg.h [iso-8859-1] Sun Feb 1 11:20:58 2009 @@ -33,6 +33,7 @@ #define PDH_CSTATUS_BAD_COUNTERNAME 0xc0000bc0 #define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 #define PDH_INVALID_DATA 0xc0000bc6 +#define PDH_NOT_IMPLEMENTED 0xc0000bd3 #define PDH_STRING_NOT_FOUND 0xc0000bd4 #endif /* _PDH_MSG_H_ */

1 0

[cwittich] 39271: sync cryptdlg with wine 1.1.14
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 11:13:15 2009 New Revision: 39271 URL: http://svn.reactos.org/svn/reactos?rev=39271&view=rev Log: sync cryptdlg with wine 1.1.14 Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc (with props) Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] Sun Feb 1 11:13:15 2009 @@ -25,3 +25,4 @@ #include "cryptdlg_En.rc" #include "cryptdlg_Fr.rc" #include "cryptdlg_Ko.rc" +#include "cryptdlg_Nl.rc" Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc [iso-8859-1] Sun Feb 1 11:13:15 2009 @@ -1,0 +1,36 @@ +/* + * cryptdlg dll Dutch resources + * + * Copyright 2009 Frans Kool + * + * 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 + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Certificaat beleid" + IDS_POLICY_ID "Beleid Identificatie: " + IDS_POLICY_QUALIFIER_INFO "Beleid kwalificator informatie" + IDS_POLICY_QUALIFIER_ID "Beleid kwalificator Id=" + IDS_CPS "CPS" + IDS_USER_NOTICE "Gebruikers verklaring" + IDS_QUALIFIER "Kwalificator" + IDS_NOTICE_REF "Verklaring referentie" + IDS_ORGANIZATION "Organisatie=" + IDS_NOTICE_NUM "Verklaring nummer=" + IDS_NOTICE_TEXT "Verklaring tekst=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Nl.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 39270: sync schannel with wine 1.1.14
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 11:09:58 2009 New Revision: 39270 URL: http://svn.reactos.org/svn/reactos?rev=39270&view=rev Log: sync schannel with wine 1.1.14 Modified: trunk/reactos/dll/win32/schannel/schannel.spec trunk/reactos/dll/win32/schannel/schannel_main.c Modified: trunk/reactos/dll/win32/schannel/schannel.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel.spec [iso-8859-1] Sun Feb 1 11:09:58 2009 @@ -26,8 +26,8 @@ @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) @ stub SslCrackCertificate -@ stub SslEmptyCacheA -@ stub SslEmptyCacheW +@ stdcall SslEmptyCacheA(str long) +@ stdcall SslEmptyCacheW(wstr long) @ stub SslFreeCertificate @ stub SslGenerateKeyPair @ stub SslGenerateRandomBits Modified: trunk/reactos/dll/win32/schannel/schannel_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/schannel/schannel_main.c [iso-8859-1] Sun Feb 1 11:09:58 2009 @@ -38,3 +38,15 @@ return TRUE; } + +BOOL WINAPI SslEmptyCacheA(LPSTR target, DWORD flags) +{ + FIXME("%s %x\n", debugstr_a(target), flags); + return TRUE; +} + +BOOL WINAPI SslEmptyCacheW(LPWSTR target, DWORD flags) +{ + FIXME("%s %x\n", debugstr_w(target), flags); + return TRUE; +}

1 0

[khornicek] 39269: - sync wined3d/d3d8/d3d9 with trunk - update gdi32 accordingly
by khornicek＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: khornicek Date: Sun Feb 1 10:18:22 2009 New Revision: 39269 URL: http://svn.reactos.org/svn/reactos?rev=39269&view=rev Log: - sync wined3d/d3d8/d3d9 with trunk - update gdi32 accordingly Added: branches/reactx/reactos/dll/directx/wine/wined3d/gl_compat.c (with props) branches/reactx/reactos/dll/directx/wine/wined3d/wined3d_gl.h (with props) branches/reactx/reactos/include/reactos/wine/wined3d.idl (with props) Removed: branches/reactx/reactos/include/reactos/wine/wined3d_caps.h branches/reactx/reactos/include/reactos/wine/wined3d_gl.h branches/reactx/reactos/include/reactos/wine/wined3d_interface.h branches/reactx/reactos/include/reactos/wine/wined3d_types.h Modified: branches/reactx/reactos/dll/directx/wine/d3d8/d3d8.rbuild branches/reactx/reactos/dll/directx/wine/d3d8/d3d8_private.h branches/reactx/reactos/dll/directx/wine/d3d8/device.c branches/reactx/reactos/dll/directx/wine/d3d8/directx.c branches/reactx/reactos/dll/directx/wine/d3d8/pixelshader.c branches/reactx/reactos/dll/directx/wine/d3d8/surface.c branches/reactx/reactos/dll/directx/wine/d3d8/vertexshader.c branches/reactx/reactos/dll/directx/wine/d3d8/volume.c branches/reactx/reactos/dll/directx/wine/d3d9/cubetexture.c branches/reactx/reactos/dll/directx/wine/d3d9/d3d9.rbuild branches/reactx/reactos/dll/directx/wine/d3d9/d3d9_private.h branches/reactx/reactos/dll/directx/wine/d3d9/device.c branches/reactx/reactos/dll/directx/wine/d3d9/directx.c branches/reactx/reactos/dll/directx/wine/d3d9/pixelshader.c branches/reactx/reactos/dll/directx/wine/d3d9/query.c branches/reactx/reactos/dll/directx/wine/d3d9/stateblock.c branches/reactx/reactos/dll/directx/wine/d3d9/surface.c branches/reactx/reactos/dll/directx/wine/d3d9/swapchain.c branches/reactx/reactos/dll/directx/wine/d3d9/texture.c branches/reactx/reactos/dll/directx/wine/d3d9/vertexdeclaration.c branches/reactx/reactos/dll/directx/wine/d3d9/vertexshader.c branches/reactx/reactos/dll/directx/wine/d3d9/volume.c branches/reactx/reactos/dll/directx/wine/d3d9/volumetexture.c branches/reactx/reactos/dll/directx/wine/wined3d/arb_program_shader.c branches/reactx/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c branches/reactx/reactos/dll/directx/wine/wined3d/baseshader.c branches/reactx/reactos/dll/directx/wine/wined3d/basetexture.c branches/reactx/reactos/dll/directx/wine/wined3d/clipper.c branches/reactx/reactos/dll/directx/wine/wined3d/context.c branches/reactx/reactos/dll/directx/wine/wined3d/cubetexture.c branches/reactx/reactos/dll/directx/wine/wined3d/device.c branches/reactx/reactos/dll/directx/wine/wined3d/directx.c branches/reactx/reactos/dll/directx/wine/wined3d/drawprim.c branches/reactx/reactos/dll/directx/wine/wined3d/glsl_shader.c branches/reactx/reactos/dll/directx/wine/wined3d/indexbuffer.c branches/reactx/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c branches/reactx/reactos/dll/directx/wine/wined3d/palette.c branches/reactx/reactos/dll/directx/wine/wined3d/pixelshader.c branches/reactx/reactos/dll/directx/wine/wined3d/query.c branches/reactx/reactos/dll/directx/wine/wined3d/resource.c branches/reactx/reactos/dll/directx/wine/wined3d/state.c branches/reactx/reactos/dll/directx/wine/wined3d/stateblock.c branches/reactx/reactos/dll/directx/wine/wined3d/surface.c branches/reactx/reactos/dll/directx/wine/wined3d/surface_base.c branches/reactx/reactos/dll/directx/wine/wined3d/surface_gdi.c branches/reactx/reactos/dll/directx/wine/wined3d/swapchain.c branches/reactx/reactos/dll/directx/wine/wined3d/swapchain_base.c branches/reactx/reactos/dll/directx/wine/wined3d/swapchain_gdi.c branches/reactx/reactos/dll/directx/wine/wined3d/texture.c branches/reactx/reactos/dll/directx/wine/wined3d/utils.c branches/reactx/reactos/dll/directx/wine/wined3d/vertexbuffer.c branches/reactx/reactos/dll/directx/wine/wined3d/vertexdeclaration.c branches/reactx/reactos/dll/directx/wine/wined3d/vertexshader.c branches/reactx/reactos/dll/directx/wine/wined3d/volume.c branches/reactx/reactos/dll/directx/wine/wined3d/volumetexture.c branches/reactx/reactos/dll/directx/wine/wined3d/wined3d.rbuild branches/reactx/reactos/dll/directx/wine/wined3d/wined3d_main.c branches/reactx/reactos/dll/directx/wine/wined3d/wined3d_private.h branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c branches/reactx/reactos/include/reactos/wine/wineheaders.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactx/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Added: branches/reactx/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Added: branches/reactx/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/wine… Modified: branches/reactx/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… Added: branches/reactx/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… Removed: branches/reactx/reactos/include/reactos/wine/wined3d_caps.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… Removed: branches/reactx/reactos/include/reactos/wine/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… Removed: branches/reactx/reactos/include/reactos/wine/wined3d_interface.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… Removed: branches/reactx/reactos/include/reactos/wine/wined3d_types.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… Modified: branches/reactx/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/…

1 0

[cwittich] 39268: fix debugprint
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 08:01:44 2009 New Revision: 39268 URL: http://svn.reactos.org/svn/reactos?rev=39268&view=rev Log: fix debugprint Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Sun Feb 1 08:01:44 2009 @@ -212,7 +212,7 @@ path[0] = 0; /* avoid returning ambiguous "X:" */ } - TRACE("GetTempPathW returning %u, %s\n", ret, path); + TRACE("GetTempPathW returning %u, %S\n", ret, path); return ret; }

1 0

[cwittich] 39267: sync hlink with wine 1.1.14
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 07:53:08 2009 New Revision: 39267 URL: http://svn.reactos.org/svn/reactos?rev=39267&view=rev Log: sync hlink with wine 1.1.14 Modified: trunk/reactos/dll/win32/hlink/extserv.c trunk/reactos/dll/win32/hlink/link.c Modified: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Sun Feb 1 07:53:08 2009 @@ -40,10 +40,10 @@ LPWSTR headers; } ExtensionService; -#define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) -#define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) -#define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl) -#define EXTENSIONSERVICES(x) ((IExtensionServices*) &(x)->lpIExtensionServicesVtbl) +#define EXTSERVUNK(x) ((IUnknown*)&(x)->lpIUnknownVtbl) +#define AUTHENTICATE(x) (&(x)->lpIAuthenticateVtbl) +#define HTTPNEGOTIATE(x) (&(x)->lpIHttpNegotiateVtbl) +#define EXTENSIONSERVICES(x) (&(x)->lpIExtensionServicesVtbl) #define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Sun Feb 1 07:53:08 2009 @@ -82,8 +82,7 @@ else if (This->Site) { IHlinkSite_GetMoniker(This->Site, This->SiteData, - OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, - (LPVOID)moniker); + OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, moniker); } } @@ -123,9 +122,9 @@ if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) *ppvObj = This; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ppvObj = (LPVOID*)&(This->lpPSVtbl); + *ppvObj = &(This->lpPSVtbl); else if (IsEqualIID(riid, &IID_IDataObject)) - *ppvObj = (LPVOID*)&(This->lpDOVtbl); + *ppvObj = &(This->lpDOVtbl); if (*ppvObj) {

1 0

[cwittich] 39266: sync urlmon to wine 1.1.14
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 07:46:44 2009 New Revision: 39266 URL: http://svn.reactos.org/svn/reactos?rev=39266&view=rev Log: sync urlmon to wine 1.1.14 Modified: trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/urlmon.spec Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Sun Feb 1 07:46:44 2009 @@ -1183,6 +1183,8 @@ case BINDSTATUS_DIRECTBIND: This->report_mime = FALSE; break; + case BINDSTATUS_ACCEPTRANGES: + break; default: FIXME("Unhandled status code %d\n", ulStatusCode); return E_NOTIMPL; Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Sun Feb 1 07:46:44 2009 @@ -486,6 +486,7 @@ case BINDSTATUS_SENDINGREQUEST: case BINDSTATUS_CACHEFILENAMEAVAILABLE: case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_ACCEPTRANGES: case BINDSTATUS_MIMETYPEAVAILABLE: if(!This->protocol_sink) return S_OK; Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] Sun Feb 1 07:46:44 2009 @@ -63,6 +63,7 @@ const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + BOOL https; DWORD flags, grfBINDF; BINDINFO bind_info; IInternetProtocolSink *protocol_sink; @@ -309,7 +310,8 @@ LPOLESTR user_agent = NULL, accept_mimes[257]; HRESULT hres; - static const WCHAR wszHttp[] = {'h','t','t','p',':'}; + static const WCHAR httpW[] = {'h','t','t','p',':'}; + static const WCHAR httpsW[] = {'h','t','t','p','s',':'}; static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = {{'G','E','T',0}, {'P','O','S','T',0}, @@ -330,8 +332,9 @@ goto done; } - if (strlenW(szUrl) < sizeof(wszHttp)/sizeof(WCHAR) - || memcmp(szUrl, wszHttp, sizeof(wszHttp))) + if(This->https + ? strncmpW(szUrl, httpsW, sizeof(httpsW)/sizeof(WCHAR)) + : strncmpW(szUrl, httpW, sizeof(httpW)/sizeof(WCHAR))) { hres = MK_E_SYNTAX; goto done; @@ -351,7 +354,7 @@ user = strndupW(url.lpszUserName, url.dwUserNameLength); pass = strndupW(url.lpszPassword, url.dwPasswordLength); if (!url.nPort) - url.nPort = INTERNET_DEFAULT_HTTP_PORT; + url.nPort = This->https ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; if(!(This->grfBINDF & BINDF_FROMURLMON)) IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_DIRECTBIND, NULL); @@ -397,7 +400,9 @@ InternetSetStatusCallbackW(This->internet, HTTPPROTOCOL_InternetStatusCallback); This->connect = InternetConnectW(This->internet, host, url.nPort, user, - pass, INTERNET_SERVICE_HTTP, 0, (DWORD_PTR)This); + pass, INTERNET_SERVICE_HTTP, + This->https ? INTERNET_FLAG_SECURE : 0, + (DWORD_PTR)This); if (!This->connect) { WARN("InternetConnect failed: %d\n", GetLastError()); @@ -421,6 +426,8 @@ request_flags |= INTERNET_FLAG_NO_CACHE_WRITE; if (This->grfBINDF & BINDF_NEEDFILE) request_flags |= INTERNET_FLAG_NEED_FILE; + if (This->https) + request_flags |= INTERNET_FLAG_SECURE; This->request = HttpOpenRequestW(This->connect, This->bind_info.dwBindVerb < BINDVERB_CUSTOM ? wszBindVerb[This->bind_info.dwBindVerb] : This->bind_info.szCustomVerb, @@ -617,6 +624,9 @@ } } } + + if(This->https) + IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_ACCEPTRANGES, NULL); len = 0; if ((!HttpQueryInfoW(This->request, HTTP_QUERY_CONTENT_TYPE, content_type, &len, NULL) && @@ -923,36 +933,36 @@ HttpProtocol_UnlockRequest }; -HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); - - URLMON_LockModule(); - - ret = heap_alloc(sizeof(HttpProtocol)); + ret = heap_alloc_zero(sizeof(HttpProtocol)); + if(!ret) + return E_OUTOFMEMORY; ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; - ret->flags = ret->grfBINDF = 0; - memset(&ret->bind_info, 0, sizeof(ret->bind_info)); - ret->protocol_sink = 0; - ret->http_negotiate = 0; - ret->internet = ret->connect = ret->request = 0; - ret->full_header = 0; - ret->lock = 0; - ret->current_position = ret->content_length = ret->available_bytes = 0; - ret->priority = 0; + + ret->https = https; ret->ref = 1; *ppobj = PROTOCOL(ret); + URLMON_LockModule(); return S_OK; } +HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +{ + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + return create_http_protocol(FALSE, ppobj); +} + HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { - FIXME("(%p %p)\n", pUnkOuter, ppobj); - return E_NOINTERFACE; -} + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + return create_http_protocol(TRUE, ppobj); +} Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sun Feb 1 07:46:44 2009 @@ -532,7 +532,6 @@ if(SUCCEEDED(hres)) { URL_COMPONENTSW url; WCHAR *host, *path, *user, *pass; - DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -597,12 +596,6 @@ url.nPort = INTERNET_DEFAULT_GOPHER_PORT; dwService = INTERNET_SERVICE_GOPHER; break; - - case INTERNET_SCHEME_HTTPS: - if (!url.nPort) - url.nPort = INTERNET_DEFAULT_HTTPS_PORT; - dwService = INTERNET_SERVICE_HTTP; - break; } bind->hconnect = InternetConnectW(bind->hinternet, host, url.nPort, user, pass, @@ -647,28 +640,6 @@ bSuccess = TRUE; else hres = HRESULT_FROM_WIN32(GetLastError()); - break; - - case INTERNET_SERVICE_HTTP: - bind->hrequest = HttpOpenRequestW(bind->hconnect, NULL, path, NULL, NULL, NULL, 0, (DWORD_PTR)bind); - if (!bind->hrequest) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - } - else if (!HttpSendRequestW(bind->hrequest, NULL, 0, NULL, 0)) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - InternetCloseHandle(bind->hrequest); - } - else - { - HttpQueryInfoW(bind->hrequest, - HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, - &bind->expected_size, - &lensz, - NULL); - bSuccess = TRUE; - } break; } if(bSuccess) @@ -734,8 +705,7 @@ } if(IsEqualGUID(&IID_IStream, riid) && - ( url.nScheme == INTERNET_SCHEME_HTTPS - || url.nScheme == INTERNET_SCHEME_FTP + ( url.nScheme == INTERNET_SCHEME_FTP || url.nScheme == INTERNET_SCHEME_GOPHER)) return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, ppvObject); @@ -1282,6 +1252,17 @@ } /*********************************************************************** + * HlinkSimpleNavigateToMoniker (URLMON.@) + */ +HRESULT WINAPI HlinkSimpleNavigateToMoniker(IMoniker *pmkTarget, + LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk, + IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/*********************************************************************** * HlinkSimpleNavigateToString (URLMON.@) */ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget, Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Sun Feb 1 07:46:44 2009 @@ -48,7 +48,7 @@ @ stub HlinkGoForward @ stub HlinkNavigateMoniker @ stdcall HlinkNavigateString(ptr wstr) -@ stub HlinkSimpleNavigateToMoniker +@ stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) @ stdcall IsAsyncMoniker(ptr) @ stdcall IsLoggingEnabledA(str)

1 0

[cwittich] 39265: uncomment the exports
by cwittich＠svn.reactos.org 01 Feb '09

01 Feb '09

Author: cwittich Date: Sun Feb 1 07:38:30 2009 New Revision: 39265 URL: http://svn.reactos.org/svn/reactos?rev=39265&view=rev Log: uncomment the exports Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Sun Feb 1 07:38:30 2009 @@ -529,7 +529,7 @@ _strrev @523 _strset @524 _strtime @525 -; _strtoi64 @526 + _strtoi64 @526 _strtoui64=strtoull @527 _strupr @528 _swab @529 @@ -577,8 +577,8 @@ _wcsnset @571 _wcsrev @572 _wcsset @573 -; _wcstoi64 @574 -; _wcstoui64 @575 + _wcstoi64 @574 + _wcstoui64 @575 _wcsupr @576 _wctime @577 ; _wctime64 @578

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs