September 2010 - Wine-commits

Alexandre Goujon : avifil32: Fix EditStreamSetInfo wine checks.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: ee706d3d687e63d3f9bef635e2ef904b7005d1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee706d3d687e63d3f9bef635e… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Sep 4 17:26:52 2010 +0200 avifil32: Fix EditStreamSetInfo wine checks. --- dlls/avifil32/api.c | 7 ++- dlls/avifil32/editstream.c | 16 ++----- dlls/avifil32/tests/api.c | 102 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 108 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 8ef75d3..11eb4dd 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2150,9 +2150,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, TRACE("(%p,%p,%d)\n", pstream, asi, size); - if (pstream == NULL) - return AVIERR_BADHANDLE; - if ((DWORD)size < sizeof(AVISTREAMINFOA)) + if (size >= 0 && size < sizeof(AVISTREAMINFOA)) return AVIERR_BADSIZE; memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName)); @@ -2173,6 +2171,9 @@ HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM pstream, LPAVISTREAMINFOW asi, TRACE("(%p,%p,%d)\n", pstream, asi, size); + if (size >= 0 && size < sizeof(AVISTREAMINFOA)) + return AVIERR_BADSIZE; + hr = IAVIStream_QueryInterface(pstream, &IID_IAVIEditStream,(LPVOID*)&pEdit); if (SUCCEEDED(hr) && pEdit != NULL) { hr = IAVIEditStream_SetInfo(pEdit, asi, size); diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index f19f3ac..10b6b30 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -775,23 +775,15 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, TRACE("(%p,%p,%d)\n",iface,asi,size); /* check parameters */ - if (asi == NULL) - return AVIERR_BADPARAM; - if (size != sizeof(AVISTREAMINFOW)) + if (size >= 0 && size < sizeof(AVISTREAMINFOW)) return AVIERR_BADSIZE; - if (asi->dwScale == 0 || asi->dwRate == 0 || (LONG)asi->dwQuality < -1 || - asi->dwQuality > ICQUALITY_HIGH) - return AVIERR_ERROR; This->sInfo.wLanguage = asi->wLanguage; This->sInfo.wPriority = asi->wPriority; This->sInfo.dwStart = asi->dwStart; - if (asi->dwRate != 0) - This->sInfo.dwRate = asi->dwRate; - if (asi->dwScale != 0) - This->sInfo.dwScale = asi->dwScale; - if (asi->dwQuality <= ICQUALITY_HIGH) - This->sInfo.dwQuality = ICQUALITY_HIGH; + This->sInfo.dwRate = asi->dwRate; + This->sInfo.dwScale = asi->dwScale; + This->sInfo.dwQuality = asi->dwQuality; CopyRect(&This->sInfo.rcFrame, &asi->rcFrame); memcpy(This->sInfo.szName, asi->szName, sizeof(asi->szName)); This->sInfo.dwEditCount++; diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index fe295bf..14ad4b4 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -194,11 +194,11 @@ static void test_AVISaveOptions(void) SetLastError(0xdeadbeef); hres = EditStreamSetNameA(streams[0], winetest0); - todo_wine ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres); + ok(hres == AVIERR_OK, "0: got 0x%x (expected AVIERR_OK)\n", hres); SetLastError(0xdeadbeef); hres = EditStreamSetNameA(streams[1], winetest1); - todo_wine ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres); + ok(hres == AVIERR_OK, "1: got 0x%x (expected AVIERR_OK)\n", hres); if (winetest_interactive) { SetLastError(0xdeadbeef); @@ -223,6 +223,103 @@ static void test_AVISaveOptions(void) /* ########################### */ +static void test_EditStreamSetInfo(void) +{ + PAVISTREAM stream = NULL; + HRESULT hres; + AVISTREAMINFO info, info2; + + hres = CreateEditableStream(&stream, NULL); + ok(hres == AVIERR_OK, "got 0x%08X, expected AVIERR_OK\n", hres); + + + if(0) /* Crashing - first parameter not checked */ + hres = EditStreamSetInfo(NULL, &info, sizeof(AVISTREAMINFO) ); + + /* Size parameter is somehow checked (notice the crash with size=-1 below) */ + hres = EditStreamSetInfo(stream, NULL, 0); + ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + + hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO)-1 ); + ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + + if(0) + { /* Crashing - second parameter not checked */ + hres = EditStreamSetInfo(stream, NULL, sizeof(AVISTREAMINFO) ); + + hres = EditStreamSetInfo(stream, NULL, -1); + ok( hres == AVIERR_BADSIZE, "got 0x%08X, expected AVIERR_BADSIZE\n", hres); + } + + hres = AVIStreamInfo(stream, &info, sizeof(AVISTREAMINFO) ); + ok( hres == 0, "got 0x%08X, expected 0\n", hres); + + /* Does the function check what's it's updating ? */ + +#define IS_INFO_UPDATED(m) do { \ + hres = EditStreamSetInfo(stream, &info, sizeof(AVISTREAMINFO) ); \ + ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ + hres = AVIStreamInfo(stream, &info2, sizeof(AVISTREAMINFO) ); \ + ok( hres == 0, "got 0x%08X, expected 0\n", hres); \ + ok( info2.m == info.m, "EditStreamSetInfo did not update "#m" parameter\n" ); \ + } while(0) + + info.dwStart++; + IS_INFO_UPDATED(dwStart); + info.dwStart = 0; + IS_INFO_UPDATED(dwStart); + + info.wPriority++; + IS_INFO_UPDATED(wPriority); + info.wPriority = 0; + IS_INFO_UPDATED(wPriority); + + info.wLanguage++; + IS_INFO_UPDATED(wLanguage); + info.wLanguage = 0; + IS_INFO_UPDATED(wLanguage); + + info.dwScale++; + IS_INFO_UPDATED(dwScale); + info.dwScale = 0; + IS_INFO_UPDATED(dwScale); + + info.dwRate++; + IS_INFO_UPDATED(dwRate); + info.dwRate = 0; + IS_INFO_UPDATED(dwRate); + + info.dwQuality++; + IS_INFO_UPDATED(dwQuality); + info.dwQuality = 0; + IS_INFO_UPDATED(dwQuality); + info.dwQuality = -2; + IS_INFO_UPDATED(dwQuality); + info.dwQuality = ICQUALITY_HIGH+1; + IS_INFO_UPDATED(dwQuality); + + info.rcFrame.left = 0; + IS_INFO_UPDATED(rcFrame.left); + info.rcFrame.top = 0; + IS_INFO_UPDATED(rcFrame.top); + info.rcFrame.right = 0; + IS_INFO_UPDATED(rcFrame.right); + info.rcFrame.bottom = 0; + IS_INFO_UPDATED(rcFrame.bottom); + + info.rcFrame.left = -1; + IS_INFO_UPDATED(rcFrame.left); + info.rcFrame.top = -1; + IS_INFO_UPDATED(rcFrame.top); + info.rcFrame.right = -1; + IS_INFO_UPDATED(rcFrame.right); + info.rcFrame.bottom = -1; + IS_INFO_UPDATED(rcFrame.bottom); + AVIStreamRelease(stream); +#undef IS_INFO_UPDATED +} + + static void init_test_struct(COMMON_AVI_HEADERS *cah) { memcpy(cah->fh, deffh, sizeof(deffh)); @@ -451,6 +548,7 @@ START_TEST(api) { AVIFileInit(); + test_EditStreamSetInfo(); test_AVISaveOptions(); test_default_data(); test_amh_corruption();

1 0

Austin English : rstrtmgr: Add stubs for RmGetList and RmRegisterResources.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: e899b55ec167a32cbbc90f3fe8db3db66338ceac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e899b55ec167a32cbbc90f3fe… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 9 11:19:41 2010 -0500 rstrtmgr: Add stubs for RmGetList and RmRegisterResources. --- dlls/rstrtmgr/main.c | 30 +++++++++++++++++++++- dlls/rstrtmgr/rstrtmgr.spec | 4 +- include/Makefile.in | 1 + include/restartmanager.h | 58 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index f39ca83..8ac62ae 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -23,6 +23,8 @@ #include "winbase.h" #include "wine/debug.h" +#include "restartmanager.h" + WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr); /***************************************************** @@ -48,9 +50,35 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } /*********************************************************************** + * RmGetList (rstrtmgr.@) + * + * Retrieve the list of all applications and services using resources registered with the Restart Manager session + */ +DWORD WINAPI RmGetList(DWORD dwSessionHandle, UINT *pnProcInfoNeeded, UINT *pnProcInfo, + RM_PROCESS_INFO *rgAffectedApps[], LPDWORD lpdwRebootReasons) +{ + FIXME("%d, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * RmRegisterResources (rstrtmgr.@) + * + * Register resources for a Restart Manager session + */ +DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgsFilenames[], + UINT nApplications, RM_UNIQUE_PROCESS *rgApplications, + UINT nServices, LPCWSTR rgsServiceNames[]) +{ + FIXME("%d, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, + nApplications, rgApplications, nServices, rgsServiceNames); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * RmStartSession (rstrtmgr.@) * - * Start a new restart manager session + * Start a new Restart Manager session */ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[]) { diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index f9466a8..c943658 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -2,9 +2,9 @@ @ stub RmCancelCurrentTask @ stub RmEndSession @ stub RmGetFilterList -@ stub RmGetList +@ stdcall RmGetList(long ptr ptr ptr ptr) @ stub RmJoinSession -@ stub RmRegisterResources +@ stdcall RmRegisterResources(long long ptr long ptr long ptr) @ stub RmRemoveFilter @ stub RmReserveHeap @ stub RmRestart diff --git a/include/Makefile.in b/include/Makefile.in index 2812eff..8fd6663 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -425,6 +425,7 @@ SRCDIR_INCLUDES = \ raserror.h \ reason.h \ regstr.h \ + restartmanager.h \ richedit.h \ rmxfguid.h \ row.idl \ diff --git a/include/restartmanager.h b/include/restartmanager.h new file mode 100644 index 0000000..c2250bb --- /dev/null +++ b/include/restartmanager.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2010 Austin English + * + * 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 + */ + +#ifndef RESTARTMANAGER_H +#define RESTARTMANAGER_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define CCH_RM_MAX_APP_NAME 255 +#define CH_RM_MAX_SVC_NAME 63 + +typedef enum { + RmUnknownApp = 0, + RmMainWindow = 1, + RmOtherWindow = 2, + RmService = 3, + RmExplorer = 4, + RmConsole = 5, + RmCritical = 1000 +} RM_APP_TYPE; + +typedef struct { + DWORD dwProcessId; + FILETIME ProcessStartTime; +} RM_UNIQUE_PROCESS, *PRM_UNIQUE_PROCESS; + +typedef struct { + RM_UNIQUE_PROCESS Process; + WCHAR strAppName[CCH_RM_MAX_APP_NAME+1]; + WCHAR strServiceShortName[CH_RM_MAX_SVC_NAME+1]; + RM_APP_TYPE ApplicationType; + ULONG AppStatus; + DWORD TSSessionID; + BOOL bRestartable; +} RM_PROCESS_INFO, *PRM_PROCESS_INFO; + +#ifdef __cplusplus +} +#endif + +#endif /* RESTARTMANAGER_H */

1 0

Austin English : kernel32/tests: Typo fixes.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 66e635adac8ae91c22c8c2180f6bf939e64c958e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e635adac8ae91c22c8c2180… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 9 11:21:30 2010 -0500 kernel32/tests: Typo fixes. --- dlls/kernel32/tests/time.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 5dd0d41..36dcbdf 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -437,8 +437,8 @@ static void test_TzSpecificLocalTimeToSystemTime(void) tzE.StandardBias=0; tzE.DaylightBias=-60; tzE.StandardDate.wMonth=10; - tzE.StandardDate.wDayOfWeek=0; /*sunday */ - tzE.StandardDate.wDay=5; /* last (sunday) of the month */ + tzE.StandardDate.wDayOfWeek=0; /* Sunday */ + tzE.StandardDate.wDay=5; /* last (Sunday) of the month */ tzE.StandardDate.wHour=3; tzE.DaylightDate.wMonth=3; tzE.DaylightDate.wDay=5; @@ -448,19 +448,19 @@ static void test_TzSpecificLocalTimeToSystemTime(void) tzW.StandardBias=0; tzW.DaylightBias=-60; tzW.StandardDate.wMonth=10; - tzW.StandardDate.wDayOfWeek=0; /*sunday */ - tzW.StandardDate.wDay=4; /* 4th (sunday) of the month */ + tzW.StandardDate.wDayOfWeek=0; /* Sunday */ + tzW.StandardDate.wDay=4; /* 4th (Sunday) of the month */ tzW.StandardDate.wHour=2; tzW.DaylightDate.wMonth=4; tzW.DaylightDate.wDay=1; tzW.DaylightDate.wHour=2; - /* timezone Eastern hemisphere */ + /* timezone Southern hemisphere */ tzS.Bias=240; tzS.StandardBias=0; tzS.DaylightBias=-60; tzS.StandardDate.wMonth=4; - tzS.StandardDate.wDayOfWeek=0; /*sunday */ - tzS.StandardDate.wDay=1; /* 1st (sunday) of the month */ + tzS.StandardDate.wDayOfWeek=0; /*Sunday */ + tzS.StandardDate.wDay=1; /* 1st (Sunday) of the month */ tzS.StandardDate.wHour=2; tzS.DaylightDate.wMonth=10; tzS.DaylightDate.wDay=4; @@ -483,7 +483,7 @@ static void test_TzSpecificLocalTimeToSystemTime(void) { 10, &tzW, {2004,10,-1,24,1,0,0,0}, 4}, { 11, &tzW, {2004,10,-1,24,1,59,59,999}, 4}, { 12, &tzW, {2004,10,-1,24,2,0,0,0 }, 6}, - /* and now south */ + /* and now South */ { 13, &tzS, {2004,4,-1,4,1,0,0,0}, 4}, { 14, &tzS, {2004,4,-1,4,1,59,59,999}, 4}, { 15, &tzS, {2004,4,-1,4,2,0,0,0}, 6}, @@ -548,7 +548,7 @@ static void test_TzSpecificLocalTimeToSystemTime(void) { 10, &tzW, {2004,10,-1,24,4,0,0,0}, 1}, { 11, &tzW, {2004,10,-1,24,4,59,59,999}, 1}, { 12, &tzW, {2004,10,-1,24,5,0,0,0 }, 1}, - /* and now south */ + /* and now South */ { 13, &tzS, {2004,4,-1,4,4,0,0,0}, 1}, { 14, &tzS, {2004,4,-1,4,4,59,59,999}, 1}, { 15, &tzS, {2004,4,-1,4,5,0,0,0}, 1},

1 0

Austin English : ws2_32: Add a stub for WSANSPIoctl.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 4ada99aa83c5fc84bb77c5b5b14a9fa0c220b6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ada99aa83c5fc84bb77c5b5b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 9 11:32:56 2010 -0500 ws2_32: Add a stub for WSANSPIoctl. --- dlls/ws2_32/socket.c | 13 +++++++++++++ dlls/ws2_32/ws2_32.spec | 2 +- include/winsock2.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 82d157c..0335d41 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6020,3 +6020,16 @@ INT WINAPI WSCWriteProviderOrder( LPDWORD entry, DWORD number ) FIXME("(%p 0x%08x) Stub!\n", entry, number); return 0; } + +/*********************************************************************** + * WSANSPIoctl (WS2_32.91) + */ +INT WINAPI WSANSPIoctl( HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer, + DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer, + LPDWORD lpcbBytesReturned, LPWSACOMPLETION lpCompletion ) +{ + FIXME("(%p, 0x%08x, %p, 0x%08x, %p, 0x%08x, %p, %p) Stub!\n", hLookup, dwControlCode, + lpvInBuffer, cbInBuffer, lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpCompletion); + WSASetLastError(WSA_NOT_ENOUGH_MEMORY); + return SOCKET_ERROR; +}; diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index a77c215..537e7f3 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -85,7 +85,7 @@ @ stdcall WSALookupServiceEnd(long) @ stdcall WSALookupServiceNextA(long long ptr ptr) @ stdcall WSALookupServiceNextW(long long ptr ptr) -@ stub WSANSPIoctl +@ stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) @ stdcall WSANtohl(long long ptr) @ stdcall WSANtohs(long long ptr) @ stdcall WSAProviderConfigChange(ptr ptr ptr) diff --git a/include/winsock2.h b/include/winsock2.h index 5d5bd60..c346473 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -506,6 +506,37 @@ DECL_WINELIB_TYPE_AW(WSANAMESPACE_INFO) DECL_WINELIB_TYPE_AW(PWSANAMESPACE_INFO) DECL_WINELIB_TYPE_AW(LPWSANAMESPACE_INFO) +typedef enum _WSACOMPLETIONTYPE { + NSP_NOTIFY_IMMEDIATELY = 0, + NSP_NOTIFY_HWND = 1, + NSP_NOTIFY_EVENT = 2, + NSP_NOTIFY_PORT = 3, + NSP_NOTIFY_APC = 4 +} WSACOMPLETIONTYPE, * PWSACOMPLETIONTYPE, * LPWSACOMPLETIONTYPE; + +typedef struct _WSACOMPLETION { + WSACOMPLETIONTYPE Type; + union { + struct { + HWND hWnd; + UINT uMsg; + WPARAM context; + } WindowMessage; + struct { + LPWSAOVERLAPPED lpOverlapped; + } Event; + struct { + LPWSAOVERLAPPED lpOverlapped; + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpfnCompletionProc; + } Apc; + struct { + LPWSAOVERLAPPED lpOverlapped; + HANDLE hPort; + ULONG_PTR Key; + } Port; + } Parameters; +} WSACOMPLETION, *PWSACOMPLETION, *LPWSACOMPLETION; + /* * Winsock Function Typedefs * @@ -613,6 +644,7 @@ INT WINAPI WSALookupServiceEnd(HANDLE); INT WINAPI WSALookupServiceNextA(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETA); INT WINAPI WSALookupServiceNextW(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); #define WSALookupServiceNext WINELIB_NAME_AW(WSALookupServiceNext) +int WINAPI WSANSPIoctl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); int WINAPI WSANtohl(SOCKET,ULONG,ULONG*); int WINAPI WSANtohs(SOCKET,WS(u_short),WS(u_short)*); INT WINAPI WSAProviderConfigChange(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); @@ -685,6 +717,7 @@ typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND(HANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTA)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETA); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); #define LPFN_WSALOOKUPSERVICENEXT WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICENEXT) +typedef int (WINAPI *LPFN_WSANSPIoctl)(HANDLE, DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET,WS(u_short),WS(u_short)*); typedef INT (WINAPI *LPFN_WSAPROVIDERCONFIGCHANGE)(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);

1 0

Luca Bennati : crypt32: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 5687a1640798ada5459182cf347d92b15ec0260b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5687a1640798ada5459182cf3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:14:35 2010 +0200 crypt32: Update Italian translation. --- dlls/crypt32/crypt32_It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/crypt32_It.rc b/dlls/crypt32/crypt32_It.rc index 6ca2a15..5aa53f4 100644 --- a/dlls/crypt32/crypt32_It.rc +++ b/dlls/crypt32/crypt32_It.rc @@ -36,7 +36,7 @@ STRINGTABLE IDS_KEY_USAGE "Uso della chiave" IDS_CERT_POLICIES "Policy del certificato" IDS_SUBJECT_KEY_IDENTIFIER "Identificatore chiave soggetto" - IDS_CRL_REASON_CODE "Codice Motico CRL" + IDS_CRL_REASON_CODE "Codice Motivo CRL" IDS_CRL_DIST_POINTS "Punti Distribuzione CRL" IDS_ENHANCED_KEY_USAGE "Uso chiave avanzata" IDS_AUTHORITY_INFO_ACCESS "Accesso Informazioni Autorità" @@ -49,7 +49,7 @@ STRINGTABLE IDS_MESSAGE_DIGEST "Impronta Messaggio" IDS_SIGNING_TIME "Ora Firma" IDS_COUNTER_SIGN "Controfirma" - IDS_CHALLENGE_PASSWORD "Challenge Password" + IDS_CHALLENGE_PASSWORD "Domanda di sicurezza" IDS_UNSTRUCTURED_ADDRESS "Indirizzo non strutturato" IDS_SMIME_CAPABILITIES "Capacità SMIME" IDS_PREFER_SIGNED_DATA "Preferisci Dati Firmati" @@ -191,7 +191,7 @@ STRINGTABLE IDS_ALT_NAME_DIRECTORY_NAME "Indirizzo della cartella" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "Indirizzo IP=" - IDS_ALT_NAME_MASK "Mask=" + IDS_ALT_NAME_MASK "Maschera=" IDS_ALT_NAME_REGISTERED_ID "ID registrato=" IDS_USAGE_UNKNOWN "Uso della Chiave Sconosciuto" IDS_SUBJECT_TYPE "Tipo Soggetto="

1 0

Luca Bennati : cryptui: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 5e87eacb1426f2510b150842de032f11d609eb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e87eacb1426f2510b150842d… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:27:51 2010 +0200 cryptui: Update Italian translation. --- dlls/cryptui/cryptui_It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/cryptui_It.rc b/dlls/cryptui/cryptui_It.rc index 3ca7e00..7c9d522 100644 --- a/dlls/cryptui/cryptui_It.rc +++ b/dlls/cryptui/cryptui_It.rc @@ -97,10 +97,10 @@ STRINGTABLE IDS_IMPORT_CONTENT_PFX "Scambio Informazioni Personali" IDS_IMPORT_CONTENT_STORE "Deposito Certificati" IDS_IMPORT_SUCCEEDED "Importazione riuscita." - IDS_IMPORT_FAILED "Imposrtazione fallita." + IDS_IMPORT_FAILED "Importazione fallita." IDS_WIZARD_TITLE_FONT "Arial" IDS_PURPOSE_ALL "<Tutti>" - IDS_PURPOSE_ADVANCED "<Advanced Purposes>" + IDS_PURPOSE_ADVANCED "<Ragioni speciali>" IDS_SUBJECT_COLUMN "Emesso per" IDS_ISSUER_COLUMN "Emesso da" IDS_EXPIRATION_COLUMN "Data di scadenza" @@ -154,7 +154,7 @@ STRINGTABLE IDS_EXPORT_FILE_SUBTITLE "Specifica il nome del file nel quale il contenuto sarà salvato." IDS_EXPORT_FILE_EXISTS "File specificato esistene. Vuoi sostituirlo?" IDS_EXPORT_FILTER_CERT "Binario DER-Encoded X.509 (*.cer)" - IDS_EXPORT_FILTER_BASE64_CERT "Base64-Encoded X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "X.509 Base64-Encoded (*.cer)" IDS_EXPORT_FILTER_CRL "Lista di Revoca di Certificati (*.crl)" IDS_EXPORT_FILTER_CTL "Lista di Fiducia di Certificati (*.stl)" IDS_EXPORT_FILTER_CMS "Messaggi CMS/PKCS #7 (*.p7b)" @@ -422,9 +422,9 @@ CAPTION "Guida all'Esportazione del Certificato" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Seleziona il formato che vuoi usare:", -1, 21,1,195,10 - AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", + AUTORADIOBUTTON "X.509 &DER-encoded (.cer)", IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP - AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", + AUTORADIOBUTTON "X.509 Ba&se64-encoded (.cer):", IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Messaggio &Crittografico con Sintassi Standard/Messaggio PKCS #7 (.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON

1 0

Luca Bennati : kernel32: Update Italian translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 7b96a286118c5cd7baae6f9d1abd408c89695e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b96a286118c5cd7baae6f9d1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Sep 9 15:40:19 2010 +0200 kernel32: Update Italian translation. --- dlls/kernel32/nls/winerr_ita.mc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/nls/winerr_ita.mc b/dlls/kernel32/nls/winerr_ita.mc index 0146857..29f7975 100644 --- a/dlls/kernel32/nls/winerr_ita.mc +++ b/dlls/kernel32/nls/winerr_ita.mc @@ -853,7 +853,7 @@ Chiamate annidate LoadModule non permesse MessageId=216 SymbolicName=ERROR_EXE_MACHINE_TYPE_MISMATCH Language=ITA -Machine type mismatch +Discordanza di tipo di macchina . MessageId=230 SymbolicName=ERROR_BAD_PIPE

1 0

Roderick Colenbrander : wined3d: Add Intel gpu and driver information.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: a352ad209719f947bffa2989503a2e08cc3c7016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a352ad209719f947bffa29895… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 9 04:26:22 2010 +0200 wined3d: Add Intel gpu and driver information. --- dlls/wined3d/directx.c | 25 ++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 4 ++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c127571..2f4fd55 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -999,6 +999,17 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_ATI_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, {DRIVER_ATI_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, + /* Intel + * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp + * drivers used ialmrnt5.dll for GMA800/GMA900 but at some point the file was renamed to + * igxprd32.dll but the GMA800 driver was never updated. */ + {DRIVER_INTEL_GMA800, DRIVER_MODEL_NT5X, "ialmrnt5.dll", 14, 10, 3889}, + {DRIVER_INTEL_GMA900, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 4764}, + {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 4926}, + {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 5218}, + {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 14, 10, 1504}, + {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 15, 10, 1666}, + /* Nvidia * - Geforce6 and newer cards are supported by the current driver (197.x) on XP-Win7 * - GeforceFX support is up to 173.x on <= XP @@ -1074,9 +1085,17 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_ATI_R600, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4800, "ATI Radeon HD 4800 Series", DRIVER_ATI_R600, }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, }, - {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, } - - /* TODO: Add information about legacy ATI hardware, Intel and other cards. */ + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, }, + /* Intel cards */ + {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800 }, + {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800 }, + {HW_VENDOR_INTEL, CARD_INTEL_I865G, "Intel(R) 82865G Graphics Controller", DRIVER_INTEL_GMA800 }, + {HW_VENDOR_INTEL, CARD_INTEL_I915G, "Intel(R) 82915G/GV/910GL Express Chipset Family", DRIVER_INTEL_GMA900 }, + {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900 }, + {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950 }, + {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000 } + + /* TODO: Add information about legacy ATI hardware and other cards. */ }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9e6e83..9edc83a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1241,6 +1241,10 @@ enum wined3d_display_driver { DRIVER_ATI_R300, DRIVER_ATI_R600, + DRIVER_INTEL_GMA800, + DRIVER_INTEL_GMA900, + DRIVER_INTEL_GMA950, + DRIVER_INTEL_GMA3000, DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX,

1 0

Paul Vriens : dlls: Fix some specfiles with respect to 'str' and 'wstr' usage.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 75c5484174462a521856b01c17abb18e2684bc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c5484174462a521856b01c1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 9 11:30:40 2010 +0200 dlls: Fix some specfiles with respect to 'str' and 'wstr' usage. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/msi/msi.spec | 4 ++-- dlls/odbccp32/odbccp32.spec | 4 ++-- dlls/rasapi32/rasapi32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/shell32/shell32.spec | 2 +- dlls/winspool.drv/winspool.drv.spec | 2 +- dlls/wldap32/wldap32.spec | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ac69d3c..11a335b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -95,7 +95,7 @@ # @ stub CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure -@ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @@ -314,7 +314,7 @@ @ stdcall InitiateSystemShutdownA(str str long long long) @ stdcall InitiateSystemShutdownExA(str str long long long long) @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) -@ stdcall InitiateSystemShutdownW(str str long long long) +@ stdcall InitiateSystemShutdownW(wstr wstr long long long) @ stub InstallApplication @ stub IsProcessRestricted @ stdcall IsTextUnicode(ptr long ptr) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index f0e3238..fd047f8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -174,7 +174,7 @@ 178 stdcall MsiGetPatchInfoA(str str ptr ptr) 179 stdcall MsiGetPatchInfoW(wstr wstr ptr ptr) 180 stdcall MsiEnumPatchesA(str long ptr ptr ptr) -181 stdcall MsiEnumPatchesW(str long ptr ptr ptr) +181 stdcall MsiEnumPatchesW(wstr long ptr ptr ptr) 182 stdcall -private DllGetVersion(ptr) 183 stub MsiGetProductCodeFromPackageCodeA 184 stub MsiGetProductCodeFromPackageCodeW @@ -214,7 +214,7 @@ 218 stdcall MsiGetFileHashA(str long ptr) 219 stdcall MsiGetFileHashW(wstr long ptr) 220 stub MsiEnumComponentCostsA -221 stdcall MsiEnumComponentCostsW(long str long long ptr ptr ptr ptr) +221 stdcall MsiEnumComponentCostsW(long wstr long long ptr ptr ptr ptr) 222 stdcall MsiCreateAndVerifyInstallerDirectory(long) 223 stdcall MsiGetFileSignatureInformationA(str long ptr ptr ptr) 224 stdcall MsiGetFileSignatureInformationW(wstr long ptr ptr ptr) diff --git a/dlls/odbccp32/odbccp32.spec b/dlls/odbccp32/odbccp32.spec index e01da6a..3d85d75 100644 --- a/dlls/odbccp32/odbccp32.spec +++ b/dlls/odbccp32/odbccp32.spec @@ -1,6 +1,6 @@ @ stdcall ODBCCPlApplet( long long ptr ptr) -@ stdcall SQLConfigDataSource(ptr long wstr wstr) -@ stdcall SQLConfigDataSourceW(ptr long str str) +@ stdcall SQLConfigDataSource(ptr long str str) +@ stdcall SQLConfigDataSourceW(ptr long wstr wstr) @ stdcall SQLConfigDriver(ptr long str str ptr long ptr) @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) @ stdcall SQLCreateDataSource(ptr str) diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index 6aacbbf..08c750e 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -21,7 +21,7 @@ @ stdcall RasEnumDevicesA(ptr ptr ptr) @ stdcall RasEnumDevicesW(ptr ptr ptr) @ stdcall RasEnumEntriesA(str str ptr ptr ptr) -@ stdcall RasEnumEntriesW(str str ptr ptr ptr) +@ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9db4b6e..f91d0d8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -290,7 +290,7 @@ @ stdcall SetupDiCreateDeviceInfoA(long str ptr str long long ptr) @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) -@ stdcall SetupDiCreateDeviceInfoListExW(ptr long str ptr) +@ stdcall SetupDiCreateDeviceInfoListExW(ptr long wstr ptr) @ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr) @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr) @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 719fc9a..961e1af 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -443,7 +443,7 @@ @ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW @ stdcall StrRChrA(str str long) shlwapi.StrRChrA @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA -@ stdcall StrRChrIW(str str long) shlwapi.StrRChrIW +@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW @ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW @ stub StrRStrA @ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index ce29a72..9151b11 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -143,7 +143,7 @@ @ stdcall GetPrinterDriverA(long str long ptr long ptr) @ stdcall GetPrinterDriverDirectoryA(str str long ptr long ptr) @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) -@ stdcall GetPrinterDriverW(long str long ptr long ptr) +@ stdcall GetPrinterDriverW(long wstr long ptr long ptr) @ stdcall GetPrinterW(long long ptr long ptr) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 048defe..8a8e29f 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -52,7 +52,7 @@ 62 cdecl ldap_add_extW(ptr wstr ptr ptr ptr ptr) 63 cdecl ldap_add_ext_s(ptr str ptr ptr ptr) ldap_add_ext_sA 64 cdecl ldap_add_ext_sA(ptr str ptr ptr ptr) - 65 cdecl ldap_add_ext_sW(ptr str ptr ptr ptr) + 65 cdecl ldap_add_ext_sW(ptr wstr ptr ptr ptr) 66 cdecl ldap_add_sA(ptr str ptr) 67 cdecl ldap_modrdn2(ptr str ptr long) ldap_modrdn2A 68 cdecl ldap_modrdn2_s(ptr str ptr long) ldap_modrdn2_sA @@ -206,7 +206,7 @@ 216 cdecl ldap_simple_bind_sW(ptr wstr wstr) 217 cdecl ldap_sslinit(str long long) ldap_sslinitA 218 cdecl ldap_sslinitA(str long long) -219 cdecl ldap_sslinitW(str long long) +219 cdecl ldap_sslinitW(wstr long long) 220 cdecl ldap_ufn2dn(str ptr) ldap_ufn2dnA 221 cdecl ldap_ufn2dnA(str ptr) 222 cdecl ldap_ufn2dnW(wstr ptr)

1 0

Alistair Leslie-Hughes : msxml6: Register interfaces.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: ed7f017d71068c02b68058d6021393a8f9571a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7f017d71068c02b68058d60… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 9 19:56:48 2010 +1000 msxml6: Register interfaces. --- dlls/msxml6/regsvr.c | 39 +++++++++++++++++++++++++++++++++++++++ include/msxml6.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index 04f07c9..872015d 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -346,6 +346,30 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "6.0" }, + { &CLSID_XMLSchemaCache60, + "XML Schema Cache 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.XMLSchemaCache", + "6.0" + }, + { &CLSID_MXXMLWriter60, + "IMXWriter interface 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.MXXMLWriter", + "6.0" + }, + { &CLSID_SAXAttributes60, + "SAX Attribute 6.0", + NULL, + "msxml6.dll", + "Both", + "Msxml2.SAXAttributes", + "6.0" + }, { &CLSID_FreeThreadedDOMDocument60, "Free Threaded XML DOM Document 6.0", NULL, @@ -366,6 +390,21 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument60, NULL }, + { "Msxml2.XMLSchemaCache.6.0", + "XML Schema Cache 6.0", + &CLSID_XMLSchemaCache60, + NULL + }, + { "Msxml2.MXXMLWriter.6.0", + "MXXMLWriter 6.0", + &CLSID_MXXMLWriter60, + NULL + }, + { "Msxml2.SAXAttributes.6.0", + "SAX Attribute 6.0", + &CLSID_SAXAttributes60, + NULL + }, { "MSXML.FreeThreadedDOMDocument60", "Free threaded XML DOM Document 6.0", &CLSID_FreeThreadedDOMDocument60, diff --git a/include/msxml6.idl b/include/msxml6.idl index 59c9d6d..5b14e47 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -58,3 +58,50 @@ interface IXMLDOMDocument3 : IXMLDOMDocument2 [in] VARIANT_BOOL deep, [out, retval] IXMLDOMNode **clone); } + +[ + uuid(88d96a07-f192-11d4-a65f-0040963251e5) +] +coclass XMLSchemaCache60 +{ + [default] interface IXMLDOMSchemaCollection2; +} + +[ + uuid(88d96a0f-f192-11d4-a65f-0040963251e5) +] +coclass MXXMLWriter60 +{ + [default] interface IMXWriter; + + interface ISAXContentHandler; + interface ISAXDeclHandler; + interface ISAXDTDHandler; + interface ISAXErrorHandler; + interface ISAXLexicalHandler; + + interface IVBSAXContentHandler; + interface IVBSAXDeclHandler; + interface IVBSAXDTDHandler; + interface IVBSAXErrorHandler; + interface IVBSAXLexicalHandler; +} + +[ + uuid(88d96a0c-f192-11d4-a65f-0040963251e5) +] +coclass SAXXMLReader60 +{ + [default] interface IVBSAXXMLReader; + interface ISAXXMLReader; +} + +[ + uuid(88d96a0e-f192-11d4-a65f-0040963251e5) +] +coclass SAXAttributes60 +{ + [default] interface IMXAttributes; + interface IVBSAXAttributes; + interface ISAXAttributes; +}

1 0