Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[amunger] 20186: Merge 20151 from trunk.

by amunger＠svn.reactos.com

Merge 20151 from trunk. Modified: branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c _____ Modified: branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c --- branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-15 01:20:46 UTC (rev 20185) +++ branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c 2005-12-15 01:47:36 UTC (rev 20186) @@ -878,6 +878,27 @@ } +VOID +NTAPI +MiniStatus( + IN NDIS_HANDLE MiniportHandle, + IN NDIS_STATUS GeneralStatus, + IN PVOID StatusBuffer, + IN UINT StatusBufferSize) +{ + UNIMPLEMENTED +} + + +VOID +NTAPI +MiniStatusComplete( + IN NDIS_HANDLE MiniportAdapterHandle) +{ + UNIMPLEMENTED +} + + /* * @unimplemented */ @@ -1406,6 +1427,8 @@ Adapter->NdisMiniportBlock.ResetCompleteHandler = MiniResetComplete; Adapter->NdisMiniportBlock.TDCompleteHandler = MiniTransferDataComplete; Adapter->NdisMiniportBlock.PacketIndicateHandler= MiniIndicateReceivePacket; + Adapter->NdisMiniportBlock.StatusHandler = MiniStatus; + Adapter->NdisMiniportBlock.StatusCompleteHandler= MiniStatusComplete; Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex];

19 years

[weiden] 20185: Patch by Brezenbak:

by weiden＠svn.reactos.com

Patch by Brezenbak: - Fix loading of named resources. Fixes bug 1113 Modified: trunk/reactos/lib/rtl/res.c _____ Modified: trunk/reactos/lib/rtl/res.c --- trunk/reactos/lib/rtl/res.c 2005-12-15 00:25:09 UTC (rev 20184) +++ trunk/reactos/lib/rtl/res.c 2005-12-15 01:20:46 UTC (rev 20185) @@ -144,7 +144,7 @@ { pos = (min + max) / 2; str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].NameOffset); - res = wcsncmp( name, str->NameString, str->Length ); + res = _wcsnicmp( name, str->NameString, str->Length ); if (!res && namelen == str->Length) { if (!entry[pos].DataIsDirectory == !want_dir)

19 years

[gedmurphy] 20184: fix building in msvc

by gedmurphy＠svn.reactos.com

fix building in msvc Modified: trunk/reactos/apps/utils/getfirefox/De.rc Modified: trunk/reactos/apps/utils/getfirefox/En.rc Modified: trunk/reactos/apps/utils/getfirefox/Hu.rc Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc _____ Modified: trunk/reactos/apps/utils/getfirefox/De.rc --- trunk/reactos/apps/utils/getfirefox/De.rc 2005-12-14 23:09:55 UTC (rev 20183) +++ trunk/reactos/apps/utils/getfirefox/De.rc 2005-12-15 00:25:09 UTC (rev 20184) @@ -33,7 +33,7 @@ { CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10, 200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - CHECKBOX "Entferne \"Get Firefox\" nach Fertigstellung aus dem Startmen³", IDC_REMOVE, + CHECKBOX "Entferne ""Get Firefox"" nach Fertigstellung aus dem Startmen³", IDC_REMOVE, 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } _____ Modified: trunk/reactos/apps/utils/getfirefox/En.rc --- trunk/reactos/apps/utils/getfirefox/En.rc 2005-12-14 23:09:55 UTC (rev 20183) +++ trunk/reactos/apps/utils/getfirefox/En.rc 2005-12-15 00:25:09 UTC (rev 20184) @@ -33,7 +33,7 @@ { CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10, 200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - CHECKBOX "Remove \"Get Firefox\" from Start Menu when done", IDC_REMOVE, + CHECKBOX "Remove ""Get Firefox"" from Start Menu when done", IDC_REMOVE, 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } _____ Modified: trunk/reactos/apps/utils/getfirefox/Hu.rc --- trunk/reactos/apps/utils/getfirefox/Hu.rc 2005-12-14 23:09:55 UTC (rev 20183) +++ trunk/reactos/apps/utils/getfirefox/Hu.rc 2005-12-15 00:25:09 UTC (rev 20184) @@ -34,7 +34,7 @@ { CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10, 200,12 LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER - CHECKBOX "A \"Szerezd meg a Firefoxot\" elvßtolÝtßsa a Start Men³b§l befejezÚs utßn", IDC_REMOVE, + CHECKBOX "A ""Szerezd meg a Firefoxot"" elvßtolÝtßsa a Start Men³b§l befejezÚs utßn", IDC_REMOVE, 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "MÚgse", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP } _____ Modified: trunk/reactos/apps/utils/getfirefox/getfirefox.rc --- trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-14 23:09:55 UTC (rev 20183) +++ trunk/reactos/apps/utils/getfirefox/getfirefox.rc 2005-12-15 00:25:09 UTC (rev 20184) @@ -24,4 +24,4 @@ #include "En.rc" #include "De.rc" -#include "Hu.rc" \ No newline at end of file +#include "Hu.rc"

19 years

[gvg] 20183: Tag Wine-0_9_3 version

by gvg＠svn.reactos.com

Tag Wine-0_9_3 version Added: vendor/wine/dlls/dxdiagn/Wine-0_9_3/ _____ Copied: vendor/wine/dlls/dxdiagn/Wine-0_9_3 (from rev 20179, vendor/wine/dlls/dxdiagn/current)

19 years

[gvg] 20182: dxdiagn vendor import

by gvg＠svn.reactos.com

dxdiagn vendor import Added: trunk/reactos/lib/dxdiagn/ Deleted: trunk/reactos/lib/dxdiagn/Makefile.in Added: trunk/reactos/lib/dxdiagn/dxdiagn.xml Modified: trunk/reactos/lib/dxdiagn/provider.c Modified: trunk/reactos/media/doc/README.WINE _____ Copied: trunk/reactos/lib/dxdiagn (from rev 20181, vendor/wine/dlls/dxdiagn/current) Property changes on: trunk/reactos/lib/dxdiagn ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Deleted: trunk/reactos/lib/dxdiagn/Makefile.in --- vendor/wine/dlls/dxdiagn/current/Makefile.in 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/lib/dxdiagn/Makefile.in 2005-12-14 23:09:06 UTC (rev 20182) @@ -1,19 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = dxdiagn.dll -IMPORTS = version ole32 oleaut32 user32 advapi32 kernel32 -EXTRALIBS = -lstrmiids -ldxguid -luuid $(LIBUNICODE) - -C_SRCS = \ - container.c \ - dxdiag_main.c \ - provider.c \ - regsvr.c - -RC_SRCS = version.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Added: trunk/reactos/lib/dxdiagn/dxdiagn.xml --- vendor/wine/dlls/dxdiagn/current/dxdiagn.xml 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/lib/dxdiagn/dxdiagn.xml 2005-12-14 23:09:06 UTC (rev 20182) @@ -0,0 +1,28 @@ +<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="dxdiagn.spec.def" /> + <include base="dxdiagn">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>dxguid</library> + <library>strmiids</library> + <file>container.c</file> + <file>dxdiag_main.c</file> + <file>provider.c</file> + <file>regsvr.c</file> + <file>dxdiagn.spec</file> +</module> Property changes on: trunk/reactos/lib/dxdiagn/dxdiagn.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/dxdiagn/provider.c --- vendor/wine/dlls/dxdiagn/current/provider.c 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/lib/dxdiagn/provider.c 2005-12-14 23:09:06 UTC (rev 20182) @@ -1,7 +1,7 @@ /* * IDxDiagProvider Implementation * - * Copyright 2004-2005 Raphael Junqueira + * Copyright 2004 Raphael Junqueira * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,18 +20,9 @@ */ #include "config.h" +#include "dxdiag_private.h" #include "wine/debug.h" -#define COBJMACROS -#include "dxdiag_private.h" -#include "wine/unicode.h" -#include "winver.h" -#include "objidl.h" -#include "dshow.h" -#include "strmif.h" -#include "vfw.h" -#include "mmddk.h" - WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); /* IDxDiagProvider IUnknown parts follow: */ @@ -52,28 +43,18 @@ ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); - - DXDIAGN_LockModule(); - - return refCount; + TRACE("(%p) : AddRef from %ld\n", This, This->ref); + return ++(This->ref); } ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); - - if (!refCount) { + ULONG ref = --This->ref; + TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); + if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); } - - DXDIAGN_UnlockModule(); - - return refCount; + return ref; } /* IDxDiagProvider Interface follow: */ @@ -109,12 +90,11 @@ if (FAILED(hr)) { return hr; } - hr = DXDiag_InitRootDXDiagContainer((PDXDIAGCONTAINER)This->pRootContainer); } return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContain er, &IID_IDxDiagContainer, (void**) ppInstance); } -static const IDxDiagProviderVtbl DxDiagProvider_Vtbl = +IDxDiagProviderVtbl DxDiagProvider_Vtbl = { IDxDiagProviderImpl_QueryInterface, IDxDiagProviderImpl_AddRef, @@ -136,554 +116,4 @@ provider->lpVtbl = &DxDiagProvider_Vtbl; provider->ref = 0; /* will be inited with QueryInterface */ return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); -} - -/** - * @param szFilePath: usually GetSystemDirectoryW - * @param szFileName: name of the dll without path - */ -HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCHAR* szFilePath, const WCHAR* szFileName) { - HRESULT hr = S_OK; - /**/ - static const WCHAR szSlashSep[] = {'\\',0}; - static const WCHAR szPath[] = {'s','z','P','a','t','h',0}; - static const WCHAR szName[] = {'s','z','N','a','m','e',0}; - static const WCHAR szVersion[] = {'s','z','V','e','r','s','i','o','n',0}; - static const WCHAR szAttributes[] = {'s','z','A','t','t','r','i','b','u','t','e','s',0}; - static const WCHAR szLanguageEnglish[] = {'s','z','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; - static const WCHAR dwFileTimeHigh[] = {'d','w','F','i','l','e','T','i','m','e','H','i','g','h',0}; - static const WCHAR dwFileTimeLow[] = {'d','w','F','i','l','e','T','i','m','e','L','o','w',0}; - static const WCHAR bBeta[] = {'b','B','e','t','a',0}; - static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; - static const WCHAR bExists[] = {'b','E','x','i','s','t','s',0}; - /** values */ - static const WCHAR szFinal_Retail_v[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; - static const WCHAR szEnglish_v[] = {'E','n','g','l','i','s','h',0}; - static const WCHAR szVersionFormat[] = {'%','u','.','%','0','2','u','.','%','0','4','u','.','%','0','4','u',0}; - VARIANT v; - - WCHAR szFile[512]; - WCHAR szVersion_v[1024]; - DWORD retval, hdl; - LPVOID pVersionInfo; - BOOL boolret; - UINT uiLength; - VS_FIXEDFILEINFO* pFileInfo; - - FIXME("(%p,%s)\n", pSubCont, debugstr_w(szFileName)); - - lstrcpyW(szFile, szFilePath); - lstrcatW(szFile, szSlashSep); - lstrcatW(szFile, szFileName); - - retval = GetFileVersionInfoSizeW(szFile, &hdl); - pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); - hr = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); - boolret = VerQueryValueW(pVersionInfo, (LPWSTR) szSlashSep, (LPVOID) &pFileInfo, &uiLength); - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFile); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szPath, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFileName); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = boolret; - hr = IDxDiagContainerImpl_AddProp(pSubCont, bExists, &v); - VariantClear(&v); - - if (boolret) { - snprintfW(szVersion_v, sizeof(szVersion_v), - szVersionFormat, - HIWORD(pFileInfo->dwFileVersionMS), - LOWORD(pFileInfo->dwFileVersionMS), - HIWORD(pFileInfo->dwFileVersionLS), - LOWORD(pFileInfo->dwFileVersionLS)); - - TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szVersion_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szVersion, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFinal_Retail_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szAttributes, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szLanguageEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateMS; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeHigh, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateLS; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeLow, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE)); - hr = IDxDiagContainerImpl_AddProp(pSubCont, bBeta, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG)); - hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); - VariantClear(&v); - } - - HeapFree(GetProcessHeap(), 0, pVersionInfo); - - return hr; } - -HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a' ,'j','o','r',0}; - static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i' ,'n','o','r',0}; - static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e' ,'t','t','e','r',0}; - static const WCHAR szDirectXVersionLetter_v[] = {'c',0}; - static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; - static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n' ,'g','l','i','s','h',0}; - static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; - static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o' ,'n','g','E','n','g','l','i','s','h',0}; - static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; - /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ - /*szWindowsDir*/ - /*szWindowsDir*/ - /*"dwOSMajorVersion"*/ - /*"dwOSMinorVersion"*/ - /*"dwOSBuildNumber"*/ - /*"dwOSPlatformID"*/ - VARIANT v; - - V_VT(&v) = VT_UI4; V_UI4(&v) = 9; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMajor, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = 0; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMinor, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLetter_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLetter, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLongEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLongEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = FALSE; - hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); - VariantClear(&v); - - return hr; -} - -HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /* - static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR szDeviceID[] = {'s','z','D','e','v','i','c','e','I','D',0}; - - static const WCHAR szDrivers[] = {'s','z','D','r','i','v','e','r','s',0}; - - VARIANT v; - IDxDiagContainer* pDeviceSubCont = NULL; - IDxDiagContainer* pDriversCont = NULL; - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDeviceSubCont); - if (FAILED(hr)) { return hr; } - V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); - hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDescription, &v); - VariantClear(&v); - V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); - hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDeviceID, &v); - VariantClear(&v); - - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "", pDeviceSubCont); - */ - - /* - * Drivers Cont contains Files Desc Containers - */ - /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); - - */ - return hr; -} - -HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /* - static const WCHAR szDriveLetter[] = {'s','z','D','r','i','v','e','L','e','t','t','e','r',0}; - static const WCHAR szFreeSpace[] = {'s','z','F','r','e','e','S','p','a','c','e',0}; - static const WCHAR szMaxSpace[] = {'s','z','M','a','x','S','p','a','c','e',0}; - static const WCHAR szFileSystem[] = {'s','z','F','i','l','e','S','y','s','t','e','m',0}; - static const WCHAR szModel[] = {'s','z','M','o','d','e','l',0}; - static const WCHAR szPNPDeviceID[] = {'s','z','P','N','P','D','e','v','i','c','e','I','D',0}; - static const WCHAR dwHardDriveIndex[] = {'d','w','H','a','r','d','D','r','i','v','e','I','n','d','e','x',0}; - - static const WCHAR szDrivers[] = {'s','z','D','r','i','v','e','r','s',0}; - - VARIANT v; - IDxDiagContainer* pDiskSubCont = NULL; - IDxDiagContainer* pDriversCont = NULL; - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDiskSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "" , pDiskSubCont); - */ - - /* - * Drivers Cont contains Files Desc Containers - */ - /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); - */ - return hr; -} -HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /**/ - static const WCHAR ddraw_dll[] = {'d','d','r','a','w','.','d','l','l',0}; - static const WCHAR dplayx_dll[] = {'d','p','l','a','y','x','.','d','l','l',0}; - static const WCHAR dpnet_dll[] = {'d','p','n','e','t','.','d','l','l',0}; - static const WCHAR dinput_dll[] = {'d','i','n','p','u','t','.','d','l','l',0}; - static const WCHAR dinput8_dll[] = {'d','i','n','p','u','t','8','.','d','l','l',0}; - static const WCHAR dsound_dll[] = {'d','s','o','u','n','d','.','d','l','l',0}; - static const WCHAR dswave_dll[] = {'d','s','w','a','v','e','.','d','l','l',0}; - static const WCHAR d3d8_dll[] = {'d','3','d','8','.','d','l','l',0}; - static const WCHAR d3d9_dll[] = {'d','3','d','9','.','d','l','l',0}; - static const WCHAR dmband_dll[] = {'d','m','b','a','n','d','.','d','l','l',0}; - static const WCHAR dmcompos_dll[] = {'d','m','c','o','m','p','o','s','.','d','l','l',0}; - static const WCHAR dmime_dll[] = {'d','m','i','m','e','.','d','l','l',0}; - static const WCHAR dmloader_dll[] = {'d','m','l','o','a','d','e','r','.','d','l','l',0}; - static const WCHAR dmscript_dll[] = {'d','m','s','c','r','i','p','t','.','d','l','l',0}; - static const WCHAR dmstyle_dll[] = {'d','m','s','t','y','l','e','.','d','l','l',0}; - static const WCHAR dmsynth_dll[] = {'d','m','s','y','n','t','h','.','d','l','l',0}; - static const WCHAR dmusic_dll[] = {'d','m','u','s','i','c','.','d','l','l',0}; - static const WCHAR devenum_dll[] = {'d','e','v','e','n','u','m','.','d','l','l',0}; - static const WCHAR quartz_dll[] = {'q','u','a','r','t','z','.','d','l','l',0}; - WCHAR szFilePath[512]; - - hr = GetSystemDirectoryW(szFilePath, MAX_PATH); - if (FAILED(hr)) { return hr; } - szFilePath[MAX_PATH-1]=0; - - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, ddraw_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dplayx_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dpnet_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dinput_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dinput8_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dsound_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dswave_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, d3d8_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, d3d9_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmband_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmcompos_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmime_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmloader_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmscript_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmstyle_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmsynth_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmusic_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, devenum_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, quartz_dll); - return hr; -} - -HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /* - static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR szDeviceName[] = {'s','z','D','e','v','i','c','e','N','a','m','e',0}; - static const WCHAR szKeyDeviceID[] = {'s','z','K','e','y','D','e','v','i','c','e','I','D',0}; - static const WCHAR szKeyDeviceKey[] = {'s','z','K','e','y','D','e','v','i','c','e','K','e','y',0}; - WCHAR szAdapterName[512]; - VARIANT v; - IDxDiagContainer* pDisplayAdapterSubCont = NULL; - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDisplayAdapterSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, szAdapterName, pDisplayAdapterSubCont); - */ - return hr; -} - -HRESULT DXDiag_InitDXDiagDirectSoundContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e' ,'s',0}; - static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r' ,'e','D','e','v','i','c','e','s',0}; - IDxDiagContainer* pSubSubCont = NULL; - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, DxDiag_SoundDevices, pSubSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, DxDiag_SoundCaptureDevices, pSubSubCont); - - return hr; -} - -HRESULT DXDiag_InitDXDiagDirectMusicContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - return hr; -} -HRESULT DXDiag_InitDXDiagDirectInputContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - return hr; -} -HRESULT DXDiag_InitDXDiagDirectPlayContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - return hr; -} - -struct REG_RF { - DWORD dwVersion; - DWORD dwMerit; - DWORD dwPins; - DWORD dwUnused; -}; -struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ - DWORD dwFlags; - DWORD dwInstances; - DWORD dwMediaTypes; - DWORD dwMediums; - DWORD bCategory; /* is there a category clsid? */ - /* optional: dwOffsetCategoryClsid */ -}; -struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ - DWORD dwUnused; - DWORD dwOffsetMajor; - DWORD dwOffsetMinor; -}; - -HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - static const WCHAR szName[] = {'s','z','N','a','m','e',0}; - static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; - static const WCHAR szClsidCat[] = {'s','z','C','l','s','i','d','C','a','t',0}; - static const WCHAR szClsidFilter[] = {'s','z','C','l','s','i','d','F','i','l','t','e','r',0}; - static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; - static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; - static const WCHAR dwMerit[] = {'d','w','M','e','r','i','t',0}; - /* - static const WCHAR szFileName[] = {'s','z','F','i','l','e','N','a','m','e',0}; - static const WCHAR szFileVersion[] = {'s','z','F','i','l','e','V','e','r','s','i','o','n',0}; - */ - VARIANT v; - - static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; - /*static const WCHAR wszMeritName[] = {'M','e','r','i','t',0};*/ - - ICreateDevEnum* pCreateDevEnum = NULL; - IEnumMoniker* pEmCat = NULL; - IMoniker* pMCat = NULL; - /** */ - hr = CoCreateInstance(&CLSID_SystemDeviceEnum, - NULL, - CLSCTX_INPROC_SERVER, - &IID_ICreateDevEnum, - (void**) &pCreateDevEnum); - if (FAILED(hr)) return hr; - - hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEmCat, 0); - if (FAILED(hr)) goto out_show_filters; - - VariantInit(&v); - - while (S_OK == IEnumMoniker_Next(pEmCat, 1, &pMCat, NULL)) { - IPropertyBag* pPropBag = NULL; - CLSID clsidCat; - hr = IMoniker_BindToStorage(pMCat, NULL, NULL, &IID_IPropertyBag, (void**) &pPropBag); - if (SUCCEEDED(hr)) { - WCHAR* wszCatName = NULL; - WCHAR* wszCatClsid = NULL; - - hr = IPropertyBag_Read(pPropBag, wszFriendlyName, &v, 0); - wszCatName = SysAllocString(V_BSTR(&v)); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropBag, wszClsidName, &v, 0); - wszCatClsid = SysAllocString(V_BSTR(&v)); - hr = CLSIDFromString(V_UNION(&v, bstrVal), &clsidCat); - VariantClear(&v); - - /* - hr = IPropertyBag_Read(pPropBag, wszMeritName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwMerit, &v); - VariantClear(&v); - */ - - if (SUCCEEDED(hr)) { - IEnumMoniker* pEnum = NULL; - IMoniker* pMoniker = NULL; - hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0); - FIXME("\tClassEnumerator for clsid(%s) pEnum(%p)\n", debugstr_guid(&clsidCat), pEnum); - if (FAILED(hr) || pEnum == NULL) { - goto class_enum_failed; - } - while (NULL != pEnum && S_OK == IEnumMoniker_Next(pEnum, 1, &pMoniker, NULL)) { - IPropertyBag* pPropFilterBag = NULL; - FIXME("\tIEnumMoniker_Next(%p, 1, %p)\n", pEnum, pMoniker); - hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void**) &pPropFilterBag); - if (SUCCEEDED(hr)) { - LPBYTE pData = NULL; - LPBYTE pCurrent = NULL; - struct REG_RF* prrf = NULL; - VARIANT v_data; - DWORD it; - DWORD dwNOutputs = 0; - DWORD dwNInputs = 0; - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(wszCatName); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szCatName, &v); - VariantClear(&v); - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(wszCatClsid); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidCat, &v); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); - FIXME("\tName:%s\n", debugstr_w(V_BSTR(&v))); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); - FIXME("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidFilter, &v); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); - hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); - prrf = (struct REG_RF*) pData; - pCurrent = pData; - - VariantInit(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = prrf->dwVersion; - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v_data); - VariantClear(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = prrf->dwMerit; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwMerit, &v_data); - VariantClear(&v_data); - - pCurrent += sizeof(struct REG_RF); - for (it = 0; it < prrf->dwPins; ++it) { - struct REG_RFP* prrfp = (struct REG_RFP*) pCurrent; - UINT j; - - if (prrfp->dwFlags & REG_PINFLAG_B_OUTPUT) ++dwNOutputs; - else ++dwNInputs; - - pCurrent += sizeof(struct REG_RFP); - if (prrfp->bCategory) { - pCurrent += sizeof(DWORD); - } - for (j = 0; j < prrfp->dwMediaTypes; ++j) { - struct REG_TYPE* prt = (struct REG_TYPE *)pCurrent; - pCurrent += sizeof(*prt); - } - for (j = 0; j < prrfp->dwMediums; ++j) { - DWORD dwOffset = *(DWORD*) pCurrent; - pCurrent += sizeof(dwOffset); - } - } - - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = dwNInputs; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwInputs, &v_data); - VariantClear(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = dwNOutputs; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwOutputs, &v_data); - VariantClear(&v_data); - - SafeArrayUnaccessData(V_UNION(&v, parray)); - VariantClear(&v); - } - IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL; - } - IEnumMoniker_Release(pEnum); pEnum = NULL; - } -class_enum_failed: - SysFreeString(wszCatName); - SysFreeString(wszCatClsid); - IPropertyBag_Release(pPropBag); pPropBag = NULL; - } - IEnumMoniker_Release(pMCat); pMCat = NULL; - } - -out_show_filters: - if (NULL != pEmCat) { IEnumMoniker_Release(pEmCat); pEmCat = NULL; } - if (NULL != pCreateDevEnum) { ICreateDevEnum_Release(pCreateDevEnum); pCreateDevEnum = NULL; } - return hr; -} - -HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont) { - HRESULT hr = S_OK; - static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; - static const WCHAR DxDiag_SystemDevices[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','D','e','v','i','c' ,'e','s',0}; - static const WCHAR DxDiag_LogicalDisks[] = {'D','x','D','i','a','g','_','L','o','g','i','c','a','l','D','i','s','k' ,'s',0}; - static const WCHAR DxDiag_DirectXFiles[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','X','F','i','l','e' ,'s',0}; - static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i' ,'c','e','s',0}; - static const WCHAR DxDiag_DirectSound[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d' ,0}; - static const WCHAR DxDiag_DirectMusic[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','M','u','s','i','c' ,0}; - static const WCHAR DxDiag_DirectInput[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','I','n','p','u','t' ,0}; - static const WCHAR DxDiag_DirectPlay[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','P','l','a','y',0}; - static const WCHAR DxDiag_DirectShowFilters[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','h','o','w','F' ,'i','l','t','e','r','s',0}; - IDxDiagContainer* pSubCont = NULL; - - TRACE("(%p)\n", pRootCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagSystemInfoContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_SystemInfo, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagSystemDevicesContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_SystemDevices, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagLogicalDisksContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_LogicalDisks, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectXFilesContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectXFiles, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDisplayContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DisplayDevices, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectSoundContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectSound, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectMusicContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectMusic, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectInputContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectInput, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectPlayContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectPlay, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectShowFiltersContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectShowFilters, pSubCont); - - return hr; -} _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/media/doc/README.WINE 2005-12-14 23:09:06 UTC (rev 20182) @@ -46,6 +46,7 @@ reactos/lib/dinput8 # Synced to Wine-0_9_3 reactos/lib/dplay # Synced to Wine-0_9_3 reactos/lib/dplayx # Synced to Wine-0_9_3 +reactos/lib/dxdiagn # Synced to Wine-0_9_3 reactos/lib/icmp # Synced to Wine-0_9_3 reactos/lib/imm32 # Synced to Wine-0_9_3 reactos/lib/iphlpapi # Out of sync

19 years

[gvg] 20181: Remove old dxdiagn in preparation of vendor import

by gvg＠svn.reactos.com

Remove old dxdiagn in preparation of vendor import Deleted: trunk/reactos/lib/dxdiagn/

19 years

[gedmurphy] 20180: j_anderw@sbox.tugraz.at

by gedmurphy＠svn.reactos.com

j_anderw(a)sbox.tugraz.at list resource files in the correct directory within msvc Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-12-14 22:45:50 UTC (rev 20179) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-12-14 22:50:25 UTC (rev 20180) @@ -90,9 +90,8 @@ //$progress_current++; //$output->progress("$dsp_file (file $progress_current of $progress_max)"); - // TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'? string vcproj_path = module.GetBasePath(); - vector<string> c_srcs, source_files, resource_files, includes, libraries, defines; + vector<string> source_files, resource_files, includes, libraries, defines; vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); @@ -117,9 +116,8 @@ // TODO FIXME - do we want the full path of the file here? string file = string(".") + &files[i]->name[vcproj_path.size()]; - source_files.push_back ( file ); if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) - c_srcs.push_back ( file ); + source_files.push_back ( file ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); } @@ -529,7 +527,7 @@ fprintf ( OUT, "\t\t<Filter\r\n" ); fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" ); fprintf ( OUT, "\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n" ); - for ( i = 0; i < header_files.size(); i++ ) + for ( i = 0; i < resource_files.size(); i++ ) { const string& resource_file = resource_files[i]; fprintf ( OUT, "\t\t\t<File\r\n" );

19 years

[gvg] 20179: dxdiagn vendor drop

by gvg＠svn.reactos.com

dxdiagn vendor drop Added: vendor/wine/dlls/dxdiagn/ Added: vendor/wine/dlls/dxdiagn/current/ Added: vendor/wine/dlls/dxdiagn/current/Makefile.in Added: vendor/wine/dlls/dxdiagn/current/container.c Added: vendor/wine/dlls/dxdiagn/current/dxdiag_main.c Added: vendor/wine/dlls/dxdiagn/current/dxdiag_private.h Added: vendor/wine/dlls/dxdiagn/current/dxdiagn.spec Added: vendor/wine/dlls/dxdiagn/current/provider.c Added: vendor/wine/dlls/dxdiagn/current/regsvr.c Added: vendor/wine/dlls/dxdiagn/current/version.rc _____ Added: vendor/wine/dlls/dxdiagn/current/Makefile.in --- vendor/wine/dlls/dxdiagn/current/Makefile.in 2005-12-14 22:41:16 UTC (rev 20178) +++ vendor/wine/dlls/dxdiagn/current/Makefile.in 2005-12-14 22:45:50 UTC (rev 20179) @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dxdiagn.dll +IMPORTS = version ole32 oleaut32 user32 advapi32 kernel32 +EXTRALIBS = -lstrmiids -ldxguid -luuid $(LIBUNICODE) + +C_SRCS = \ + container.c \ + dxdiag_main.c \ + provider.c \ + regsvr.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/dxdiagn/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/dxdiagn/current/container.c --- vendor/wine/dlls/dxdiagn/current/container.c 2005-12-14 22:41:16 UTC (rev 20178) +++ vendor/wine/dlls/dxdiagn/current/container.c 2005-12-14 22:45:50 UTC (rev 20179) @@ -0,0 +1,321 @@ +/* + * IDxDiagContainer Implementation + * + * Copyright 2004 Raphael Junqueira + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "config.h" +#include "dxdiag_private.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* IDxDiagContainer IUnknown parts follow: */ +HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj) +{ + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDxDiagContainer)) { + IDxDiagContainerImpl_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + + DXDIAGN_LockModule(); + + return refCount; +} + +ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + + if (!refCount) { + HeapFree(GetProcessHeap(), 0, This); + } + + DXDIAGN_UnlockModule(); + + return refCount; +} + +/* IDxDiagContainer Interface follow: */ +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER iface, DWORD* pdwCount) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + TRACE("(%p)\n", iface); + if (NULL == pdwCount) { + return E_INVALIDARG; + } + *pdwCount = This->nSubContainers; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + DWORD i = 0; + + TRACE("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); + + if (NULL == pwszContainer) { + return E_INVALIDARG; + } + if (256 > cchContainer) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + + p = This->subContainers; + while (NULL != p) { + if (dwIndex == i) { + if (cchContainer <= strlenW(p->contName)) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + lstrcpynW(pwszContainer, p->contName, cchContainer); + return S_OK; + } + p = p->next; + ++i; + } + return E_INVALIDARG; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + + p = This->subContainers; + while (NULL != p) { + if (0 == lstrcmpW(p->contName, pwszContainer)) { + *ppInstance = (PDXDIAGCONTAINER)p->pCont; + return S_OK; + } + p = p->next; + } + return E_INVALIDARG; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainer* pContainer = NULL; + LPWSTR tmp, orig_tmp; + INT tmp_len; + WCHAR* cur; + HRESULT hr = E_INVALIDARG; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszContainer), ppInstance); + + if (NULL == ppInstance || NULL == pwszContainer) { + return E_INVALIDARG; + } + + pContainer = (PDXDIAGCONTAINER) This; + + tmp_len = strlenW(pwszContainer) + 1; + orig_tmp = tmp = HeapAlloc(GetProcessHeap(), 0, tmp_len * sizeof(WCHAR)); + if (NULL == tmp) return E_FAIL; + lstrcpynW(tmp, pwszContainer, tmp_len); + + cur = strchrW(tmp, '.'); + while (NULL != cur) { + *cur = '\0'; /* cut tmp string to '.' */ + hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); + if (!SUCCEEDED(hr) || NULL == pContainer) + goto on_error; + *cur++; /* go after '.' (just replaced by \0) */ + tmp = cur; + cur = strchrW(tmp, '.'); + } + + hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, ppInstance); + if (SUCCEEDED(hr)) { + IDxDiagContainerImpl_AddRef((PDXDIAGCONTAINER)*ppInstance); + } + +on_error: + HeapFree(GetProcessHeap(), 0, orig_tmp); + return hr; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + TRACE("(%p)\n", iface); + if (NULL == pdwCount) { + return E_INVALIDARG; + } + *pdwCount = This->nProperties; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + DWORD i = 0; + + FIXME("(%p, %lu, %s, %lu)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); + + if (NULL == pwszPropName) { + return E_INVALIDARG; + } + if (256 > cchPropName) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + + p = This->properties; + while (NULL != p) { + if (dwIndex == i) { + if (cchPropName <= lstrlenW(p->vName)) { + return DXDIAG_E_INSUFFICIENT_BUFFER; + } + lstrcpynW(pwszPropName, p->vName, cchPropName); + return S_OK; + } + p = p->next; + ++i; + } + return E_INVALIDARG; +} + +HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); + + if (NULL == pvarProp || NULL == pwszPropName) { + return E_INVALIDARG; + } + + p = This->properties; + while (NULL != p) { + if (0 == lstrcmpW(p->vName, pwszPropName)) { + VariantCopy(pvarProp, &p->v); + return S_OK; + } + p = p->next; + } + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_Property* p = NULL; + IDxDiagContainerImpl_Property* pNew = NULL; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pVarProp); + + if (NULL == pVarProp || NULL == pwszPropName) { + return E_INVALIDARG; + } + + pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_Property)); + if (NULL == pNew) { + return E_OUTOFMEMORY; + } + VariantInit(&pNew->v); + VariantCopy(&pNew->v, pVarProp); + pNew->vName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pwszPropName) + 1) * sizeof(WCHAR)); + lstrcpyW(pNew->vName, pwszPropName); + pNew->next = NULL; + + p = This->properties; + if (NULL == p) { + This->properties = pNew; + } else { + while (NULL != p->next) { + p = p->next; + } + p->next = pNew; + } + ++This->nProperties; + return S_OK; +} + +HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont) { + IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl_SubContainer* p = NULL; + IDxDiagContainerImpl_SubContainer* pNew = NULL; + + FIXME("(%p, %s, %p)\n", iface, debugstr_w(pszContName), pSubCont); + + if (NULL == pSubCont || NULL == pszContName) { + return E_INVALIDARG; + } + + pNew = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl_SubContainer)); + if (NULL == pNew) { + return E_OUTOFMEMORY; + } + pNew->pCont = pSubCont; + pNew->contName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (lstrlenW(pszContName) + 1) * sizeof(WCHAR)); + lstrcpyW(pNew->contName, pszContName); + pNew->next = NULL; + + p = This->subContainers; + if (NULL == p) { + This->subContainers = pNew; + } else { + while (NULL != p->next) { + p = p->next; + } + p->next = pNew; + } + ++This->nSubContainers; + return S_OK; +} + +static const IDxDiagContainerVtbl DxDiagContainer_Vtbl = +{ + IDxDiagContainerImpl_QueryInterface, + IDxDiagContainerImpl_AddRef, + IDxDiagContainerImpl_Release, + IDxDiagContainerImpl_GetNumberOfChildContainers, + IDxDiagContainerImpl_EnumChildContainerNames, + IDxDiagContainerImpl_GetChildContainer, + IDxDiagContainerImpl_GetNumberOfProps, + IDxDiagContainerImpl_EnumPropNames, + IDxDiagContainerImpl_GetProp +}; + + +HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj) { + IDxDiagContainerImpl* container; + + TRACE("(%p, %p)\n", debugstr_guid(riid), ppobj); + + container = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagContainerImpl)); + if (NULL == container) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + container->lpVtbl = &DxDiagContainer_Vtbl; + container->ref = 0; /* will be inited with QueryInterface */ + return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); +} Property changes on: vendor/wine/dlls/dxdiagn/current/container.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/dxdiagn/current/dxdiag_main.c --- vendor/wine/dlls/dxdiagn/current/dxdiag_main.c 2005-12-14 22:41:16 UTC (rev 20178) +++ vendor/wine/dlls/dxdiagn/current/dxdiag_main.c 2005-12-14 22:45:50 UTC (rev 20179) @@ -0,0 +1,127 @@ +/* + * DXDiag + * + * Copyright 2004 Raphael Junqueira + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "config.h" +#include "dxdiag_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +LONG DXDIAGN_refCount = 0; + +/* At process attach */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%lx,%p\n", hInstDLL, fdwReason, lpvReserved); + if (fdwReason == DLL_PROCESS_ATTACH) { + DisableThreadLibraryCalls(hInstDLL); + } + return TRUE; +} + +/********************************************************************** ********* + * DXDiag ClassFactory + */ +typedef struct { + const IClassFactoryVtbl *lpVtbl; + REFCLSID rclsid; + HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); +} IClassFactoryImpl; + +static HRESULT WINAPI DXDiagCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { + FIXME("- no interface\n\tIID:\t%s\n", debugstr_guid(riid)); + + if (ppobj == NULL) return E_POINTER; + + return E_NOINTERFACE; +} + +static ULONG WINAPI DXDiagCF_AddRef(LPCLASSFACTORY iface) { + DXDIAGN_LockModule(); + + return 2; /* non-heap based object */ +} + +static ULONG WINAPI DXDiagCF_Release(LPCLASSFACTORY iface) { + DXDIAGN_UnlockModule(); + + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI DXDiagCF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) { + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + + return This->pfnCreateInstanceFactory(iface, pOuter, riid, ppobj); +} + +static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { + TRACE("(%d)\n", dolock); + + if (dolock) + DXDIAGN_LockModule(); + else + DXDIAGN_UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl DXDiagCF_Vtbl = { + DXDiagCF_QueryInterface, + DXDiagCF_AddRef, + DXDiagCF_Release, + DXDiagCF_CreateInstance, + DXDiagCF_LockServer +}; + +static IClassFactoryImpl DXDiag_CFS[] = { + { &DXDiagCF_Vtbl, &CLSID_DxDiagProvider, DXDiag_CreateDXDiagProvider }, + { NULL, NULL, NULL } +}; + +/********************************************************************** * + * DllCanUnloadNow (DXDIAGN.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return DXDIAGN_refCount != 0 ? S_FALSE : S_OK; +} + +/********************************************************************** * + * DllGetClassObject (DXDIAGN.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + int i = 0; + + TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + while (NULL != DXDiag_CFS[i].rclsid) { + if (IsEqualGUID(rclsid, DXDiag_CFS[i].rclsid)) { + DXDiagCF_AddRef((IClassFactory*) &DXDiag_CFS[i]); + *ppv = &DXDiag_CFS[i]; + return S_OK; + } + ++i; + } + + FIXME("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} Property changes on: vendor/wine/dlls/dxdiagn/current/dxdiag_main.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/dxdiagn/current/dxdiag_private.h --- vendor/wine/dlls/dxdiagn/current/dxdiag_private.h 2005-12-14 22:41:16 UTC (rev 20178) +++ vendor/wine/dlls/dxdiagn/current/dxdiag_private.h 2005-12-14 22:45:50 UTC (rev 20179) @@ -0,0 +1,120 @@ +/* + * DXDiag private include file + * + * Copyright 2004 Raphael Junqueira + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_DXDIAG_PRIVATE_H +#define __WINE_DXDIAG_PRIVATE_H + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "objbase.h" +#include "oleauto.h" + +#include "dxdiag.h" + +/* DXDiag Interfaces: */ +typedef struct IDxDiagProviderImpl IDxDiagProviderImpl; +typedef struct IDxDiagContainerImpl IDxDiagContainerImpl; + +/* ---------------- */ +/* IDxDiagProvider */ +/* ---------------- */ + +/********************************************************************** ******* + * IDxDiagProvider implementation structure + */ +struct IDxDiagProviderImpl { + /* IUnknown fields */ + const IDxDiagProviderVtbl *lpVtbl; + LONG ref; + /* IDxDiagProvider fields */ + BOOL init; + DXDIAG_INIT_PARAMS params; + IDxDiagContainer* pRootContainer; +}; + +/* IUnknown: */ +extern HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj); +extern ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface); +extern ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface); + +/* IDxDiagProvider: */ +extern HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams); +extern HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance); + +/* ---------------- */ +/* IDxDiagContainer */ +/* ---------------- */ + +typedef struct IDxDiagContainerImpl_SubContainer { + IDxDiagContainer* pCont; + WCHAR* contName; + struct IDxDiagContainerImpl_SubContainer* next; +} IDxDiagContainerImpl_SubContainer; + +typedef struct IDxDiagContainerImpl_Property { + LPWSTR vName; + VARIANT v; + struct IDxDiagContainerImpl_Property* next; +} IDxDiagContainerImpl_Property; + + +/********************************************************************** ******* + * IDxDiagContainer implementation structure + */ +struct IDxDiagContainerImpl { + /* IUnknown fields */ + const IDxDiagContainerVtbl *lpVtbl; + LONG ref; + /* IDxDiagContainer fields */ + IDxDiagContainerImpl_Property* properties; + IDxDiagContainerImpl_SubContainer* subContainers; + DWORD nProperties; + DWORD nSubContainers; +}; + +/* IUnknown: */ +extern HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj); +extern ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface); + +/** Internal */ +extern HRESULT WINAPI IDxDiagContainerImpl_AddProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pVarProp); +extern HRESULT WINAPI IDxDiagContainerImpl_AddChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pszContName, PDXDIAGCONTAINER pSubCont); + +/** + * factories + */ +extern HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); + +/** internal factory */ +extern HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, LPVOID *ppobj); +extern HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont); + +/********************************************************************** + * Dll lifetime tracking declaration for dxdiagn.dll + */ +extern LONG DXDIAGN_refCount; +static inline void DXDIAGN_LockModule(void) { InterlockedIncrement( &DXDIAGN_refCount ); } +static inline void DXDIAGN_UnlockModule(void) { InterlockedDecrement( &DXDIAGN_refCount ); } + +#endif Property changes on: vendor/wine/dlls/dxdiagn/current/dxdiag_private.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/dlls/dxdiagn/current/dxdiagn.spec --- vendor/wine/dlls/dxdiagn/current/dxdiagn.spec 2005-12-14 22:41:16 UTC (rev 20178) +++ vendor/wine/dlls/dxdiagn/current/dxdiagn.spec 2005-12-14 22:45:50 UTC (rev 20179) @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Property changes on: vendor/wine/dlls/dxdiagn/current/dxdiagn.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/wine/dlls/dxdiagn/current/provider.c --- vendor/wine/dlls/dxdiagn/current/provider.c 2005-12-14 22:41:16 UTC (rev 20178) +++ vendor/wine/dlls/dxdiagn/current/provider.c 2005-12-14 22:45:50 UTC (rev 20179) @@ -0,0 +1,689 @@ +/* + * IDxDiagProvider Implementation + * + * Copyright 2004-2005 Raphael Junqueira + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "config.h" +#include "wine/debug.h" + +#define COBJMACROS +#include "dxdiag_private.h" +#include "wine/unicode.h" +#include "winver.h" +#include "objidl.h" +#include "dshow.h" +#include "strmif.h" +#include "vfw.h" +#include "mmddk.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* IDxDiagProvider IUnknown parts follow: */ +HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) +{ + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDxDiagProvider)) { + IDxDiagProviderImpl_AddRef(iface); + *ppobj = This; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + return E_NOINTERFACE; +} + +ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + + DXDIAGN_LockModule(); + + return refCount; +} + +ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + + if (!refCount) { + HeapFree(GetProcessHeap(), 0, This); + } + + DXDIAGN_UnlockModule(); + + return refCount; +} + +/* IDxDiagProvider Interface follow: */ +HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams) { + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + TRACE("(%p,%p)\n", iface, pParams); + + if (NULL == pParams) { + return E_POINTER; + } + if (pParams->dwSize != sizeof(DXDIAG_INIT_PARAMS)) { + return E_INVALIDARG; + } + + This->init = TRUE; + memcpy(&This->params, pParams, pParams->dwSize); + return S_OK; +} + +HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) { + HRESULT hr = S_OK; + IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + TRACE("(%p,%p)\n", iface, ppInstance); + + if (NULL == ppInstance) { + return E_INVALIDARG; + } + if (FALSE == This->init) { + return E_INVALIDARG; /* should be E_CO_UNINITIALIZED */ + } + if (NULL == This->pRootContainer) { + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer); + if (FAILED(hr)) { + return hr; + } + hr = DXDiag_InitRootDXDiagContainer((PDXDIAGCONTAINER)This->pRootContainer); + } + return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContain er, &IID_IDxDiagContainer, (void**) ppInstance); +} + +static const IDxDiagProviderVtbl DxDiagProvider_Vtbl = +{ + IDxDiagProviderImpl_QueryInterface, + IDxDiagProviderImpl_AddRef, + IDxDiagProviderImpl_Release, + IDxDiagProviderImpl_Initialize, + IDxDiagProviderImpl_GetRootContainer +}; + +HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { + IDxDiagProviderImpl* provider; + + TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); + + provider = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagProviderImpl)); + if (NULL == provider) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } + provider->lpVtbl = &DxDiagProvider_Vtbl; + provider->ref = 0; /* will be inited with QueryInterface */ + return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); +} + +/** + * @param szFilePath: usually GetSystemDirectoryW + * @param szFileName: name of the dll without path + */ +HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCHAR* szFilePath, const WCHAR* szFileName) { + HRESULT hr = S_OK; + /**/ + static const WCHAR szSlashSep[] = {'\\',0}; + static const WCHAR szPath[] = {'s','z','P','a','t','h',0}; + static const WCHAR szName[] = {'s','z','N','a','m','e',0}; + static const WCHAR szVersion[] = {'s','z','V','e','r','s','i','o','n',0}; + static const WCHAR szAttributes[] = {'s','z','A','t','t','r','i','b','u','t','e','s',0}; + static const WCHAR szLanguageEnglish[] = {'s','z','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; + static const WCHAR dwFileTimeHigh[] = {'d','w','F','i','l','e','T','i','m','e','H','i','g','h',0}; + static const WCHAR dwFileTimeLow[] = {'d','w','F','i','l','e','T','i','m','e','L','o','w',0}; + static const WCHAR bBeta[] = {'b','B','e','t','a',0}; + static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; + static const WCHAR bExists[] = {'b','E','x','i','s','t','s',0}; + /** values */ + static const WCHAR szFinal_Retail_v[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; + static const WCHAR szEnglish_v[] = {'E','n','g','l','i','s','h',0}; + static const WCHAR szVersionFormat[] = {'%','u','.','%','0','2','u','.','%','0','4','u','.','%','0','4','u',0}; + VARIANT v; + + WCHAR szFile[512]; + WCHAR szVersion_v[1024]; + DWORD retval, hdl; + LPVOID pVersionInfo; + BOOL boolret; + UINT uiLength; + VS_FIXEDFILEINFO* pFileInfo; + + FIXME("(%p,%s)\n", pSubCont, debugstr_w(szFileName)); + + lstrcpyW(szFile, szFilePath); + lstrcatW(szFile, szSlashSep); + lstrcatW(szFile, szFileName); + + retval = GetFileVersionInfoSizeW(szFile, &hdl); + pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); + hr = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); + boolret = VerQueryValueW(pVersionInfo, (LPWSTR) szSlashSep, (LPVOID) &pFileInfo, &uiLength); + + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFile); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szPath, &v); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFileName); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); + VariantClear(&v); + V_VT(&v) = VT_BOOL; V_BOOL(&v) = boolret; + hr = IDxDiagContainerImpl_AddProp(pSubCont, bExists, &v); + VariantClear(&v); + + if (boolret) { + snprintfW(szVersion_v, sizeof(szVersion_v), + szVersionFormat, + HIWORD(pFileInfo->dwFileVersionMS), + LOWORD(pFileInfo->dwFileVersionMS), + HIWORD(pFileInfo->dwFileVersionLS), + LOWORD(pFileInfo->dwFileVersionLS)); + + TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); + + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szVersion_v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szVersion, &v); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFinal_Retail_v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szAttributes, &v); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szEnglish_v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szLanguageEnglish, &v); + VariantClear(&v); + V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateMS; + hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeHigh, &v); + VariantClear(&v); + V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateLS; + hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeLow, &v); + VariantClear(&v); + V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE)); + hr = IDxDiagContainerImpl_AddProp(pSubCont, bBeta, &v); + VariantClear(&v); + V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG)); + hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); + VariantClear(&v); + } + + HeapFree(GetProcessHeap(), 0, pVersionInfo); + + return hr; +} + +HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) { + HRESULT hr = S_OK; + static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a' ,'j','o','r',0}; + static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i' ,'n','o','r',0}; + static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e' ,'t','t','e','r',0}; + static const WCHAR szDirectXVersionLetter_v[] = {'c',0}; + static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; + static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n' ,'g','l','i','s','h',0}; + static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; + static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o' ,'n','g','E','n','g','l','i','s','h',0}; + static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; + /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ + /*szWindowsDir*/ + /*szWindowsDir*/ + /*"dwOSMajorVersion"*/ + /*"dwOSMinorVersion"*/ + /*"dwOSBuildNumber"*/ + /*"dwOSPlatformID"*/ + VARIANT v; + + V_VT(&v) = VT_UI4; V_UI4(&v) = 9; + hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMajor, &v); + VariantClear(&v); + V_VT(&v) = VT_UI4; V_UI4(&v) = 0; + hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMinor, &v); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLetter_v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLetter, &v); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionEnglish_v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionEnglish, &v); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLongEnglish_v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLongEnglish, &v); + VariantClear(&v); + V_VT(&v) = VT_BOOL; V_BOOL(&v) = FALSE; + hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); + VariantClear(&v); + + return hr; +} + +HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCont) { + HRESULT hr = S_OK; + /* + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szDeviceID[] = {'s','z','D','e','v','i','c','e','I','D',0}; + + static const WCHAR szDrivers[] = {'s','z','D','r','i','v','e','r','s',0}; + + VARIANT v; + IDxDiagContainer* pDeviceSubCont = NULL; + IDxDiagContainer* pDriversCont = NULL; + + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDeviceSubCont); + if (FAILED(hr)) { return hr; } + V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); + hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDescription, &v); + VariantClear(&v); + V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); + hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDeviceID, &v); + VariantClear(&v); + + hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "", pDeviceSubCont); + */ + + /* + * Drivers Cont contains Files Desc Containers + */ + /* + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); + if (FAILED(hr)) { return hr; } + hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); + + */ + return hr; +} + +HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont) { + HRESULT hr = S_OK; + /* + static const WCHAR szDriveLetter[] = {'s','z','D','r','i','v','e','L','e','t','t','e','r',0}; + static const WCHAR szFreeSpace[] = {'s','z','F','r','e','e','S','p','a','c','e',0}; + static const WCHAR szMaxSpace[] = {'s','z','M','a','x','S','p','a','c','e',0}; + static const WCHAR szFileSystem[] = {'s','z','F','i','l','e','S','y','s','t','e','m',0}; + static const WCHAR szModel[] = {'s','z','M','o','d','e','l',0}; + static const WCHAR szPNPDeviceID[] = {'s','z','P','N','P','D','e','v','i','c','e','I','D',0}; + static const WCHAR dwHardDriveIndex[] = {'d','w','H','a','r','d','D','r','i','v','e','I','n','d','e','x',0}; + + static const WCHAR szDrivers[] = {'s','z','D','r','i','v','e','r','s',0}; + + VARIANT v; + IDxDiagContainer* pDiskSubCont = NULL; + IDxDiagContainer* pDriversCont = NULL; + + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDiskSubCont); + if (FAILED(hr)) { return hr; } + hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "" , pDiskSubCont); + */ + + /* + * Drivers Cont contains Files Desc Containers + */ + /* + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); + if (FAILED(hr)) { return hr; } + hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); + */ + return hr; +} +HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont) { + HRESULT hr = S_OK; + /**/ + static const WCHAR ddraw_dll[] = {'d','d','r','a','w','.','d','l','l',0}; + static const WCHAR dplayx_dll[] = {'d','p','l','a','y','x','.','d','l','l',0}; + static const WCHAR dpnet_dll[] = {'d','p','n','e','t','.','d','l','l',0}; + static const WCHAR dinput_dll[] = {'d','i','n','p','u','t','.','d','l','l',0}; + static const WCHAR dinput8_dll[] = {'d','i','n','p','u','t','8','.','d','l','l',0}; + static const WCHAR dsound_dll[] = {'d','s','o','u','n','d','.','d','l','l',0}; + static const WCHAR dswave_dll[] = {'d','s','w','a','v','e','.','d','l','l',0}; [truncated at 1000 lines; 947 more skipped]

19 years

[gvg] 20178: Martin Fuchs <martin-fuchs@gmx.net>

by gvg＠svn.reactos.com

Martin Fuchs <martin-fuchs(a)gmx.net> Directly return the correct "My Computer" attributes in ISF_Desktop_fnGetAttributesOf(). Fixes bug 1097 Modified: branches/ros-branch-0_2_9/reactos/lib/shell32/shfldr_desktop.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/shell32/shfldr_desktop.c --- branches/ros-branch-0_2_9/reactos/lib/shell32/shfldr_desktop.c 2005-12-14 21:39:24 UTC (rev 20177) +++ branches/ros-branch-0_2_9/reactos/lib/shell32/shfldr_desktop.c 2005-12-14 22:41:16 UTC (rev 20178) @@ -428,6 +428,9 @@ static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + static const DWORD dwMyComputerAttributes = + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | + SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); @@ -447,6 +450,8 @@ pdump (*apidl); if (_ILIsDesktop(*apidl)) { *rgfInOut &= dwDesktopAttributes; + } else if (_ILIsMyComputer(*apidl)) { + *rgfInOut &= dwMyComputerAttributes; } else { SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); }

19 years

[gvg] 20177: Merge from trunk:

by gvg＠svn.reactos.com

Merge from trunk: Make property sheet fit in 640x480. Fixes bug 1099 Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/Ja.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/cz.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/de.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/en.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/es.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/hu.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/nl.rc Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/sv.rc _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/Ja.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/Ja.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/Ja.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -1,6 +1,6 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æSö?" FONT 9, "MS UI Gothic" @@ -9,7 +9,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÉöÆl" FONT 9, "MS UI Gothic" @@ -18,7 +18,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Æ?ë¦" FONT 9, "MS UI Gothic" @@ -27,7 +27,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ä×ìÅ" FONT 9, "MS UI Gothic" @@ -43,15 +43,15 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "î?îÒé?ïLìå(&P):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Ä×ìÅé?î`Ä«é?ò\\ïLû@\n\n\ h = Ä×èÈ m = ò¬ s = òb t = î?æOé?é¢é?î?îÒ\n\n\ h = 12 Ä×èÈ\nH = 24 Ä×èÈ\n\nhh, mm, ss = Éµô¬é?â[âìéáéÞ\n\ - h, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + h, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ô·òt" FONT 9, "MS UI Gothic" @@ -60,7 +60,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ô³ù?î¥îÛ" FONT 9, "MS UI Gothic" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/cz.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/cz.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/cz.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -2,7 +2,7 @@ LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ObecnÚ nastavenÝ" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "?Ýsla" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mýna" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "?as" FONT 8, "MS Shell Dlg" @@ -45,16 +45,15 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Zkratka odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Zßpis formßtu Þasu\n\n\ - h = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\n\ - h = 12-ti hodinov² cyklus\nH = 24-ti godinov² cyklus\n\n\ - hh, mm, ss = poÞßteÞnÝ nula\n\ - h, m, s = bez poÞßteÞnÝ nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\n\ +h = 12-ti hodinov² cyklus H = 24-ti godinov² cyklus\n\ +hh, mm, ss = poÞßteÞnÝ nula h, m, s = bez poÞßteÞnÝ nuly", -1, 13, 133, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -63,7 +62,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Jazyky" FONT 8, "MS Shell Dlg" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/de.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/de.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/de.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zahlen" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wõhrung" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Uhrzeit" FONT 8, "MS Shell Dlg" @@ -45,16 +45,15 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Zeitformat\n\n\ - h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n\ - h = 12 Stunden\nH = 24 Stunden\n\n\ - hh, mm, ss = f³hrende Null\n\ - h, m, s = keine f³hrende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n\ +h = 12 Stunden H = 24 Stunden\n\ +hh, mm, ss = f³hrende Null h, m, s = keine f³hrende Null", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -63,7 +62,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/en.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/en.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/en.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Numbers" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Currency" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Time" FONT 8, "MS Shell Dlg" @@ -45,15 +45,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Time format notation\n\n\ - h = hour m = minute s = second t = am or pm\n\nh = 12 hour\n\ - H = 24 hour\n\nhh, mm, ss = leading zero\n\ - h, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = hour m = minute s = second t = am or pm\n\n\ +h = 12 hour H = 24 hour\n\ +hh, mm, ss = leading zero h, m, s = no leading zero", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Date" FONT 8, "MS Shell Dlg" @@ -62,7 +63,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Input Locale" FONT 8, "MS Shell Dlg" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/es.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/es.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/es.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -6,7 +6,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" @@ -15,7 +15,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Numeros" FONT 8, "MS Shell Dlg" @@ -24,7 +24,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Moneda" FONT 8, "MS Shell Dlg" @@ -33,7 +33,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tiempo" FONT 8, "MS Shell Dlg" @@ -49,18 +49,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Formato de Notaci¾n del Tiempo\n\n" - "h = hora m = minuto s = segundo t = am ¾ pm\n\n" - "h = 12 houras\n" - "H = 24 houras\n\n" - "hh, mm, ss = cero inicial\n" - "h, m, s = sin cero inicial", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + "h = hora m = minuto s = segundo t = am ¾ pm\n\n" + "h = 12 houras H = 24 houras\n" + "hh, mm, ss = cero inicial h, m, s = sin cero inicial", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Dia" FONT 8, "MS Shell Dlg" @@ -69,7 +67,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Localidad" FONT 8, "MS Shell Dlg" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/hu.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/hu.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/hu.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -1,7 +1,7 @@ // Hungarian resource file by Peter Lukacs LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "?ltalßnos" FONT 8, "MS Shell Dlg" @@ -10,7 +10,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Szßmok" FONT 8, "MS Shell Dlg" @@ -19,7 +19,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "PÚnznem" FONT 8, "MS Shell Dlg" @@ -28,7 +28,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Id§" FONT 8, "MS Shell Dlg" @@ -44,18 +44,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&DÚlutßn jele:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Id§formßtum jel÷lÚse\n\n" "o = ¾ra p = perc m = mßsodperc n = de. vagy du.\n\n" - "o = 12 ¾rßs\n" - "O = 24 ¾rßs\n\n" - "oo, pp, mm = nulla hasznßlata\n" - "o, p, m = nincs nulla", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + "o = 12 ¾rßs O = 24 ¾rßs\n" + "oo, pp, mm = nulla hasznßlata o, p, m = nincs nulla", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Dßtum" FONT 8, "MS Shell Dlg" @@ -64,7 +62,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hely megadßsa" FONT 8, "MS Shell Dlg" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/nl.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/nl.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/nl.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -2,7 +2,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Getal" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Valuta" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tijd" FONT 8, "MS Shell Dlg" @@ -45,16 +45,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&PM-symbool:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 132, 228, 60, WS_VISIBLE LTEXT "Tijdsnotatie\n\n\ - h = uur m = minuut s = second t = am or pm\n\n\ - h = 12 uur\nH = 24 uur\n\n\ - hh, mm, ss = voorgaande nul\n\ - h, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = uur m = minuut s = second t = am or pm\n\n\ +h = 12 uur H = 24 uur\n\ +hh, mm, ss = voorgaande nul h, m, s = zonder voorgaande nul", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Invoer" FONT 8, "MS Shell Dlg" _____ Modified: branches/ros-branch-0_2_9/reactos/lib/cpl/intl/sv.rc --- branches/ros-branch-0_2_9/reactos/lib/cpl/intl/sv.rc 2005-12-14 21:36:15 UTC (rev 20176) +++ branches/ros-branch-0_2_9/reactos/lib/cpl/intl/sv.rc 2005-12-14 21:39:24 UTC (rev 20177) @@ -3,7 +3,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generellt" FONT 8, "MS Shell Dlg" @@ -12,7 +12,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tal" FONT 8, "MS Shell Dlg" @@ -21,7 +21,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Valuta" FONT 8, "MS Shell Dlg" @@ -30,7 +30,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tid" FONT 8, "MS Shell Dlg" @@ -39,7 +39,7 @@ END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -48,7 +48,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "InmatningssprÕk" FONT 8, "MS Shell Dlg"

19 years

← Newer
1
...
29
30
31
32
33
34
35
...
71
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

Ros-diffs December 2005