Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[hpoussin] 35213: Replace .def file by a .spec file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 03:26:56 2008 New Revision: 35213 URL: http://svn.reactos.org/svn/reactos?rev=35213&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/win32/snmpapi/snmpapi.spec (with props) Removed: trunk/reactos/dll/win32/snmpapi/snmpapi.def Modified: trunk/reactos/dll/win32/snmpapi/debug.h (props changed) trunk/reactos/dll/win32/snmpapi/snmpapi.c (props changed) trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild trunk/reactos/dll/win32/snmpapi/snmpapi.rc (contents, props changed) Propchange: trunk/reactos/dll/win32/snmpapi/debug.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/win32/snmpapi/snmpapi.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Removed: trunk/reactos/dll/win32/snmpapi/snmpapi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.def (removed) @@ -1,43 +1,0 @@ -; SNMPAPI.DLL - ReactOS Sockets 2 Simple Network Management Protocol API DLL - -LIBRARY snmpapi.dll - -EXPORTS -SnmpSvcAddrIsIpx -SnmpSvcAddrToSocket -SnmpSvcGetEnterpriseOID -SnmpSvcGetUptime -SnmpSvcInitUptime -SnmpSvcSetLogLevel -SnmpSvcSetLogType -SnmpTfxClose -SnmpTfxOpen -SnmpTfxQuery -SnmpUtilAnsiToUnicode -SnmpUtilAsnAnyCpy@8 -SnmpUtilAsnAnyFree -SnmpUtilDbgPrint -SnmpUtilIdsToA -SnmpUtilMemAlloc -SnmpUtilMemFree -SnmpUtilMemReAlloc -SnmpUtilOctetsCmp -SnmpUtilOctetsCpy -SnmpUtilOctetsFree -SnmpUtilOctetsNCmp -SnmpUtilOidAppend@8 -SnmpUtilOidCmp -SnmpUtilOidCpy@8 -SnmpUtilOidFree@4 -SnmpUtilOidNCmp@12 -SnmpUtilOidToA@4 -SnmpUtilPrintAsnAny -SnmpUtilPrintOid -SnmpUtilUTF8ToUnicode -SnmpUtilUnicodeToAnsi -SnmpUtilUnicodeToUTF8 -SnmpUtilVarBindCpy -SnmpUtilVarBindFree -SnmpUtilVarBindListCpy -SnmpUtilVarBindListFree -; EOF Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] Sat Aug 9 03:26:56 2008 @@ -1,9 +1,10 @@ <module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll" unicode="yes"> - <importlibrary definition="snmpapi.def" /> + <importlibrary definition="snmpapi.spec.def" /> <include base="snmpapi">.</include> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> <file>snmpapi.c</file> <file>snmpapi.rc</file> + <file>snmpapi.spec</file> </module> Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.rc [iso-8859-1] Sat Aug 9 03:26:56 2008 @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: snmpapi.rc 22410 2006-06-19 12:34:31Z gedmurphy $ */ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sockets 2 SNMP Helper API\0" Propchange: trunk/reactos/dll/win32/snmpapi/snmpapi.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Added: trunk/reactos/dll/win32/snmpapi/snmpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.spec (added) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.spec [iso-8859-1] Sat Aug 9 03:26:56 2008 @@ -1,0 +1,37 @@ +@ stdcall SnmpSvcAddrIsIpx(ptr ptr) +@ stdcall SnmpSvcAddrToSocket(ptr ptr) +@ stdcall SnmpSvcGetEnterpriseOID(ptr ptr) +@ stdcall SnmpSvcGetUptime() +@ stdcall SnmpSvcInitUptime() +@ stdcall SnmpSvcSetLogLevel(long) +@ stdcall SnmpSvcSetLogType(long) +@ stdcall SnmpTfxClose(ptr ptr) +@ stdcall SnmpTfxOpen(ptr ptr) +@ stdcall SnmpTfxQuery(ptr ptr) +@ stdcall SnmpUtilAnsiToUnicode(ptr ptr) +@ stdcall SnmpUtilAsnAnyCpy(ptr ptr) +@ stdcall SnmpUtilAsnAnyFree(ptr) +@ cdecl SnmpUtilDbgPrint(long str) +@ stdcall SnmpUtilIdsToA(ptr long) +@ stdcall SnmpUtilMemAlloc(long) +@ stdcall SnmpUtilMemFree(ptr) +@ stdcall SnmpUtilMemReAlloc(ptr long) +@ stdcall SnmpUtilOctetsCmp(ptr ptr) +@ stdcall SnmpUtilOctetsCpy(ptr ptr) +@ stdcall SnmpUtilOctetsFree(ptr) +@ stdcall SnmpUtilOctetsNCmp(ptr ptr long) +@ stdcall SnmpUtilOidAppend(ptr ptr) +@ stdcall SnmpUtilOidCmp(ptr ptr) +@ stdcall SnmpUtilOidCpy(ptr ptr) +@ stdcall SnmpUtilOidFree(ptr) +@ stdcall SnmpUtilOidNCmp(ptr ptr long) +@ stdcall SnmpUtilOidToA(ptr) +@ stdcall SnmpUtilPrintAsnAny(ptr) +@ stdcall SnmpUtilPrintOid(ptr) +@ stdcall SnmpUtilUTF8ToUnicode(ptr ptr) +@ stdcall SnmpUtilUnicodeToAnsi(ptr ptr) +@ stdcall SnmpUtilUnicodeToUTF8(ptr ptr) +@ stdcall SnmpUtilVarBindCpy(ptr ptr) +@ stdcall SnmpUtilVarBindFree(ptr) +@ stdcall SnmpUtilVarBindListCpy(ptr ptr) +@ stdcall SnmpUtilVarBindListFree(ptr) Propchange: trunk/reactos/dll/win32/snmpapi/snmpapi.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[dchapyshev] 35212: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Aug 9 03:23:45 2008 New Revision: 35212 URL: http://svn.reactos.org/svn/reactos?rev=35212&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Sat Aug 9 03:23:45 2008 @@ -598,11 +598,11 @@ IDS_SHV_COLUMN_FONTTYPE "Òèï øðèôòà" IDS_SHV_COLUMN_WORKGROUP "Ðàáî÷àÿ ãðóïïà" IDS_SHV_NETWORKLOCATION "Ñåòåâîå ðàñïîëîæåíèå" - IDS_SHV_COLUMN_DOCUMENTS "Documents" - IDS_SHV_COLUMN_STATUS "Status" - IDS_SHV_COLUMN_COMMENTS "Comments" - IDS_SHV_COLUMN_LOCATION "Location" - IDS_SHV_COLUMN_MODEL "Model" + IDS_SHV_COLUMN_DOCUMENTS "Äîêóìåíòû" + IDS_SHV_COLUMN_STATUS "Ñîñòîÿíèå" + IDS_SHV_COLUMN_COMMENTS "Êîìåíòàðèè" + IDS_SHV_COLUMN_LOCATION "Ðàñïîëîæåíèå" + IDS_SHV_COLUMN_MODEL "Ìîäåëü" /* special folders */ IDS_DESKTOP "Ðàáî÷èé ñòîë" @@ -621,8 +621,8 @@ IDS_COPY "Êîïèðîâàòü" IDS_DELETE "Óäàëèòü" IDS_PROPERTIES "Ñâîéñòâà" - IDS_CUT "Cut" - IDS_RESTORE "Restore" + IDS_CUT "Âûðåçàòü" + IDS_RESTORE "Âîñòàíîâèòü" IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè"

16 years, 2 months

[hpoussin] 35211: Define exported functions as WINAPI

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 03:20:58 2008 New Revision: 35211 URL: http://svn.reactos.org/svn/reactos?rev=35211&view=rev Log: Define exported functions as WINAPI Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Sat Aug 9 03:20:58 2008 @@ -403,7 +403,7 @@ return DefWindowProc(hwnd, Message, wParam, lParam); } -LONG +LONG WINAPI ImageView_CreateWindow(HWND hwnd, LPWSTR szFileName) { struct GdiplusStartupInput gdiplusStartupInput; @@ -464,19 +464,19 @@ return -1; } -VOID +VOID WINAPI ImageView_FullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { ImageView_CreateWindow(hwnd, (LPWSTR)path); } -VOID +VOID WINAPI ImageView_Fullscreen(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { ImageView_CreateWindow(hwnd, (LPWSTR)path); } -VOID +VOID WINAPI ImageView_FullscreenA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) { WCHAR szFile[MAX_PATH]; @@ -487,25 +487,25 @@ } } -VOID +VOID WINAPI ImageView_PrintTo(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { DPRINT("ImageView_PrintTo() not implemented\n"); } -VOID +VOID WINAPI ImageView_PrintToA(HWND hwnd, HINSTANCE hInst, LPCSTR path, int nShow) { DPRINT("ImageView_PrintToA() not implemented\n"); } -VOID +VOID WINAPI ImageView_PrintToW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { DPRINT("ImageView_PrintToW() not implemented\n"); } -VOID +VOID WINAPI imageview_fullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) { DPRINT("ImageView_fullscreenW() not implemented\n");

16 years, 2 months

[hpoussin] 35210: Replace .def file by a .spec file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 03:18:55 2008 New Revision: 35210 URL: http://svn.reactos.org/svn/reactos?rev=35210&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/win32/samsrv/samsrv.spec (with props) Removed: trunk/reactos/dll/win32/samsrv/samsrv.def Modified: trunk/reactos/dll/win32/samsrv/samsrv.rbuild Removed: trunk/reactos/dll/win32/samsrv/samsrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.de… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.def (removed) @@ -1,75 +1,0 @@ -LIBRARY samsrv -EXPORTS -;SamIAccountRestrictions -;SamIConnect -;SamICreateAccountByRid -;SamIEnumerateAccountRids -;SamIFree_SAMPR_ALIAS_INFO_BUFFER -;SamIFree_SAMPR_DISPLAY_INFO_BUFFER -;SamIFree_SAMPR_DOMAIN_INFO_BUFFER -;SamIFree_SAMPR_ENUMERATION_BUFFER -;SamIFree_SAMPR_GET_GROUPS_BUFFER -;SamIFree_SAMPR_GET_MEMBERS_BUFFER -;SamIFree_SAMPR_GROUP_INFO_BUFFER -;SamIFree_SAMPR_PSID_ARRAY -;SamIFree_SAMPR_RETURNED_USTRING_ARRAY -;SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR -;SamIFree_SAMPR_ULONG_ARRAY -;SamIFree_SAMPR_USER_INFO_BUFFER -;SamIGetPrivateData -;SamIGetSerialNumberDomain -SamIInitialize -;SamINotifyDelta -;SamISetAuditingInformation -;SamISetPrivateData -;SamISetSerialNumberDomain -SampInitializeRegistry -;SampRtlConvertUlongToUnicodeString -;SamrAddMemberToAlias -;SamrAddMemberToGroup -;SamrAddMultipleMemberstoAlias -;SamrChangePasswordUser -;SamrCloseHandle -;SamrConnect -;SamrCreateAliasInDomain -;SamrCreateGroupInDomain -;SamrCreateUserInDomain -;SamrDeleteAlias -;SamrDeleteGroup -;SamrDeleteUser -;SamrEnumerateAliasesInDomain -;SamrEnumerateDomainsInSamServer -;SamrEnumerateGroupsInDomain -;SamrEnumerateUsersInDomain -;SamrGetAliasMembership -;SamrGetGroupsForUser -;SamrGetMembersInAlias -;SamrGetMembersInGroup -;SamrGetUserDomainPasswordInformation -;SamrLookupDomainInSamServer -;SamrLookupIdsInDomain -;SamrLookupNamesInDomain -;SamrOpenAlias -;SamrOpenDomain -;SamrOpenGroup -;SamrOpenUser -;SamrQueryDisplayInformation -;SamrQueryInformationAlias -;SamrQueryInformationDomain -;SamrQueryInformationGroup -;SamrQueryInformationUser -;SamrQuerySecurityObject -;SamrRemoveMemberFromAlias -;SamrRemoveMemberFromForeignDomain -;SamrRemoveMemberFromGroup -;SamrRemoveMultipleMembersFromAlias -;SamrSetInformationAlias -;SamrSetInformationDomain -;SamrSetInformationGroup -;SamrSetInformationUser -;SamrSetMemberAttributesOfGroup -;SamrSetSecurityObject -;SamrShutdownSamServer -;SamrTestPrivateFunctionsDomain -;SamrTestPrivateFunctionsUser -; EOF Modified: trunk/reactos/dll/win32/samsrv/samsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rb… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rbuild [iso-8859-1] Sat Aug 9 03:18:55 2008 @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes"> - <importlibrary definition="samsrv.def" /> + <importlibrary definition="samsrv.spec.def" /> <include base="samsrv">.</include> <library>ntdll</library> <library>kernel32</library> <file>samsrv.c</file> <file>samsrv.rc</file> + <file>samsrv.spec</file> </module> Added: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec (added) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Sat Aug 9 03:18:55 2008 @@ -1,0 +1,73 @@ +;SamIAccountRestrictions +;SamIConnect +;SamICreateAccountByRid +;SamIEnumerateAccountRids +;SamIFree_SAMPR_ALIAS_INFO_BUFFER +;SamIFree_SAMPR_DISPLAY_INFO_BUFFER +;SamIFree_SAMPR_DOMAIN_INFO_BUFFER +;SamIFree_SAMPR_ENUMERATION_BUFFER +;SamIFree_SAMPR_GET_GROUPS_BUFFER +;SamIFree_SAMPR_GET_MEMBERS_BUFFER +;SamIFree_SAMPR_GROUP_INFO_BUFFER +;SamIFree_SAMPR_PSID_ARRAY +;SamIFree_SAMPR_RETURNED_USTRING_ARRAY +;SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR +;SamIFree_SAMPR_ULONG_ARRAY +;SamIFree_SAMPR_USER_INFO_BUFFER +;SamIGetPrivateData +;SamIGetSerialNumberDomain +@ stdcall SamIInitialize() +;SamINotifyDelta +;SamISetAuditingInformation +;SamISetPrivateData +;SamISetSerialNumberDomain +@ stdcall SampInitializeRegistry() +;SampRtlConvertUlongToUnicodeString +;SamrAddMemberToAlias +;SamrAddMemberToGroup +;SamrAddMultipleMemberstoAlias +;SamrChangePasswordUser +;SamrCloseHandle +;SamrConnect +;SamrCreateAliasInDomain +;SamrCreateGroupInDomain +;SamrCreateUserInDomain +;SamrDeleteAlias +;SamrDeleteGroup +;SamrDeleteUser +;SamrEnumerateAliasesInDomain +;SamrEnumerateDomainsInSamServer +;SamrEnumerateGroupsInDomain +;SamrEnumerateUsersInDomain +;SamrGetAliasMembership +;SamrGetGroupsForUser +;SamrGetMembersInAlias +;SamrGetMembersInGroup +;SamrGetUserDomainPasswordInformation +;SamrLookupDomainInSamServer +;SamrLookupIdsInDomain +;SamrLookupNamesInDomain +;SamrOpenAlias +;SamrOpenDomain +;SamrOpenGroup +;SamrOpenUser +;SamrQueryDisplayInformation +;SamrQueryInformationAlias +;SamrQueryInformationDomain +;SamrQueryInformationGroup +;SamrQueryInformationUser +;SamrQuerySecurityObject +;SamrRemoveMemberFromAlias +;SamrRemoveMemberFromForeignDomain +;SamrRemoveMemberFromGroup +;SamrRemoveMultipleMembersFromAlias +;SamrSetInformationAlias +;SamrSetInformationDomain +;SamrSetInformationGroup +;SamrSetInformationUser +;SamrSetMemberAttributesOfGroup +;SamrSetSecurityObject +;SamrShutdownSamServer +;SamrTestPrivateFunctionsDomain +;SamrTestPrivateFunctionsUser +; EOF Propchange: trunk/reactos/dll/win32/samsrv/samsrv.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[hpoussin] 35209: Replace .def file by a .spec file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 03:09:40 2008 New Revision: 35209 URL: http://svn.reactos.org/svn/reactos?rev=35209&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/win32/mmdrv/mmdrv.spec (with props) Removed: trunk/reactos/dll/win32/mmdrv/mmdrv.def Modified: trunk/reactos/dll/win32/mmdrv/TODO (props changed) trunk/reactos/dll/win32/mmdrv/auxil.c (props changed) trunk/reactos/dll/win32/mmdrv/common.c (contents, props changed) trunk/reactos/dll/win32/mmdrv/entry.c (contents, props changed) trunk/reactos/dll/win32/mmdrv/kernel.c (contents, props changed) trunk/reactos/dll/win32/mmdrv/midi.c (props changed) trunk/reactos/dll/win32/mmdrv/mmddk.h (props changed) trunk/reactos/dll/win32/mmdrv/mmdef.h (props changed) trunk/reactos/dll/win32/mmdrv/mmdrv.h (props changed) trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild trunk/reactos/dll/win32/mmdrv/mme.c (contents, props changed) trunk/reactos/dll/win32/mmdrv/mmioctl.h (contents, props changed) trunk/reactos/dll/win32/mmdrv/session.c (contents, props changed) trunk/reactos/dll/win32/mmdrv/utils.c (props changed) trunk/reactos/dll/win32/mmdrv/wave.c (props changed) trunk/reactos/dll/win32/mmdrv/wave.h (props changed) trunk/reactos/dll/win32/mmdrv/wave_io.c (contents, props changed) Propchange: trunk/reactos/dll/win32/mmdrv/TODO ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/mmdrv/auxil.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/mmdrv/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/common.c?r… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/common.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/common.c [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,258 +1,258 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Multimedia - * FILE: dll/win32/mmdrv/common.c - * PURPOSE: Multimedia User Mode Driver (Common functions) - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Jan 14, 2007: Created - */ - -#include <mmdrv.h> - -/* - Translates errors to MMRESULT codes. -*/ - -MMRESULT -ErrorToMmResult(UINT error_code) -{ - switch ( error_code ) - { - case NO_ERROR : - case ERROR_IO_PENDING : - return MMSYSERR_NOERROR; - - case ERROR_BUSY : - return MMSYSERR_ALLOCATED; - - case ERROR_NOT_SUPPORTED : - case ERROR_INVALID_FUNCTION : - return MMSYSERR_NOTSUPPORTED; - - case ERROR_NOT_ENOUGH_MEMORY : - return MMSYSERR_NOMEM; - - case ERROR_ACCESS_DENIED : - return MMSYSERR_BADDEVICEID; - - case ERROR_INSUFFICIENT_BUFFER : - return MMSYSERR_INVALPARAM; - }; - - /* If all else fails, it's just a plain old error */ - - return MMSYSERR_ERROR; -} - - -/* - Obtains a device count for a specific kind of device. -*/ - -DWORD -GetDeviceCount(DeviceType device_type) -{ - UINT index = 0; - HANDLE handle; - - /* Cycle through devices until an error occurs */ - - while ( OpenKernelDevice(device_type, index, GENERIC_READ, &handle) == MMSYSERR_NOERROR ) - { - CloseHandle(handle); - index ++; - } - - DPRINT("Found %d devices of type %d\n", index, device_type); - - return index; -} - - -/* - Obtains device capabilities. This could either be done as individual - functions for wave, MIDI and aux, or like this. I chose this method as - it centralizes everything. -*/ - -DWORD -GetDeviceCapabilities( - DeviceType device_type, - DWORD device_id, - PVOID capabilities, - DWORD capabilities_size) -{ - MMRESULT result; - DWORD ioctl; - HANDLE handle; - DWORD bytes_returned; - BOOL device_io_result; - - ASSERT(capabilities); - - /* Choose the right IOCTL for the job */ - - if ( IsWaveDevice(device_type) ) - ioctl = IOCTL_WAVE_GET_CAPABILITIES; - else if ( IsMidiDevice(device_type) ) - ioctl = IOCTL_MIDI_GET_CAPABILITIES; - else if ( IsAuxDevice(device_type) ) - return MMSYSERR_NOTSUPPORTED; /* TODO */ - else - return MMSYSERR_NOTSUPPORTED; - - result = OpenKernelDevice(device_type, - device_id, - GENERIC_READ, - &handle); - - if ( result != MMSYSERR_NOERROR ) - { - DPRINT("Failed to open kernel device\n"); - return result; - } - - device_io_result = DeviceIoControl(handle, - ioctl, - NULL, - 0, - (LPVOID) capabilities, - capabilities_size, - &bytes_returned, - NULL); - - /* Translate result */ - - if ( device_io_result ) - result = MMSYSERR_NOERROR; - else - result = ErrorToMmResult(GetLastError()); - - /* Clean up and return */ - - CloseKernelDevice(handle); - - return result; -} - - -/* - A wrapper around OpenKernelDevice that creates a session, - opens the kernel device, initializes session data and notifies - the client (application) that the device has been opened. Again, - this supports any device type and the only real difference is - the open descriptor. -*/ - -DWORD -OpenDevice( - DeviceType device_type, - DWORD device_id, - PVOID open_descriptor, - DWORD flags, - DWORD private_handle) -{ - SessionInfo* session_info; - MMRESULT result; - DWORD message; - - /* This will automatically check for duplicate sessions */ - result = CreateSession(device_type, device_id, &session_info); - - if ( result != MMSYSERR_NOERROR ) - { - DPRINT("Couldn't allocate session info\n"); - return result; - } - - result = OpenKernelDevice(device_type, - device_id, - GENERIC_READ, - &session_info->kernel_device_handle); - - if ( result != MMSYSERR_NOERROR ) - { - DPRINT("Failed to open kernel device\n"); - DestroySession(session_info); - return result; - } - - /* Set common session data */ - - session_info->flags = flags; - - /* Set wave/MIDI specific data */ - - if ( IsWaveDevice(device_type) ) - { - LPWAVEOPENDESC wave_open_desc = (LPWAVEOPENDESC) open_descriptor; - session_info->callback = wave_open_desc->dwCallback; - session_info->mme_wave_handle = wave_open_desc->hWave; - session_info->app_user_data = wave_open_desc->dwInstance; - } - else - { - DPRINT("Only wave devices are supported at present!\n"); - DestroySession(session_info); - return MMSYSERR_NOTSUPPORTED; - } - - /* Start the processing thread */ - - result = StartSessionThread(session_info); - - if ( result != MMSYSERR_NOERROR ) - { - DestroySession(session_info); - return result; - } - - /* Store the session info */ - - *((SessionInfo**)private_handle) = session_info; - - /* Send the right message */ - - message = (device_type == WaveOutDevice) ? WOM_OPEN : - (device_type == WaveInDevice) ? WIM_OPEN : - (device_type == MidiOutDevice) ? MOM_OPEN : - (device_type == MidiInDevice) ? MIM_OPEN : 0xFFFFFFFF; - - NotifyClient(session_info, message, 0, 0); - - return MMSYSERR_NOERROR; -} - - -/* - Attempts to close a device. This can fail if playback/recording has - not been stopped. We need to make sure it's safe to destroy the - session as well (mainly by killing the session thread.) -*/ - -DWORD -CloseDevice( - DWORD private_handle) -{ - MMRESULT result; - SessionInfo* session_info = (SessionInfo*) private_handle; - /* TODO: Maybe this is best off inside the playback thread? */ - - ASSERT(session_info); - - result = CallSessionThread(session_info, WODM_CLOSE, 0); - - if ( result == MMSYSERR_NOERROR ) - { - /* TODO: Wait for it to be safe to terminate */ - - CloseKernelDevice(session_info->kernel_device_handle); - - DestroySession(session_info); - } - - return result; -} - +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: dll/win32/mmdrv/common.c + * PURPOSE: Multimedia User Mode Driver (Common functions) + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Jan 14, 2007: Created + */ + +#include <mmdrv.h> + +/* + Translates errors to MMRESULT codes. +*/ + +MMRESULT +ErrorToMmResult(UINT error_code) +{ + switch ( error_code ) + { + case NO_ERROR : + case ERROR_IO_PENDING : + return MMSYSERR_NOERROR; + + case ERROR_BUSY : + return MMSYSERR_ALLOCATED; + + case ERROR_NOT_SUPPORTED : + case ERROR_INVALID_FUNCTION : + return MMSYSERR_NOTSUPPORTED; + + case ERROR_NOT_ENOUGH_MEMORY : + return MMSYSERR_NOMEM; + + case ERROR_ACCESS_DENIED : + return MMSYSERR_BADDEVICEID; + + case ERROR_INSUFFICIENT_BUFFER : + return MMSYSERR_INVALPARAM; + }; + + /* If all else fails, it's just a plain old error */ + + return MMSYSERR_ERROR; +} + + +/* + Obtains a device count for a specific kind of device. +*/ + +DWORD +GetDeviceCount(DeviceType device_type) +{ + UINT index = 0; + HANDLE handle; + + /* Cycle through devices until an error occurs */ + + while ( OpenKernelDevice(device_type, index, GENERIC_READ, &handle) == MMSYSERR_NOERROR ) + { + CloseHandle(handle); + index ++; + } + + DPRINT("Found %d devices of type %d\n", index, device_type); + + return index; +} + + +/* + Obtains device capabilities. This could either be done as individual + functions for wave, MIDI and aux, or like this. I chose this method as + it centralizes everything. +*/ + +DWORD +GetDeviceCapabilities( + DeviceType device_type, + DWORD device_id, + PVOID capabilities, + DWORD capabilities_size) +{ + MMRESULT result; + DWORD ioctl; + HANDLE handle; + DWORD bytes_returned; + BOOL device_io_result; + + ASSERT(capabilities); + + /* Choose the right IOCTL for the job */ + + if ( IsWaveDevice(device_type) ) + ioctl = IOCTL_WAVE_GET_CAPABILITIES; + else if ( IsMidiDevice(device_type) ) + ioctl = IOCTL_MIDI_GET_CAPABILITIES; + else if ( IsAuxDevice(device_type) ) + return MMSYSERR_NOTSUPPORTED; /* TODO */ + else + return MMSYSERR_NOTSUPPORTED; + + result = OpenKernelDevice(device_type, + device_id, + GENERIC_READ, + &handle); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("Failed to open kernel device\n"); + return result; + } + + device_io_result = DeviceIoControl(handle, + ioctl, + NULL, + 0, + (LPVOID) capabilities, + capabilities_size, + &bytes_returned, + NULL); + + /* Translate result */ + + if ( device_io_result ) + result = MMSYSERR_NOERROR; + else + result = ErrorToMmResult(GetLastError()); + + /* Clean up and return */ + + CloseKernelDevice(handle); + + return result; +} + + +/* + A wrapper around OpenKernelDevice that creates a session, + opens the kernel device, initializes session data and notifies + the client (application) that the device has been opened. Again, + this supports any device type and the only real difference is + the open descriptor. +*/ + +DWORD +OpenDevice( + DeviceType device_type, + DWORD device_id, + PVOID open_descriptor, + DWORD flags, + DWORD private_handle) +{ + SessionInfo* session_info; + MMRESULT result; + DWORD message; + + /* This will automatically check for duplicate sessions */ + result = CreateSession(device_type, device_id, &session_info); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("Couldn't allocate session info\n"); + return result; + } + + result = OpenKernelDevice(device_type, + device_id, + GENERIC_READ, + &session_info->kernel_device_handle); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("Failed to open kernel device\n"); + DestroySession(session_info); + return result; + } + + /* Set common session data */ + + session_info->flags = flags; + + /* Set wave/MIDI specific data */ + + if ( IsWaveDevice(device_type) ) + { + LPWAVEOPENDESC wave_open_desc = (LPWAVEOPENDESC) open_descriptor; + session_info->callback = wave_open_desc->dwCallback; + session_info->mme_wave_handle = wave_open_desc->hWave; + session_info->app_user_data = wave_open_desc->dwInstance; + } + else + { + DPRINT("Only wave devices are supported at present!\n"); + DestroySession(session_info); + return MMSYSERR_NOTSUPPORTED; + } + + /* Start the processing thread */ + + result = StartSessionThread(session_info); + + if ( result != MMSYSERR_NOERROR ) + { + DestroySession(session_info); + return result; + } + + /* Store the session info */ + + *((SessionInfo**)private_handle) = session_info; + + /* Send the right message */ + + message = (device_type == WaveOutDevice) ? WOM_OPEN : + (device_type == WaveInDevice) ? WIM_OPEN : + (device_type == MidiOutDevice) ? MOM_OPEN : + (device_type == MidiInDevice) ? MIM_OPEN : 0xFFFFFFFF; + + NotifyClient(session_info, message, 0, 0); + + return MMSYSERR_NOERROR; +} + + +/* + Attempts to close a device. This can fail if playback/recording has + not been stopped. We need to make sure it's safe to destroy the + session as well (mainly by killing the session thread.) +*/ + +DWORD +CloseDevice( + DWORD private_handle) +{ + MMRESULT result; + SessionInfo* session_info = (SessionInfo*) private_handle; + /* TODO: Maybe this is best off inside the playback thread? */ + + ASSERT(session_info); + + result = CallSessionThread(session_info, WODM_CLOSE, 0); + + if ( result == MMSYSERR_NOERROR ) + { + /* TODO: Wait for it to be safe to terminate */ + + CloseKernelDevice(session_info->kernel_device_handle); + + DestroySession(session_info); + } + + return result; +} + Propchange: trunk/reactos/dll/win32/mmdrv/common.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mmdrv/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/entry.c?re… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/entry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/entry.c [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -22,7 +22,7 @@ In summary, we just implement to satisfy the MME API (winmm) requirements. */ -LONG +LONG WINAPI DriverProc( DWORD driver_id, HANDLE driver_handle, Propchange: trunk/reactos/dll/win32/mmdrv/entry.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/mmdrv/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/kernel.c?r… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/kernel.c [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,206 +1,206 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Multimedia - * FILE: dll/win32/mmdrv/kernel.c - * PURPOSE: Multimedia User Mode Driver (kernel interface) - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Jan 14, 2007: Created - */ - -#include <mmdrv.h> - -/* - Devices that we provide access to follow a standard naming convention. - The first wave output, for example, appears as \Device\WaveOut0 - - I'm not entirely certain how drivers find a free name to use, or why - we need to strip the leading \Device from it when opening, but hey... -*/ - -MMRESULT -CobbleDeviceName( - DeviceType device_type, - DWORD device_id, - PWCHAR out_device_name) -{ - WCHAR base_device_name[MAX_DEVICE_NAME_LENGTH]; - - /* Work out the base name from the device type */ - - switch ( device_type ) - { - case WaveOutDevice : - wsprintf(base_device_name, L"%ls", WAVE_OUT_DEVICE_NAME); - break; - - case WaveInDevice : - wsprintf(base_device_name, L"%ls", WAVE_IN_DEVICE_NAME); - break; - - case MidiOutDevice : - wsprintf(base_device_name, L"%ls", MIDI_OUT_DEVICE_NAME); - break; - - case MidiInDevice : - wsprintf(base_device_name, L"%ls", MIDI_IN_DEVICE_NAME); - break; - - case AuxDevice : - wsprintf(base_device_name, L"%ls", AUX_DEVICE_NAME); - break; - - default : - return MMSYSERR_BADDEVICEID; - }; - - /* Now append the device number, removing the leading \Device */ - - wsprintf(out_device_name, - L"\\\\.%ls%d", - base_device_name + strlen("\\Device"), - device_id); - - return MMSYSERR_NOERROR; -} - - -/* - Takes a device type (eg: WaveOutDevice), a device ID, desired access and - a pointer to a location that will store the handle of the opened "file" if - the function succeeds. - - The device type and ID are converted into a device name using the above - function. -*/ - -MMRESULT -OpenKernelDevice( - DeviceType device_type, - DWORD device_id, - DWORD access, - HANDLE* handle) -{ - MMRESULT result; - WCHAR device_name[MAX_DEVICE_NAME_LENGTH]; - DWORD open_flags = 0; - - ASSERT(handle); - - /* Glue the base device name and the ID together */ - - result = CobbleDeviceName(device_type, device_id, device_name); - - DPRINT("Opening kernel device %ls\n", device_name); - - if ( result != MMSYSERR_NOERROR ) - return result; - - /* We want overlapped I/O when writing */ - - if ( access != GENERIC_READ ) - open_flags = FILE_FLAG_OVERLAPPED; - - /* Now try opening... */ - - *handle = CreateFile(device_name, - access, - FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - open_flags, - NULL); - - if ( *handle == INVALID_HANDLE_VALUE ) - return ErrorToMmResult(GetLastError()); - - return MMSYSERR_NOERROR; -} - - -/* - Just an alias for the benefit of having a pair of functions ;) -*/ - -void -CloseKernelDevice(HANDLE device_handle) -{ - CloseHandle(device_handle); -} - - -MMRESULT -SetDeviceData( - HANDLE device_handle, - DWORD ioctl, - PBYTE input_buffer, - DWORD buffer_size) -{ - DPRINT("SetDeviceData\n"); - /* TODO */ - return 0; -} - - -MMRESULT -GetDeviceData( - HANDLE device_handle, - DWORD ioctl, - PBYTE output_buffer, - DWORD buffer_size) -{ - OVERLAPPED overlap; - DWORD bytes_returned; - BOOL success; - DWORD transfer; - - DPRINT("GetDeviceData\n"); - - memset(&overlap, 0, sizeof(overlap)); - - overlap.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! overlap.hEvent ) - return MMSYSERR_NOMEM; - - success = DeviceIoControl(device_handle, - ioctl, - NULL, - 0, - output_buffer, - buffer_size, - &bytes_returned, - &overlap); - - if ( ! success ) - { - if ( GetLastError() == ERROR_IO_PENDING ) - { - if ( ! GetOverlappedResult(device_handle, &overlap, &transfer, TRUE) ) - { - CloseHandle(overlap.hEvent); - return ErrorToMmResult(GetLastError()); - } - } - else - { - CloseHandle(overlap.hEvent); - return ErrorToMmResult(GetLastError()); - } - } - - while ( TRUE ) - { - SetEvent(overlap.hEvent); - - if ( WaitForSingleObjectEx(overlap.hEvent, 0, TRUE) != WAIT_IO_COMPLETION ) - { - break; - } - } - - CloseHandle(overlap.hEvent); - - return MMSYSERR_NOERROR; -} +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: dll/win32/mmdrv/kernel.c + * PURPOSE: Multimedia User Mode Driver (kernel interface) + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Jan 14, 2007: Created + */ + +#include <mmdrv.h> + +/* + Devices that we provide access to follow a standard naming convention. + The first wave output, for example, appears as \Device\WaveOut0 + + I'm not entirely certain how drivers find a free name to use, or why + we need to strip the leading \Device from it when opening, but hey... +*/ + +MMRESULT +CobbleDeviceName( + DeviceType device_type, + DWORD device_id, + PWCHAR out_device_name) +{ + WCHAR base_device_name[MAX_DEVICE_NAME_LENGTH]; + + /* Work out the base name from the device type */ + + switch ( device_type ) + { + case WaveOutDevice : + wsprintf(base_device_name, L"%ls", WAVE_OUT_DEVICE_NAME); + break; + + case WaveInDevice : + wsprintf(base_device_name, L"%ls", WAVE_IN_DEVICE_NAME); + break; + + case MidiOutDevice : + wsprintf(base_device_name, L"%ls", MIDI_OUT_DEVICE_NAME); + break; + + case MidiInDevice : + wsprintf(base_device_name, L"%ls", MIDI_IN_DEVICE_NAME); + break; + + case AuxDevice : + wsprintf(base_device_name, L"%ls", AUX_DEVICE_NAME); + break; + + default : + return MMSYSERR_BADDEVICEID; + }; + + /* Now append the device number, removing the leading \Device */ + + wsprintf(out_device_name, + L"\\\\.%ls%d", + base_device_name + strlen("\\Device"), + device_id); + + return MMSYSERR_NOERROR; +} + + +/* + Takes a device type (eg: WaveOutDevice), a device ID, desired access and + a pointer to a location that will store the handle of the opened "file" if + the function succeeds. + + The device type and ID are converted into a device name using the above + function. +*/ + +MMRESULT +OpenKernelDevice( + DeviceType device_type, + DWORD device_id, + DWORD access, + HANDLE* handle) +{ + MMRESULT result; + WCHAR device_name[MAX_DEVICE_NAME_LENGTH]; + DWORD open_flags = 0; + + ASSERT(handle); + + /* Glue the base device name and the ID together */ + + result = CobbleDeviceName(device_type, device_id, device_name); + + DPRINT("Opening kernel device %ls\n", device_name); + + if ( result != MMSYSERR_NOERROR ) + return result; + + /* We want overlapped I/O when writing */ + + if ( access != GENERIC_READ ) + open_flags = FILE_FLAG_OVERLAPPED; + + /* Now try opening... */ + + *handle = CreateFile(device_name, + access, + FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + open_flags, + NULL); + + if ( *handle == INVALID_HANDLE_VALUE ) + return ErrorToMmResult(GetLastError()); + + return MMSYSERR_NOERROR; +} + + +/* + Just an alias for the benefit of having a pair of functions ;) +*/ + +void +CloseKernelDevice(HANDLE device_handle) +{ + CloseHandle(device_handle); +} + + +MMRESULT +SetDeviceData( + HANDLE device_handle, + DWORD ioctl, + PBYTE input_buffer, + DWORD buffer_size) +{ + DPRINT("SetDeviceData\n"); + /* TODO */ + return 0; +} + + +MMRESULT +GetDeviceData( + HANDLE device_handle, + DWORD ioctl, + PBYTE output_buffer, + DWORD buffer_size) +{ + OVERLAPPED overlap; + DWORD bytes_returned; + BOOL success; + DWORD transfer; + + DPRINT("GetDeviceData\n"); + + memset(&overlap, 0, sizeof(overlap)); + + overlap.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! overlap.hEvent ) + return MMSYSERR_NOMEM; + + success = DeviceIoControl(device_handle, + ioctl, + NULL, + 0, + output_buffer, + buffer_size, + &bytes_returned, + &overlap); + + if ( ! success ) + { + if ( GetLastError() == ERROR_IO_PENDING ) + { + if ( ! GetOverlappedResult(device_handle, &overlap, &transfer, TRUE) ) + { + CloseHandle(overlap.hEvent); + return ErrorToMmResult(GetLastError()); + } + } + else + { + CloseHandle(overlap.hEvent); + return ErrorToMmResult(GetLastError()); + } + } + + while ( TRUE ) + { + SetEvent(overlap.hEvent); + + if ( WaitForSingleObjectEx(overlap.hEvent, 0, TRUE) != WAIT_IO_COMPLETION ) + { + break; + } + } + + CloseHandle(overlap.hEvent); + + return MMSYSERR_NOERROR; +} Propchange: trunk/reactos/dll/win32/mmdrv/kernel.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/mmdrv/midi.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/win32/mmdrv/mmddk.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/win32/mmdrv/mmdef.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Removed: trunk/reactos/dll/win32/mmdrv/mmdrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.def?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.def (removed) @@ -1,14 +1,0 @@ -; $Id$ -; -; mmdrv.def -; -; ReactOS Operating System -; -LIBRARY mmdrv.dll -EXPORTS -DriverProc@20 -;widMessage@20 -wodMessage@20 -;midMessage@20 -;modMessage@20 -;auxMessage@20 Propchange: trunk/reactos/dll/win32/mmdrv/mmdrv.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.rbui… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,5 +1,5 @@ <module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> - <importlibrary definition="mmdrv.def" /> + <importlibrary definition="mmdrv.spec.def" /> <include base="mmdrv">.</include> <define name="NDEBUG" /> <library>ntdll</library> @@ -13,4 +13,5 @@ <file>common.c</file> <file>wave.c</file> <file>wave_io.c</file> + <file>mmdrv.spec</file> </module> Added: trunk/reactos/dll/win32/mmdrv/mmdrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.spec… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.spec (added) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.spec [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,0 +1,6 @@ +@ stdcall DriverProc(long ptr long long long) +;@ stdcall widMessage(long long long long long) +@ stdcall wodMessage(long long long long long) +;@ stdcall midMessage(long long long long long) +;@ stdcall modMessage(long long long long long) +;@ stdcall auxMessage(long long long long long) Propchange: trunk/reactos/dll/win32/mmdrv/mmdrv.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mmdrv/mme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mme.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mme.c [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,143 +1,143 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Multimedia - * FILE: dll/win32/mmdrv/mme.c - * PURPOSE: Multimedia User Mode Driver (MME Interface) - * PROGRAMMER: Andrew Greenwood - * Aleksey Bragin - * UPDATE HISTORY: - * Jan 14, 2007: Rewritten and tidied up - */ - -#include <mmdrv.h> - -/* - Sends a message to the client (application), such as WOM_DONE. This - is just a wrapper around DriverCallback which translates the - parameters appropriately. -*/ - -BOOL -NotifyClient( - SessionInfo* session_info, - DWORD message, - DWORD parameter1, - DWORD parameter2) -{ - return DriverCallback(session_info->callback, - HIWORD(session_info->flags), - session_info->mme_handle, - message, - session_info->app_user_data, - parameter1, - parameter2); -} - - - -/* - MME Driver Entrypoint - Wave Output -*/ - -APIENTRY DWORD -wodMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - switch ( message ) - { - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p80.htm */ - case WODM_GETNUMDEVS : - DPRINT("WODM_GETNUMDEVS\n"); - return GetDeviceCount(WaveOutDevice); - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p6h.htm */ - case WODM_GETDEVCAPS : - DPRINT("WODM_GETDEVCAPS\n"); - return GetDeviceCapabilities(WaveOutDevice, - device_id, - (PVOID) parameter1, - parameter2); - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p85.htm */ - case WODM_OPEN : - { - WAVEOPENDESC* open_desc = (WAVEOPENDESC*) parameter1; - DPRINT("WODM_OPEN\n"); - - if ( parameter2 && WAVE_FORMAT_QUERY ) - return QueryWaveFormat(WaveOutDevice, open_desc->lpFormat); - else - return OpenDevice(WaveOutDevice, - device_id, - open_desc, - parameter2, - private_handle); - } - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p6g.htm */ - case WODM_CLOSE : - { - DPRINT("WODM_CLOSE\n"); - return CloseDevice(private_handle); - } - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p9w.htm */ - case WODM_WRITE : - { - DPRINT("WODM_WRITE\n"); - return WriteWaveBuffer(private_handle, - (PWAVEHDR) parameter1, - parameter2); - } - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p86.htm */ - case WODM_PAUSE : - { - DPRINT("WODM_PAUSE\n"); - return HandleBySessionThread(private_handle, message, 0); - } - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p89.htm */ - case WODM_RESTART : - { - DPRINT("WODM_RESTART\n"); - return HandleBySessionThread(private_handle, message, 0); - } - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p88.htm */ - case WODM_RESET : - { - DPRINT("WODM_RESET\n"); - return HandleBySessionThread(private_handle, message, 0); - } - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p83.htm */ -#if 0 - case WODM_GETPOS : - { - DPRINT("WODM_GETPOS\n"); - return GetPosition(private_handle, - (PMMTIME) parameter1, - parameter2); - } -#endif - - /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p6f.htm */ - case WODM_BREAKLOOP : - { - DPRINT("WODM_BREAKLOOP\n"); - return HandleBySessionThread(private_handle, message, 0); - } - - /* TODO: Others */ - } - - DPRINT("Unsupported message\n"); - return MMSYSERR_NOTSUPPORTED; -} +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: dll/win32/mmdrv/mme.c + * PURPOSE: Multimedia User Mode Driver (MME Interface) + * PROGRAMMER: Andrew Greenwood + * Aleksey Bragin + * UPDATE HISTORY: + * Jan 14, 2007: Rewritten and tidied up + */ + +#include <mmdrv.h> + +/* + Sends a message to the client (application), such as WOM_DONE. This + is just a wrapper around DriverCallback which translates the + parameters appropriately. +*/ + +BOOL +NotifyClient( + SessionInfo* session_info, + DWORD message, + DWORD parameter1, + DWORD parameter2) +{ + return DriverCallback(session_info->callback, + HIWORD(session_info->flags), + session_info->mme_handle, + message, + session_info->app_user_data, + parameter1, + parameter2); +} + + + +/* + MME Driver Entrypoint + Wave Output +*/ + +APIENTRY DWORD +wodMessage( + DWORD device_id, + DWORD message, + DWORD private_handle, + DWORD parameter1, + DWORD parameter2) +{ + switch ( message ) + { + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p80.htm */ + case WODM_GETNUMDEVS : + DPRINT("WODM_GETNUMDEVS\n"); + return GetDeviceCount(WaveOutDevice); + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p6h.htm */ + case WODM_GETDEVCAPS : + DPRINT("WODM_GETDEVCAPS\n"); + return GetDeviceCapabilities(WaveOutDevice, + device_id, + (PVOID) parameter1, + parameter2); + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p85.htm */ + case WODM_OPEN : + { + WAVEOPENDESC* open_desc = (WAVEOPENDESC*) parameter1; + DPRINT("WODM_OPEN\n"); + + if ( parameter2 && WAVE_FORMAT_QUERY ) + return QueryWaveFormat(WaveOutDevice, open_desc->lpFormat); + else + return OpenDevice(WaveOutDevice, + device_id, + open_desc, + parameter2, + private_handle); + } + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p6g.htm */ + case WODM_CLOSE : + { + DPRINT("WODM_CLOSE\n"); + return CloseDevice(private_handle); + } + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p9w.htm */ + case WODM_WRITE : + { + DPRINT("WODM_WRITE\n"); + return WriteWaveBuffer(private_handle, + (PWAVEHDR) parameter1, + parameter2); + } + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p86.htm */ + case WODM_PAUSE : + { + DPRINT("WODM_PAUSE\n"); + return HandleBySessionThread(private_handle, message, 0); + } + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p89.htm */ + case WODM_RESTART : + { + DPRINT("WODM_RESTART\n"); + return HandleBySessionThread(private_handle, message, 0); + } + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p88.htm */ + case WODM_RESET : + { + DPRINT("WODM_RESET\n"); + return HandleBySessionThread(private_handle, message, 0); + } + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p83.htm */ +#if 0 + case WODM_GETPOS : + { + DPRINT("WODM_GETPOS\n"); + return GetPosition(private_handle, + (PMMTIME) parameter1, + parameter2); + } +#endif + + /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p6f.htm */ + case WODM_BREAKLOOP : + { + DPRINT("WODM_BREAKLOOP\n"); + return HandleBySessionThread(private_handle, message, 0); + } + + /* TODO: Others */ + } + + DPRINT("Unsupported message\n"); + return MMSYSERR_NOTSUPPORTED; +} Propchange: trunk/reactos/dll/win32/mmdrv/mme.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mmdrv/mmioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmioctl.h?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmioctl.h [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,147 +1,147 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Multimedia - * FILE: dll/win32/mmdrv/mmioctl.h - * PURPOSE: Multimedia system NT4 compatibility - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Jan 13, 2007: Split from mmdrv.h - */ - -#ifndef MMDRV_IOCTLS -#define MMDRV_IOCTLS - - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <winioctl.h> - - -/* - Base names of the supported devices, as provided by drivers running in - kernel mode. - - \Device\WaveIn0 etc. -*/ - -#define WAVE_OUT_DEVICE_NAME L"\\Device\\WaveOut" -#define WAVE_IN_DEVICE_NAME L"\\Device\\WaveIn" -#define MIDI_OUT_DEVICE_NAME L"\\Device\\MidiOut" -#define MIDI_IN_DEVICE_NAME L"\\Device\\MidiIn" -#define AUX_DEVICE_NAME L"\\Device\\MMAux" - - -/* - Base IOCTL codes -*/ - -#define IOCTL_SOUND_BASE FILE_DEVICE_SOUND -#define IOCTL_WAVE_BASE 0x0000 -#define IOCTL_MIDI_BASE 0x0080 -#define IOCTL_AUX_BASE 0x0100 - - -/* - Wave IOCTLs -*/ - -#define IOCTL_WAVE_QUERY_FORMAT \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_WAVE_SET_FORMAT \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0002, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_GET_CAPABILITIES \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_WAVE_SET_STATE \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0004, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_GET_STATE \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0005, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_GET_POSITION \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0006, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_SET_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_WAVE_GET_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0008, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_WAVE_SET_PITCH \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_GET_PITCH \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000A, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_SET_PLAYBACK_RATE \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000B, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_GET_PLAYBACK_RATE \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000C, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_PLAY \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000D, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_RECORD \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000E, METHOD_OUT_DIRECT, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_BREAK_LOOP \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000F, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_WAVE_SET_LOW_PRIORITY \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0010, METHOD_BUFFERED, FILE_WRITE_ACCESS) - - -/* - MIDI IOCTLs -*/ - -#define IOCTL_MIDI_GET_CAPABILITIES \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_MIDI_SET_STATE \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0002, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_MIDI_GET_STATE \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0003, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_MIDI_SET_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_MIDI_GET_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_MIDI_PLAY \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0006, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_MIDI_RECORD \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0007, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_MIDI_CACHE_PATCHES \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0008, METHOD_BUFFERED, FILE_WRITE_ACCESS) - -#define IOCTL_MIDI_CACHE_DRUM_PATCHES \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) - - -/* - Aux IOCTLs -*/ - -#define IOCTL_AUX_GET_CAPABILITIES \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_AUX_SET_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_AUX_GET_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_SOUND_GET_CHANGED_VOLUME \ - CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) - -#endif +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: dll/win32/mmdrv/mmioctl.h + * PURPOSE: Multimedia system NT4 compatibility + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Jan 13, 2007: Split from mmdrv.h + */ + +#ifndef MMDRV_IOCTLS +#define MMDRV_IOCTLS + + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <winioctl.h> + + +/* + Base names of the supported devices, as provided by drivers running in + kernel mode. + + \Device\WaveIn0 etc. +*/ + +#define WAVE_OUT_DEVICE_NAME L"\\Device\\WaveOut" +#define WAVE_IN_DEVICE_NAME L"\\Device\\WaveIn" +#define MIDI_OUT_DEVICE_NAME L"\\Device\\MidiOut" +#define MIDI_IN_DEVICE_NAME L"\\Device\\MidiIn" +#define AUX_DEVICE_NAME L"\\Device\\MMAux" + + +/* + Base IOCTL codes +*/ + +#define IOCTL_SOUND_BASE FILE_DEVICE_SOUND +#define IOCTL_WAVE_BASE 0x0000 +#define IOCTL_MIDI_BASE 0x0080 +#define IOCTL_AUX_BASE 0x0100 + + +/* + Wave IOCTLs +*/ + +#define IOCTL_WAVE_QUERY_FORMAT \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_WAVE_SET_FORMAT \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0002, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_GET_CAPABILITIES \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_WAVE_SET_STATE \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0004, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_GET_STATE \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0005, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_GET_POSITION \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0006, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_SET_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_WAVE_GET_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0008, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_WAVE_SET_PITCH \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_GET_PITCH \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000A, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_SET_PLAYBACK_RATE \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000B, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_GET_PLAYBACK_RATE \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000C, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_PLAY \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000D, METHOD_IN_DIRECT, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_RECORD \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000E, METHOD_OUT_DIRECT, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_BREAK_LOOP \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x000F, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_WAVE_SET_LOW_PRIORITY \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_WAVE_BASE + 0x0010, METHOD_BUFFERED, FILE_WRITE_ACCESS) + + +/* + MIDI IOCTLs +*/ + +#define IOCTL_MIDI_GET_CAPABILITIES \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_MIDI_SET_STATE \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0002, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_MIDI_GET_STATE \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0003, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_MIDI_SET_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_MIDI_GET_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_MIDI_PLAY \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0006, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_MIDI_RECORD \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0007, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_MIDI_CACHE_PATCHES \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0008, METHOD_BUFFERED, FILE_WRITE_ACCESS) + +#define IOCTL_MIDI_CACHE_DRUM_PATCHES \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) + + +/* + Aux IOCTLs +*/ + +#define IOCTL_AUX_GET_CAPABILITIES \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AUX_SET_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_AUX_GET_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) + +#define IOCTL_SOUND_GET_CHANGED_VOLUME \ + CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) + +#endif Propchange: trunk/reactos/dll/win32/mmdrv/mmioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mmdrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/session.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/session.c [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,245 +1,245 @@ -/* - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Multimedia - * FILE: dll/win32/mmdrv/session.c - * PURPOSE: Multimedia User Mode Driver (session management) - * PROGRAMMER: Andrew Greenwood - * UPDATE HISTORY: - * Jan 14, 2007: Created - */ - -#include <mmdrv.h> - -/* Each session is tracked, but the list must be locked when in use */ - -SessionInfo* session_list = NULL; -CRITICAL_SECTION session_lock; - - -/* - Obtains a pointer to the session associated with a device type and ID. - If no session exists, returns NULL. This is mainly used to see if a - session already exists prior to creating a new one. -*/ - -SessionInfo* -GetSession( - DeviceType device_type, - DWORD device_id) -{ - SessionInfo* session_info; - - EnterCriticalSection(&session_lock); - session_info = session_list; - - while ( session_info ) - { - if ( ( session_info->device_type == device_type ) && - ( session_info->device_id == device_id ) ) - { - LeaveCriticalSection(&session_lock); - return session_info; - } - - session_info = session_info->next; - } - - LeaveCriticalSection(&session_lock); - return NULL; -} - - -/* - Creates a new session, associated with the specified device type and ID. - Whilst the session list is locked, this also checks to see if an existing - session is associated with the device. -*/ - -MMRESULT -CreateSession( - DeviceType device_type, - DWORD device_id, - SessionInfo** session_info) -{ - HANDLE heap = GetProcessHeap(); - - ASSERT(session_info); - - EnterCriticalSection(&session_lock); - - /* Ensure we're not creating a duplicate session */ - - if ( GetSession(device_type, device_id) ) - { - DPRINT("Already allocated session\n"); - LeaveCriticalSection(&session_lock); - return MMSYSERR_ALLOCATED; - } - - *session_info = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(SessionInfo)); - - if ( ! *session_info ) - { - DPRINT("Failed to allocate mem for session info\n"); - LeaveCriticalSection(&session_lock); - return MMSYSERR_NOMEM; - } - - (*session_info)->device_type = device_type; - (*session_info)->device_id = device_id; - - /* Add to the list */ - - (*session_info)->next = session_list; - session_list = *session_info; - - LeaveCriticalSection(&session_lock); - - return MMSYSERR_NOERROR; -} - - -/* - Removes a session from the list and destroys it. This function does NOT - perform any additional cleanup. Think of it as a slightly more advanced - free() -*/ - -VOID -DestroySession(SessionInfo* session) -{ - HANDLE heap = GetProcessHeap(); - SessionInfo* session_node; - SessionInfo* session_prev; - - /* TODO: More cleanup stuff */ - - /* Remove from the list */ - - EnterCriticalSection(&session_lock); - - session_node = session_list; - session_prev = NULL; - - while ( session_node ) - { - if ( session_node == session ) - { - /* Bridge the gap for when we go */ - session_prev->next = session->next; - break; - } - - /* Save the previous node, fetch the next */ - session_prev = session_node; - session_node = session_node->next; - } - - LeaveCriticalSection(&session_lock); - - HeapFree(heap, 0, session); -} - - -/* - Allocates events and other resources for the session thread, starts it, - and waits for it to announce that it is ready to work for us. -*/ - -MMRESULT -StartSessionThread(SessionInfo* session_info) -{ - LPTASKCALLBACK task; - MMRESULT result; - - ASSERT(session_info); - - /* This is our "ready" event, sent when the thread is idle */ - - session_info->thread.ready_event = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! session_info->thread.ready_event ) - { - DPRINT("Couldn't create thread_ready event\n"); - return MMSYSERR_NOMEM; - } - - /* This is our "go" event, sent when we want the thread to do something */ - - session_info->thread.go_event = CreateEvent(NULL, FALSE, FALSE, NULL); - - if ( ! session_info->thread.go_event ) - { - DPRINT("Couldn't create thread_go event\n"); - CloseHandle(session_info->thread.ready_event); - return MMSYSERR_NOMEM; - } - - /* TODO - other kinds of devices need attention, too */ - task = ( session_info->device_type == WaveOutDevice ) - ? (LPTASKCALLBACK) WaveThread : NULL; - - ASSERT(task); - - /* Effectively, this is a beefed-up CreateThread */ - - result = mmTaskCreate(task, - &session_info->thread.handle, - (DWORD) session_info); - - if ( result != MMSYSERR_NOERROR ) - { - DPRINT("Task creation failed\n"); - CloseHandle(session_info->thread.ready_event); - CloseHandle(session_info->thread.go_event); - return result; - } - - /* Wait for the thread to be ready before completing */ - - WaitForSingleObject(session_info->thread.ready_event, INFINITE); - - return MMSYSERR_NOERROR; -} - - -/* - The session thread is pretty simple. Upon creation, it announces that it - is ready to do stuff for us. When we want it to perform an action, we use - CallSessionThread with an appropriate function and parameter, then tell - the thread we want it to do something. When it's finished, it announces - that it is ready once again. -*/ - -MMRESULT -CallSessionThread( - SessionInfo* session_info, - ThreadFunction function, - PVOID thread_parameter) -{ - ASSERT(session_info); - - session_info->thread.function = function; - session_info->thread.parameter = thread_parameter; - - DPRINT("Calling session thread\n"); - SetEvent(session_info->thread.go_event); - - DPRINT("Waiting for thread response\n"); - WaitForSingleObject(session_info->thread.ready_event, INFINITE); - - return session_info->thread.result; -} - - -DWORD -HandleBySessionThread( - DWORD private_handle, - DWORD message, - DWORD parameter) -{ - return CallSessionThread((SessionInfo*) private_handle, - message, - (PVOID) parameter); -} +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Multimedia + * FILE: dll/win32/mmdrv/session.c + * PURPOSE: Multimedia User Mode Driver (session management) + * PROGRAMMER: Andrew Greenwood + * UPDATE HISTORY: + * Jan 14, 2007: Created + */ + +#include <mmdrv.h> + +/* Each session is tracked, but the list must be locked when in use */ + +SessionInfo* session_list = NULL; +CRITICAL_SECTION session_lock; + + +/* + Obtains a pointer to the session associated with a device type and ID. + If no session exists, returns NULL. This is mainly used to see if a + session already exists prior to creating a new one. +*/ + +SessionInfo* +GetSession( + DeviceType device_type, + DWORD device_id) +{ + SessionInfo* session_info; + + EnterCriticalSection(&session_lock); + session_info = session_list; + + while ( session_info ) + { + if ( ( session_info->device_type == device_type ) && + ( session_info->device_id == device_id ) ) + { + LeaveCriticalSection(&session_lock); + return session_info; + } + + session_info = session_info->next; + } + + LeaveCriticalSection(&session_lock); + return NULL; +} + + +/* + Creates a new session, associated with the specified device type and ID. + Whilst the session list is locked, this also checks to see if an existing + session is associated with the device. +*/ + +MMRESULT +CreateSession( + DeviceType device_type, + DWORD device_id, + SessionInfo** session_info) +{ + HANDLE heap = GetProcessHeap(); + + ASSERT(session_info); + + EnterCriticalSection(&session_lock); + + /* Ensure we're not creating a duplicate session */ + + if ( GetSession(device_type, device_id) ) + { + DPRINT("Already allocated session\n"); + LeaveCriticalSection(&session_lock); + return MMSYSERR_ALLOCATED; + } + + *session_info = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(SessionInfo)); + + if ( ! *session_info ) + { + DPRINT("Failed to allocate mem for session info\n"); + LeaveCriticalSection(&session_lock); + return MMSYSERR_NOMEM; + } + + (*session_info)->device_type = device_type; + (*session_info)->device_id = device_id; + + /* Add to the list */ + + (*session_info)->next = session_list; + session_list = *session_info; + + LeaveCriticalSection(&session_lock); + + return MMSYSERR_NOERROR; +} + + +/* + Removes a session from the list and destroys it. This function does NOT + perform any additional cleanup. Think of it as a slightly more advanced + free() +*/ + +VOID +DestroySession(SessionInfo* session) +{ + HANDLE heap = GetProcessHeap(); + SessionInfo* session_node; + SessionInfo* session_prev; + + /* TODO: More cleanup stuff */ + + /* Remove from the list */ + + EnterCriticalSection(&session_lock); + + session_node = session_list; + session_prev = NULL; + + while ( session_node ) + { + if ( session_node == session ) + { + /* Bridge the gap for when we go */ + session_prev->next = session->next; + break; + } + + /* Save the previous node, fetch the next */ + session_prev = session_node; + session_node = session_node->next; + } + + LeaveCriticalSection(&session_lock); + + HeapFree(heap, 0, session); +} + + +/* + Allocates events and other resources for the session thread, starts it, + and waits for it to announce that it is ready to work for us. +*/ + +MMRESULT +StartSessionThread(SessionInfo* session_info) +{ + LPTASKCALLBACK task; + MMRESULT result; + + ASSERT(session_info); + + /* This is our "ready" event, sent when the thread is idle */ + + session_info->thread.ready_event = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! session_info->thread.ready_event ) + { + DPRINT("Couldn't create thread_ready event\n"); + return MMSYSERR_NOMEM; + } + + /* This is our "go" event, sent when we want the thread to do something */ + + session_info->thread.go_event = CreateEvent(NULL, FALSE, FALSE, NULL); + + if ( ! session_info->thread.go_event ) + { + DPRINT("Couldn't create thread_go event\n"); + CloseHandle(session_info->thread.ready_event); + return MMSYSERR_NOMEM; + } + + /* TODO - other kinds of devices need attention, too */ + task = ( session_info->device_type == WaveOutDevice ) + ? (LPTASKCALLBACK) WaveThread : NULL; + + ASSERT(task); + + /* Effectively, this is a beefed-up CreateThread */ + + result = mmTaskCreate(task, + &session_info->thread.handle, + (DWORD) session_info); + + if ( result != MMSYSERR_NOERROR ) + { + DPRINT("Task creation failed\n"); + CloseHandle(session_info->thread.ready_event); + CloseHandle(session_info->thread.go_event); + return result; + } + + /* Wait for the thread to be ready before completing */ + + WaitForSingleObject(session_info->thread.ready_event, INFINITE); + + return MMSYSERR_NOERROR; +} + + +/* + The session thread is pretty simple. Upon creation, it announces that it + is ready to do stuff for us. When we want it to perform an action, we use + CallSessionThread with an appropriate function and parameter, then tell + the thread we want it to do something. When it's finished, it announces + that it is ready once again. +*/ + +MMRESULT +CallSessionThread( + SessionInfo* session_info, + ThreadFunction function, + PVOID thread_parameter) +{ + ASSERT(session_info); + + session_info->thread.function = function; + session_info->thread.parameter = thread_parameter; + + DPRINT("Calling session thread\n"); + SetEvent(session_info->thread.go_event); + + DPRINT("Waiting for thread response\n"); + WaitForSingleObject(session_info->thread.ready_event, INFINITE); + + return session_info->thread.result; +} + + +DWORD +HandleBySessionThread( + DWORD private_handle, + DWORD message, + DWORD parameter) +{ + return CallSessionThread((SessionInfo*) private_handle, + message, + (PVOID) parameter); +} Propchange: trunk/reactos/dll/win32/mmdrv/session.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/mmdrv/utils.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/win32/mmdrv/wave.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/win32/mmdrv/wave.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/win32/mmdrv/wave_io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave_io.c?… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/wave_io.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/wave_io.c [iso-8859-1] Sat Aug 9 03:09:40 2008 @@ -1,40 +1,40 @@ -/* - Don't use this. -*/ - -#include <mmdrv.h> - -/* - Complete a partial wave buffer transaction -*/ - -void -CompleteWaveOverlap( - DWORD error_code, - DWORD bytes_transferred, - LPOVERLAPPED overlapped) -{ - DPRINT("Complete partial wave overlap\n"); -} - -/* - Helper function to set up loops -*/ - -VOID -UpdateWaveLoop(SessionInfo* session_info) -{ -} - - -/* - The hub of all wave I/O. This ensures a constant stream of buffers are - passed between the land of usermode and kernelmode. -*/ - -VOID -PerformWaveIO( - SessionInfo* session_info) -{ - -} +/* + Don't use this. +*/ + +#include <mmdrv.h> + +/* + Complete a partial wave buffer transaction +*/ + +void +CompleteWaveOverlap( + DWORD error_code, + DWORD bytes_transferred, + LPOVERLAPPED overlapped) +{ + DPRINT("Complete partial wave overlap\n"); +} + +/* + Helper function to set up loops +*/ + +VOID +UpdateWaveLoop(SessionInfo* session_info) +{ +} + + +/* + The hub of all wave I/O. This ensures a constant stream of buffers are + passed between the land of usermode and kernelmode. +*/ + +VOID +PerformWaveIO( + SessionInfo* session_info) +{ + +} Propchange: trunk/reactos/dll/win32/mmdrv/wave_io.c ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[hpoussin] 35208: Fix exports

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 02:57:02 2008 New Revision: 35208 URL: http://svn.reactos.org/svn/reactos?rev=35208&view=rev Log: Fix exports Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.def trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbga/kbdbga.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbga/kbdbga.def [iso-8859-1] Sat Aug 9 02:57:02 2008 @@ -4,5 +4,5 @@ LIBRARY kbdbga.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF Modified: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.def [iso-8859-1] Sat Aug 9 02:57:02 2008 @@ -4,5 +4,5 @@ LIBRARY kbdbgm.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.def [iso-8859-1] Sat Aug 9 02:57:02 2008 @@ -4,5 +4,5 @@ LIBRARY kbdbgt.dll EXPORTS -KbdLayerDescriptor +KbdLayerDescriptor@0 ;EOF

16 years, 2 months

[hpoussin] 35207: Replace .def file by a .spec file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 02:56:27 2008 New Revision: 35207 URL: http://svn.reactos.org/svn/reactos?rev=35207&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/cpl/mmsys/mmsys.spec (with props) Removed: trunk/reactos/dll/cpl/mmsys/mmsys.def Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c (contents, props changed) trunk/reactos/dll/cpl/mmsys/mmsys.h (props changed) trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rc (props changed) trunk/reactos/dll/cpl/mmsys/resource.h (props changed) trunk/reactos/dll/cpl/mmsys/sounds.c (props changed) trunk/reactos/dll/cpl/mmsys/volume.c (props changed) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sat Aug 9 02:56:27 2008 @@ -76,7 +76,7 @@ VOID WINAPI ShowDriverSettingsAfterForkA(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("ShowDriverSettingsAfterForkA() stubs\n"); @@ -85,7 +85,7 @@ VOID WINAPI ShowDriverSettingsAfterFork(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("ShowDriverSettingsAfterFork() stubs\n"); @@ -93,9 +93,9 @@ BOOL WINAPI ShowMMCPLPropertySheet(HWND hwnd, - LPCTSTR pszPropSheet, - LPTSTR pszName, - LPTSTR pszCaption) + LPCSTR pszPropSheet, + LPSTR pszName, + LPSTR pszCaption) { DPRINT1("ShowMMCPLPropertySheet() stubs\n"); return TRUE; @@ -122,7 +122,7 @@ VOID WINAPI mmseRunOnceA(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("mmseRunOnceA() stubs\n"); @@ -149,7 +149,7 @@ VOID WINAPI ShowFullControlPanel(HWND hwnd, HINSTANCE hInstance, - LPTSTR lpszCmd, + LPSTR lpszCmd, int nCmdShow) { DPRINT1("ShowFullControlPanel() stubs\n"); Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Removed: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def (removed) @@ -1,20 +1,0 @@ -LIBRARY mmsys.cpl - -EXPORTS -CPlApplet@16 -mmseRunOnce -mmseRunOnceW -mmseRunOnceA -ShowMMCPLPropertySheet -ShowAudioPropertySheet -DllCanUnloadNow -DllGetClassObject -ShowDriverSettingsAfterFork -ShowDriverSettingsAfterForkW -ShowDriverSettingsAfterForkA -MediaClassInstaller@12 -MediaPropPageProvider -;Multichannel -ShowFullControlPanel - -; EOF Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] Sat Aug 9 02:56:27 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="mmsys" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MMSYS}" installbase="system32" installname="mmsys.cpl" unicode="yes"> - <importlibrary definition="mmsys.def" /> + <importlibrary definition="mmsys.spec.def" /> <include base="mmsys">.</include> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> @@ -21,4 +21,5 @@ <file>audio.c</file> <file>voice.c</file> <file>mmsys.rc</file> + <file>mmsys.spec</file> </module> Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Added: trunk/reactos/dll/cpl/mmsys/mmsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.spec?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.spec (added) +++ trunk/reactos/dll/cpl/mmsys/mmsys.spec [iso-8859-1] Sat Aug 9 02:56:27 2008 @@ -1,0 +1,15 @@ +@ stdcall CPlApplet(ptr long ptr ptr) +@ stdcall mmseRunOnce(ptr ptr str long) +@ stdcall mmseRunOnceW(ptr ptr wstr long) +@ stdcall mmseRunOnceA(ptr ptr str long) +@ stdcall ShowMMCPLPropertySheet(ptr str str str) +@ stdcall ShowAudioPropertySheet(ptr ptr str long) +@ stdcall DllCanUnloadNow() +@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall ShowDriverSettingsAfterFork(ptr ptr str long) +@ stdcall ShowDriverSettingsAfterForkW(ptr ptr wstr long) +@ stdcall ShowDriverSettingsAfterForkA(ptr ptr str long) +@ stdcall MediaClassInstaller(long ptr ptr) +@ stdcall MediaPropPageProvider(ptr ptr ptr) +;Multichannel +@ stdcall ShowFullControlPanel(ptr ptr str long) Propchange: trunk/reactos/dll/cpl/mmsys/mmsys.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/mmsys/resource.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Propchange: trunk/reactos/dll/cpl/mmsys/sounds.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision Propchange: trunk/reactos/dll/cpl/mmsys/volume.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date revision

16 years, 2 months

[hpoussin] 35206: Replace .def file by a .spec file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 02:55:45 2008 New Revision: 35206 URL: http://svn.reactos.org/svn/reactos?rev=35206&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/dll/win32/lpk/lpk.spec (with props) Removed: trunk/reactos/dll/win32/lpk/lpk.def Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild Removed: trunk/reactos/dll/win32/lpk/lpk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.def?rev=… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.def (removed) @@ -1,20 +1,0 @@ -; $Id: gdi32.def 33598 2008-05-19 10:20:39Z greatlrd $ -; -; lpk.def -; -; ReactOS Operating System -; -LIBRARY lpk.dll -EXPORTS -LpkInitialize@4 -LpkTabbedTextOut@48 -LpkDllInitialize@12 -LpkDrawTextEx@40 -LpkEditControl@0 -LpkExtTextOut@36 -LpkGetCharacterPlacement@28 -LpkGetTextExtentExPoint@36 -LpkPSMTextOut@24 -LpkUseGDIWidthCache@20 -ftsWordBreak@20 - Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] Sat Aug 9 02:55:45 2008 @@ -1,5 +1,5 @@ <module name="lpk" type="win32dll" baseaddress="${BASEADDRESS_LPK}" installbase="system32" installname="lpk.dll" unicode="yes"> - <importlibrary definition="lpk.def" /> + <importlibrary definition="lpk.spec.def" /> <include base="lpk">include</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> @@ -14,4 +14,5 @@ <file>stub.c</file> <file>lpk.rc</file> + <file>lpk.spec</file> </module> Added: trunk/reactos/dll/win32/lpk/lpk.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.spec (added) +++ trunk/reactos/dll/win32/lpk/lpk.spec [iso-8859-1] Sat Aug 9 02:55:45 2008 @@ -1,0 +1,11 @@ +@ stdcall LpkInitialize(long) +@ stdcall LpkTabbedTextOut(long long long long long long long long long long long long) +@ stdcall LpkDllInitialize(ptr long ptr) +@ stdcall LpkDrawTextEx(long long long long long long long long long long) +@ extern LpkEditControl +@ stdcall LpkExtTextOut(long long long long long long long long long) +@ stdcall LpkGetCharacterPlacement(long long long long long long long) +@ stdcall LpkGetTextExtentExPoint(long long long long long long long long long) +@ stdcall LpkPSMTextOut(long long long long long long) +@ stdcall LpkUseGDIWidthCache(long long long long long) +@ stdcall ftsWordBreak(long long long long long) Propchange: trunk/reactos/dll/win32/lpk/lpk.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[hpoussin] 35205: Replace .def file by a .spec file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 9 02:01:23 2008 New Revision: 35205 URL: http://svn.reactos.org/svn/reactos?rev=35205&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/drivers/video/videoprt/videoprt.spec (with props) Removed: trunk/reactos/drivers/video/videoprt/videoprt.def Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild Removed: trunk/reactos/drivers/video/videoprt/videoprt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.def [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.def (removed) @@ -1,118 +1,0 @@ -; -; videoprt.def - export definition file for ReactOS -; -EXPORTS -VideoPortAcquireDeviceLock@4 -VideoPortAcquireSpinLock@12 -VideoPortAcquireSpinLockAtDpcLevel@8 -VideoPortAllocateBuffer@12 -VideoPortAllocateCommonBuffer@24 -VideoPortAllocateContiguousMemory -VideoPortAllocatePool@16 -;VideoPortAssociateEventsWithDmaHandle -VideoPortCheckForDeviceExistence@28 -VideoPortClearEvent@8 -VideoPortCompareMemory(a)12=NTOSKRNL.RtlCompareMemory -;VideoPortCompleteDma -VideoPortCreateEvent@16 -VideoPortCreateSecondaryDisplay@12 -VideoPortCreateSpinLock@8 -VideoPortDDCMonitorHelper@16 -VideoPortDebugPrint -VideoPortDeleteEvent@8 -VideoPortDeleteSpinLock@8 -VideoPortDisableInterrupt@4 -;VideoPortDoDma -VideoPortEnableInterrupt@4 -VideoPortEnumerateChildren@8 -;VideoPortFlushRegistry -VideoPortFreeCommonBuffer -VideoPortFreeDeviceBase@8 -VideoPortFreePool@8 -VideoPortGetAccessRanges@32 -VideoPortGetAgpServices@8 -VideoPortGetAssociatedDeviceExtension@4 -;VideoPortGetAssociatedDeviceID -VideoPortGetBusData@24 -;VideoPortGetBytesUsed -;VideoPortGetCommonBuffer -VideoPortGetCurrentIrql@0 -VideoPortGetDeviceBase@20 -VideoPortGetDeviceData@16 -VideoPortGetDmaAdapter@8 -;VideoPortGetDmaContext -;VideoPortGetMdl -VideoPortGetRegistryParameters@20 -VideoPortGetRomImage@16 -VideoPortGetVersion@8 -VideoPortGetVgaStatus@8 -VideoPortInitialize@16 -VideoPortInt10@8 -VideoPortInterlockedDecrement(a)4=NTOSKRNL.InterlockedDecrement -VideoPortInterlockedExchange(a)8=NTOSKRNL.InterlockedExchange -VideoPortInterlockedIncrement(a)4=NTOSKRNL.InterlockedIncrement -VideoPortLockBuffer@16 -;VideoPortLockPages -VideoPortLogError@16 -VideoPortMapBankedMemory@40 -;VideoPortMapDmaMemory -VideoPortMapMemory@24 -VideoPortMoveMemory(a)12=NTOSKRNL.RtlMoveMemory -VideoPortPutDmaAdapter@8 -VideoPortQueryPerformanceCounter@8 -VideoPortQueryServices@12 -VideoPortQuerySystemTime(a)4=NTOSKRNL.KeQuerySystemTime -VideoPortQueueDpc@12 -VideoPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR -VideoPortReadPortUshort(a)4=HAL.READ_PORT_USHORT -VideoPortReadPortUlong(a)4=HAL.READ_PORT_ULONG -VideoPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR -VideoPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT -VideoPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG -VideoPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR -VideoPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT -VideoPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG -VideoPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -VideoPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -VideoPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -;VideoPortReadStateEvent -VideoPortRegisterBugcheckCallback@16 -VideoPortReleaseBuffer@8 -VideoPortReleaseCommonBuffer@28 -VideoPortReleaseDeviceLock@4 -VideoPortReleaseSpinLock@12 -VideoPortReleaseSpinLockFromDpcLevel@8 -VideoPortScanRom@16 -VideoPortSetBusData@24 -;VideoPortSetBytesUsed -;VideoPortSetDmaContext -VideoPortSetEvent@8 -VideoPortSetRegistryParameters@16 -VideoPortSetTrappedEmulatorPorts@12 -;VideoPortSignalDmaComplete -VideoPortStallExecution(a)4=HAL.KeStallExecutionProcessor -;VideoPortStartDma -VideoPortStartTimer@4 -VideoPortStopTimer@4 -VideoPortSynchronizeExecution@16 -VideoPortUnlockBuffer@8 -;VideoPortUnlockPages -;VideoPortUnmapDmaMemory -VideoPortUnmapMemory@12 -VideoPortVerifyAccessRanges@12 -VideoPortWaitForSingleObject@12 -VideoPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR -VideoPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT -VideoPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG -VideoPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR -VideoPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT -VideoPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG -VideoPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR -VideoPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT -VideoPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG -VideoPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -VideoPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -VideoPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -VideoPortZeroMemory(a)8=NTOSKRNL.RtlZeroMemory -VideoPortZeroDeviceMemory(a)8=NTOSKRNL.RtlZeroMemory -VpNotifyEaData@8 Modified: trunk/reactos/drivers/video/videoprt/videoprt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.rbuild [iso-8859-1] Sat Aug 9 02:01:23 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys"> - <importlibrary definition="videoprt.def" /> + <importlibrary definition="videoprt.spec.def" /> <include base="videoprt">.</include> <include base="ntoskrnl">include</include> <define name="_VIDEOPORT_" /> @@ -22,4 +22,5 @@ <file>timer.c</file> <file>videoprt.c</file> <file>videoprt.rc</file> + <file>videoprt.spec</file> </module> Added: trunk/reactos/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.spec (added) +++ trunk/reactos/drivers/video/videoprt/videoprt.spec [iso-8859-1] Sat Aug 9 02:01:23 2008 @@ -1,0 +1,114 @@ +@ stdcall VideoPortAcquireDeviceLock(ptr) +@ stdcall VideoPortAcquireSpinLock(ptr ptr ptr) +@ stdcall VideoPortAcquireSpinLockAtDpcLevel(ptr ptr) +@ stdcall VideoPortAllocateBuffer(ptr long ptr) +@ stdcall VideoPortAllocateCommonBuffer(ptr ptr long ptr long ptr) +@ stdcall VideoPortAllocateContiguousMemory(ptr long long long) +@ stdcall VideoPortAllocatePool(ptr long long long) +;VideoPortAssociateEventsWithDmaHandle +@ stdcall VideoPortCheckForDeviceExistence(ptr long long long long long long) +@ stdcall VideoPortClearEvent(ptr ptr) +@ stdcall VideoPortCompareMemory(ptr ptr long) NTOSKRNL.RtlCompareMemory +;VideoPortCompleteDma +@ stdcall VideoPortCreateEvent(ptr long ptr ptr) +@ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) +@ stdcall VideoPortCreateSpinLock(ptr ptr) +@ stdcall VideoPortDDCMonitorHelper(ptr ptr ptr long) +@ cdecl VideoPortDebugPrint(long ptr) +@ stdcall VideoPortDeleteEvent(ptr ptr) +@ stdcall VideoPortDeleteSpinLock(ptr ptr) +@ stdcall VideoPortDisableInterrupt(ptr) +;VideoPortDoDma +@ stdcall VideoPortEnableInterrupt(ptr) +@ stdcall VideoPortEnumerateChildren(ptr ptr) +;VideoPortFlushRegistry +@ stdcall VideoPortFreeCommonBuffer(ptr long ptr long long long) +@ stdcall VideoPortFreeDeviceBase(ptr ptr) +@ stdcall VideoPortFreePool(ptr ptr) +@ stdcall VideoPortGetAccessRanges(ptr long ptr long ptr ptr ptr ptr) +@ stdcall VideoPortGetAgpServices(ptr ptr) +@ stdcall VideoPortGetAssociatedDeviceExtension(ptr) +;VideoPortGetAssociatedDeviceID +@ stdcall VideoPortGetBusData(ptr long long ptr long long) +;VideoPortGetBytesUsed +;VideoPortGetCommonBuffer +@ stdcall VideoPortGetCurrentIrql() +@ stdcall VideoPortGetDeviceBase(ptr long long long long) +@ stdcall VideoPortGetDeviceData(ptr long ptr ptr) +@ stdcall VideoPortGetDmaAdapter(ptr ptr) +;VideoPortGetDmaContext +;VideoPortGetMdl +@ stdcall VideoPortGetRegistryParameters(ptr wstr long ptr ptr) +@ stdcall VideoPortGetRomImage(ptr ptr long long) +@ stdcall VideoPortGetVersion(ptr ptr) +@ stdcall VideoPortGetVgaStatus(ptr ptr) +@ stdcall VideoPortInitialize(ptr ptr ptr ptr) +@ stdcall VideoPortInt10(ptr ptr) +@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ stdcall VideoPortLockBuffer(ptr ptr long long) +;VideoPortLockPages +@ stdcall VideoPortLogError(ptr ptr long long) +@ stdcall VideoPortMapBankedMemory(ptr long long ptr ptr ptr long long ptr ptr) +;VideoPortMapDmaMemory +@ stdcall VideoPortMapMemory(ptr long long ptr ptr ptr) +@ stdcall VideoPortMoveMemory(ptr ptr long) NTOSKRNL.RtlMoveMemory +@ stdcall VideoPortPutDmaAdapter(ptr ptr) +@ stdcall VideoPortQueryPerformanceCounter(ptr ptr) +@ stdcall VideoPortQueryServices(ptr long ptr) +@ stdcall VideoPortQuerySystemTime(ptr) NTOSKRNL.KeQuerySystemTime +@ stdcall VideoPortQueueDpc(ptr ptr ptr) +@ stdcall VideoPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall VideoPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall VideoPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall VideoPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall VideoPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall VideoPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall VideoPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall VideoPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall VideoPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall VideoPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall VideoPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall VideoPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +;VideoPortReadStateEvent +@ stdcall VideoPortRegisterBugcheckCallback(ptr long ptr long) +@ stdcall VideoPortReleaseBuffer(ptr ptr) +@ stdcall VideoPortReleaseCommonBuffer(ptr ptr long long long ptr long) +@ stdcall VideoPortReleaseDeviceLock(ptr) +@ stdcall VideoPortReleaseSpinLock(ptr ptr long) +@ stdcall VideoPortReleaseSpinLockFromDpcLevel(ptr ptr) +@ stdcall VideoPortScanRom(ptr ptr long ptr) +@ stdcall VideoPortSetBusData(ptr long long ptr long long) +;VideoPortSetBytesUsed +;VideoPortSetDmaContext +@ stdcall VideoPortSetEvent(ptr ptr) +@ stdcall VideoPortSetRegistryParameters(ptr wstr ptr long) +@ stdcall VideoPortSetTrappedEmulatorPorts(ptr long ptr) +;VideoPortSignalDmaComplete +@ stdcall VideoPortStallExecution(ptr) HAL.KeStallExecutionProcessor +;VideoPortStartDma +@ stdcall VideoPortStartTimer(ptr) +@ stdcall VideoPortStopTimer(ptr) +@ stdcall VideoPortSynchronizeExecution(ptr long ptr ptr) +@ stdcall VideoPortUnlockBuffer(ptr ptr) +;VideoPortUnlockPages +;VideoPortUnmapDmaMemory +@ stdcall VideoPortUnmapMemory(ptr ptr ptr) +@ stdcall VideoPortVerifyAccessRanges(ptr long ptr) +@ stdcall VideoPortWaitForSingleObject(ptr ptr ptr) +@ stdcall VideoPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall VideoPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall VideoPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall VideoPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall VideoPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall VideoPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall VideoPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall VideoPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall VideoPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall VideoPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall VideoPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall VideoPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall VideoPortZeroMemory(ptr long) NTOSKRNL.RtlZeroMemory +@ stdcall VideoPortZeroDeviceMemory(ptr long) NTOSKRNL.RtlZeroMemory +@ stdcall VpNotifyEaData(ptr ptr) Propchange: trunk/reactos/drivers/video/videoprt/videoprt.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

[janderwald] 35204: - add 2 resource strings - rewrite recyclebin item handling - partly implement recycle bin item context menu - rewrite Trash_CanTrashFile to support volume serial numbers - recycle bin shows now correct deleted file details for files

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 8 20:48:18 2008 New Revision: 35204 URL: http://svn.reactos.org/svn/reactos?rev=35204&view=rev Log: - add 2 resource strings - rewrite recyclebin item handling - partly implement recycle bin item context menu - rewrite Trash_CanTrashFile to support volume serial numbers - recycle bin shows now correct deleted file details for files Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -625,6 +625,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Ñúçäàâàíåòî íà íîâà ïàïêà å íåâúçìîæíî: íåäîñòàòú÷íè ïðàâà." IDS_CREATEFOLDER_CAPTION "Ãðåøêà ïðè ñúçäàâàíå íà íîâà ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nelze vytvoøit novou sloku, protoe pøístup byl odepøen." IDS_CREATEFOLDER_CAPTION "Chyba pøi pokusu vytvoøit nový adresáø" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -625,6 +625,8 @@ IDS_COPY "Kopieren" IDS_DELETE "Löschen" IDS_PROPERTIES "Eigenschaften" + IDS_CUT "Ausschneiden" + IDS_RESTORE "Wiederherstellen" IDS_CREATEFOLDER_DENIED "Es konnte kein neues Verzeichnis erstellt werden: Zugriff verweigert." IDS_CREATEFOLDER_CAPTION "Es trat ein Fehler beim Erstellen eines neuen Verzeichnisses auf." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Äåí Þôáí äõíáôÞ ç äçìéïõñãßá ôïõ öáêÝëïõ: Äåí åðéôñÝðåôáé ç ðñüóâáóç." IDS_CREATEFOLDER_CAPTION "ÓöÜëìá êáôÜ ôçí äçìéïõñãßá íÝïõ öáêÝëïõ" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -606,7 +606,6 @@ IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" - /* special folders */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "My Computer" @@ -624,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "No se puede crear nueva carpeta: Permiso denegado." IDS_CREATEFOLDER_CAPTION "Error durante la creación de una nueva carpeta" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivät riitä." IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -626,6 +626,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -625,6 +625,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nem hozható létre új mappa: Nincs hozzá engedélyed." IDS_CREATEFOLDER_CAPTION "Hiba a mappa létrehozásakor" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -623,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Vµ¢tH_ðì¬Å«Ü¹ñÅµ½: ANZX ª èÜ¹ñB" IDS_CREATEFOLDER_CAPTION "Vµ¢tH_Ìì¬ÉG[ª¶µÜµ½" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -601,6 +601,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -628,6 +628,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nie mogê utworzyæ nowego katalogu: Brak dostêpu." IDS_CREATEFOLDER_CAPTION "B³¹d przy tworzeniu nowego katalogu." Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Não pode criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -624,6 +624,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Não é possível criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -621,6 +621,8 @@ IDS_COPY "Êîïèðîâàòü" IDS_DELETE "Óäàëèòü" IDS_PROPERTIES "Ñâîéñòâà" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -628,6 +628,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Nie je moné vytvori nový prieèinok: Prístup zamietnutý." IDS_CREATEFOLDER_CAPTION "Chyba poèas vytvárania nového prieèinka" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -622,6 +622,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Yeni dizin oluþturulamýyor: Eriþim engellendi." IDS_CREATEFOLDER_CAPTION "Dizin oluþturma sýrasýnda hata" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -623,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -611,6 +611,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -623,6 +623,8 @@ IDS_COPY "Copy" IDS_DELETE "Delete" IDS_PROPERTIES "Properties" + IDS_CUT "Cut" + IDS_RESTORE "Restore" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -135,6 +135,16 @@ WCHAR szName[1]; }PIDLPrinterStruct; +typedef struct tagPIDLRecycleStruct +{ + FILETIME LastModification; + FILETIME DeletionTime; + ULARGE_INTEGER FileSize; + ULARGE_INTEGER PhysicalFileSize; + DWORD Attributes; + WCHAR szName[1]; +}PIDLRecycleStruct; + typedef struct tagGUIDStruct { BYTE dummy; /* offset 01 is unknown */ @@ -195,9 +205,10 @@ CHAR szName[1]; /*06*/ /* terminated by 0x00 0x00 */ } htmlhelp; struct tagPIDLCPanelStruct cpanel; - struct tagValueW valueW; + struct tagValueW valueW; struct tagPIDLFontStruct cfont; struct tagPIDLPrinterStruct cprinter; + struct tagPIDLRecycleStruct crecycle; }u; } PIDLDATA, *LPPIDLDATA; #include "poppack.h" Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -77,13 +77,13 @@ #define COLUMNS_COUNT 6 -static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME ft) +static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME * ft) { FILETIME lft; SYSTEMTIME time; int ret; - FileTimeToLocalFileTime(&ft, &lft); + FileTimeToLocalFileTime(ft, &lft); FileTimeToSystemTime(&lft, &time); ret = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, buffer, size); @@ -105,8 +105,8 @@ { const IShellFolder2Vtbl *lpVtbl; const IPersistFolder2Vtbl *lpPersistFolderVtbl; - const IContextMenuVtbl *lpCmt; - const IShellExtInitVtbl *lpSEI; + const IContextMenu2Vtbl *lpContextMenu2; + const IShellExtInitVtbl *lpSEI; LONG refCount; INT iIdOpen; @@ -114,16 +114,18 @@ INT iIdProperties; LPITEMIDLIST pidl; + LPCITEMIDLIST apidl; } RecycleBin; -static const IContextMenuVtbl recycleBincmVtbl; +static const IContextMenu2Vtbl recycleBincmVtblFolder; +static const IContextMenu2Vtbl recycleBincmVtblBitbucketItem; static const IShellFolder2Vtbl recycleBinVtbl; static const IPersistFolder2Vtbl recycleBinPersistVtbl; static const IShellExtInitVtbl eivt; -static RecycleBin *impl_from_IContextMenu(IContextMenu *iface) -{ - return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpCmt)); +static RecycleBin *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpContextMenu2)); } static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface) @@ -150,9 +152,9 @@ return E_OUTOFMEMORY; ZeroMemory(obj, sizeof(RecycleBin)); obj->lpVtbl = &recycleBinVtbl; - obj->lpSEI = &eivt; + obj->lpSEI = &eivt; obj->lpPersistFolderVtbl = &recycleBinPersistVtbl; - obj->lpCmt = &recycleBincmVtbl; + obj->lpContextMenu2 = NULL; if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput))) { RecycleBin_Destructor(obj); @@ -183,9 +185,11 @@ || IsEqualGUID(riid, &IID_IPersistFolder2)) *ppvObject = &This->lpPersistFolderVtbl; - if (IsEqualIID(riid, &IID_IContextMenu)) - *ppvObject = &This->lpCmt; - + if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualGUID(riid, &IID_IContextMenu2)) + { + This->lpContextMenu2 = &recycleBincmVtblFolder; + *ppvObject = &This->lpContextMenu2; + } if(IsEqualIID(riid, &IID_IShellExtInit)) { *ppvObject = &(This->lpSEI); @@ -237,12 +241,48 @@ return (PDELETED_FILE_DETAILS_W)&pidl->mkid.abID; } +static LPITEMIDLIST _ILCreateRecycleItem(PDELETED_FILE_DETAILS_W pFileDetails) +{ + PIDLDATA tmp; + LPITEMIDLIST pidl; + PIDLRecycleStruct * p; + int size0 = (char*)&tmp.u.crecycle.szName-(char*)&tmp.u.crecycle; + int size = size0; + + tmp.type = 0x00; + size += (wcslen(pFileDetails->FileName) + 1) * sizeof(WCHAR); + + pidl = (LPITEMIDLIST)SHAlloc(size + 4); + if (!pidl) + return pidl; + + pidl->mkid.cb = size+2; + memcpy(pidl->mkid.abID, &tmp, 2+size0); + + p = &((PIDLDATA*)pidl->mkid.abID)->u.crecycle; + RtlCopyMemory(p, pFileDetails, sizeof(DELETED_FILE_DETAILS_W)); + wcscpy(p->szName, pFileDetails->FileName); + *(WORD*)((char*)pidl+(size+2)) = 0; + return pidl; +} + +static PIDLRecycleStruct * _ILGetRecycleStruct(LPCITEMIDLIST pidl) +{ + LPPIDLDATA pdata = _ILGetDataPointer(pidl); + + if (pdata && pdata->type==0x00) + return (PIDLRecycleStruct*)&(pdata->u.crecycle); + + return NULL; +} + + BOOL WINAPI CBEnumBitBucket(IN PVOID Context, IN HANDLE hDeletedFile) { PDELETED_FILE_DETAILS_W pFileDetails; - DWORD dwSize, dwTotalSize; + DWORD dwSize; LPITEMIDLIST pidl = NULL; BOOL ret; @@ -256,17 +296,13 @@ ERR("GetDeletedFileDetailsW failed\n"); return FALSE; } - dwTotalSize = FIELD_OFFSET(ITEMIDLIST, mkid.abID) + dwSize; - - pidl = SHAlloc(dwTotalSize); - if (!pidl) + + pFileDetails = SHAlloc(dwSize); + if (!pFileDetails) { ERR("No memory\n"); return FALSE; } - - pidl->mkid.cb = dwTotalSize; - pFileDetails = UnpackDetailsFromPidl(pidl); if (!GetDeletedFileDetailsW(hDeletedFile, dwSize, @@ -274,11 +310,22 @@ NULL)) { ERR("GetDeletedFileDetailsW failed\n"); + SHFree(pFileDetails); + return FALSE; + } + + pidl = _ILCreateRecycleItem(pFileDetails); + if (!pidl) + { + SHFree(pFileDetails); + return FALSE; + } + + ret = AddToEnumList((IEnumIDList*)Context, pidl); + + if (!ret) SHFree(pidl); - return FALSE; - } - - ret = AddToEnumList((IEnumIDList*)Context, pidl); + SHFree(pFileDetails); TRACE("Returning %d\n", ret); CloseRecycleBinHandle(hDeletedFile); return ret; @@ -345,27 +392,42 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwndOwner, REFIID riid, void **ppv) { RecycleBin *This = (RecycleBin *)iface; - HRESULT ret; + LPSHELLVIEW pShellView; + HRESULT hr = E_NOINTERFACE; + TRACE("(%p, %p, %s, %p)\n", This, hwndOwner, debugstr_guid(riid), ppv); + if (!ppv) + return hr; + *ppv = NULL; - if (IsEqualGUID(riid, &IID_IShellView)) - { - IShellView *tmp; - CSFV sfv; - - ZeroMemory(&sfv, sizeof(sfv)); - sfv.cbSize = sizeof(sfv); - sfv.pshf = (IShellFolder *)This; - - TRACE("Calling SHCreateShellFolderViewEx\n"); - ret = SHCreateShellFolderViewEx(&sfv, &tmp); - TRACE("Result: %08x, output: %p\n", (unsigned int)ret, tmp); - *ppv = tmp; - return ret; - } - - return E_NOINTERFACE; + + if (IsEqualIID (riid, &IID_IDropTarget)) + { + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID (riid, &IID_IContextMenu2)) + { + This->lpContextMenu2 = &recycleBincmVtblFolder; + *ppv = &This->lpContextMenu2; + This->refCount++; + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IShellView)) + { + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) + { + hr = IShellView_QueryInterface (pShellView, riid, ppv); + IShellView_Release (pShellView); + } + } + else + return hr; + TRACE ("-- (%p)->(interface=%p)\n", This, ppv); + return hr; + } static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, @@ -376,17 +438,49 @@ return S_OK; } -static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *This, HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, - REFIID riid, UINT *rgfReserved, void **ppv) -{ - FIXME("(%p, %p, %d, {%p, ...}, %s, %p, %p): stub!\n", This, hwndOwner, cidl, apidl[0], debugstr_guid(riid), rgfReserved, ppv); +static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *iface, HWND hwndOwner, UINT cidl, LPCITEMIDLIST *apidl, + REFIID riid, UINT *prgfInOut, void **ppv) +{ + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + RecycleBin * This = (RecycleBin*)iface; + + TRACE ("(%p)->(%p,%u,apidl=%p, %p %p)\n", This, + hwndOwner, cidl, apidl, prgfInOut, ppv); + + if (!ppv) + return hr; + *ppv = NULL; - return E_NOTIMPL; + + if ((IsEqualIID (riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2)) && (cidl >= 1)) + { + This->lpContextMenu2 = &recycleBincmVtblBitbucketItem; + pObj = (IUnknown*)(&This->lpContextMenu2); + This->apidl = apidl[0]; + IUnknown_AddRef(pObj); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) + { + hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppv = pObj; + TRACE ("(%p)->hr=0x%08x\n", This, hr); + return hr; } static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) { - PDELETED_FILE_DETAILS_W pFileDetails; + PIDLRecycleStruct *pFileDetails; + LPWSTR pFileName; + TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); @@ -400,12 +494,27 @@ return S_OK; } - pFileDetails = UnpackDetailsFromPidl(pidl); - pName->uType = STRRET_WSTR; - pName->u.pOleStr = StrDupW(&pFileDetails->FileName[0]); + pFileDetails = _ILGetRecycleStruct(pidl); + if (!pFileDetails) + { + pName->u.cStr[0] = 0; + pName->uType = STRRET_CSTR; + return E_INVALIDARG; + } + + pFileName = wcsrchr(pFileDetails->szName, L'\\'); + if (!pFileName) + { + pName->u.cStr[0] = 0; + pName->uType = STRRET_CSTR; + return E_UNEXPECTED; + } + + pName->u.pOleStr = StrDupW(pFileName + 1); if (pName->u.pOleStr == NULL) return E_OUTOFMEMORY; + pName->uType = STRRET_WSTR; return S_OK; } @@ -414,34 +523,6 @@ { TRACE("\n"); return E_FAIL; /* not supported */ -} - -static HRESULT WINAPI RecycleBin_GetClassID(IPersistFolder2 *This, CLSID *pClassID) -{ - TRACE("(%p, %p)\n", This, pClassID); - if (This == NULL || pClassID == NULL) - return E_INVALIDARG; - memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); - return S_OK; -} - -static HRESULT WINAPI RecycleBin_Initialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) -{ - RecycleBin *This = impl_from_IPersistFolder(iface); - TRACE("(%p, %p)\n", This, pidl); - - This->pidl = ILClone(pidl); - if (This->pidl == NULL) - return E_OUTOFMEMORY; - return S_OK; -} - -static HRESULT WINAPI RecycleBin_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *ppidl) -{ - RecycleBin *This = impl_from_IPersistFolder(iface); - TRACE("\n"); - *ppidl = ILClone(This->pidl); - return S_OK; } static HRESULT WINAPI RecycleBin_GetDefaultSearchGUID(IShellFolder2 *iface, GUID *pguid) @@ -485,8 +566,11 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) { RecycleBin *This = (RecycleBin *)iface; - PDELETED_FILE_DETAILS_W pFileDetails; + PIDLRecycleStruct * pFileDetails; WCHAR buffer[MAX_PATH]; + WCHAR szTypeName[100]; + LPWSTR pszBackslash; + UINT Length; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails); if (iColumn >= COLUMNS_COUNT) @@ -503,25 +587,38 @@ if (iColumn == COLUMN_NAME) return RecycleBin_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &pDetails->str); - pFileDetails = UnpackDetailsFromPidl(pidl); + pFileDetails = _ILGetRecycleStruct(pidl); switch (iColumn) { case COLUMN_DATEDEL: - FormatDateTime(buffer, MAX_PATH, pFileDetails->DeletionTime); + FormatDateTime(buffer, MAX_PATH, &pFileDetails->DeletionTime); break; case COLUMN_DELFROM: - lstrcpyW(buffer, &pFileDetails->FileName[0]); - PathRemoveFileSpecW(buffer); + pszBackslash = wcsrchr(pFileDetails->szName, L'\\'); + Length = (pszBackslash - pFileDetails->szName); + memcpy((LPVOID)buffer, pFileDetails->szName, Length * sizeof(WCHAR)); + buffer[Length] = L'\0'; break; case COLUMN_SIZE: StrFormatKBSizeW(pFileDetails->FileSize.QuadPart, buffer, MAX_PATH); break; case COLUMN_MTIME: - FormatDateTime(buffer, MAX_PATH, pFileDetails->LastModification); + FormatDateTime(buffer, MAX_PATH, &pFileDetails->LastModification); break; case COLUMN_TYPE: - /* TODO */ - buffer[0] = 0; + szTypeName[0] = L'\0'; + lstrcpyW(buffer,PathFindExtensionW(pFileDetails->szName)); + if (!( HCR_MapTypeToValueW(buffer, buffer, sizeof(buffer)/sizeof(WCHAR), TRUE) && + HCR_MapTypeToValueW(buffer, szTypeName, sizeof(szTypeName)/sizeof(WCHAR), FALSE ))) + { + lstrcpyW (szTypeName, PathFindExtensionW(pFileDetails->szName)); + strcatW(szTypeName, L"-"); + Length = wcslen(szTypeName); + if (LoadStringW(shell32_hInstance, IDS_SHV_COLUMN1, &szTypeName[Length], (sizeof(szTypeName)/sizeof(WCHAR))- Length)) + szTypeName[(sizeof(szTypeName)/sizeof(WCHAR))-1] = L'\0'; + } + pDetails->str.uType = STRRET_WSTR; + return SHStrDupW(szTypeName, &pDetails->str.u.pOleStr); break; default: return E_FAIL; @@ -571,6 +668,34 @@ RecycleBin_MapColumnToSCID }; +static HRESULT WINAPI RecycleBin_IPersistFolder2_GetClassID(IPersistFolder2 *This, CLSID *pClassID) +{ + TRACE("(%p, %p)\n", This, pClassID); + if (This == NULL || pClassID == NULL) + return E_INVALIDARG; + memcpy(pClassID, &CLSID_RecycleBin, sizeof(CLSID)); + return S_OK; +} + +static HRESULT WINAPI RecycleBin_IPersistFolder2_Initialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) +{ + RecycleBin *This = impl_from_IPersistFolder(iface); + TRACE("(%p, %p)\n", This, pidl); + + This->pidl = ILClone(pidl); + if (This->pidl == NULL) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI RecycleBin_IPersistFolder2_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *ppidl) +{ + RecycleBin *This = impl_from_IPersistFolder(iface); + TRACE("\n"); + *ppidl = ILClone(This->pidl); + return S_OK; +} + static HRESULT WINAPI RecycleBin_IPersistFolder2_QueryInterface(IPersistFolder2 *This, REFIID riid, void **ppvObject) { return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IPersistFolder(This), riid, ppvObject); @@ -594,23 +719,13 @@ RecycleBin_IPersistFolder2_Release, /* IPersist */ - RecycleBin_GetClassID, + RecycleBin_IPersistFolder2_GetClassID, /* IPersistFolder */ - RecycleBin_Initialize, + RecycleBin_IPersistFolder2_Initialize, /* IPersistFolder2 */ - RecycleBin_GetCurFolder + RecycleBin_IPersistFolder2_GetCurFolder }; -/************************************************************************* - * SHUpdateRecycleBinIcon [SHELL32.@] - * - * Undocumented - */ -HRESULT WINAPI SHUpdateRecycleBinIcon(void) -{ - FIXME("stub\n"); - return S_OK; -} /************************************************************************* * BitBucket IShellExtInit interface */ @@ -659,31 +774,31 @@ */ static HRESULT WINAPI -RecycleBin_IContextMenu_QueryInterface( IContextMenu* iface, REFIID riid, void** ppvObject ) -{ - return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IContextMenu(iface), riid, ppvObject); +RecycleBin_IContextMenu2Folder_QueryInterface( IContextMenu2* iface, REFIID riid, void** ppvObject ) +{ + return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IContextMenu2(iface), riid, ppvObject); } static ULONG WINAPI -RecycleBin_IContextMenu_AddRef( IContextMenu* iface ) -{ - return RecycleBin_AddRef((IShellFolder2 *)impl_from_IContextMenu(iface)); +RecycleBin_IContextMenu2Folder_AddRef( IContextMenu2* iface ) +{ + return RecycleBin_AddRef((IShellFolder2 *)impl_from_IContextMenu2(iface)); } static ULONG WINAPI -RecycleBin_IContextMenu_Release( IContextMenu* iface ) -{ - return RecycleBin_Release((IShellFolder2 *)impl_from_IContextMenu(iface)); +RecycleBin_IContextMenu2Folder_Release( IContextMenu2* iface ) +{ + return RecycleBin_Release((IShellFolder2 *)impl_from_IContextMenu2(iface)); } static HRESULT WINAPI -RecycleBin_IContextMenu_QueryContextMenu( IContextMenu* iface, HMENU hmenu, UINT indexMenu, +RecycleBin_IContextMenu2Folder_QueryContextMenu( IContextMenu2* iface, HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags ) { WCHAR szBuffer[100]; MENUITEMINFOW mii; int id = 1; - RecycleBin * This = impl_from_IContextMenu(iface); + RecycleBin * This = impl_from_IContextMenu2(iface); TRACE("%p %p %u %u %u %u\n", This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags ); @@ -715,7 +830,7 @@ mii.wID = idCmdFirst + id++; if (!InsertMenuItemW( hmenu, idCmdLast, TRUE, &mii )) { - TRACE("RecycleBin_IContextMenu_QueryContextMenu failed to insert item properties"); + TRACE("RecycleBin_IContextMenu2Folder_QueryContextMenu failed to insert item properties"); return E_FAIL; } This->iIdEmpty = 2; @@ -723,13 +838,13 @@ } static HRESULT WINAPI -RecycleBin_IContextMenu_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) +RecycleBin_IContextMenu2Folder_InvokeCommand( IContextMenu2* iface, LPCMINVOKECOMMANDINFO lpici ) { HRESULT hr; LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV = NULL; - RecycleBin * This = impl_from_IContextMenu(iface); + RecycleBin * This = impl_from_IContextMenu2(iface); TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb); @@ -765,10 +880,10 @@ } static HRESULT WINAPI -RecycleBin_IContextMenu_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, +RecycleBin_IContextMenu2Folder_GetCommandString( IContextMenu2* iface, UINT_PTR idCmd, UINT uType, UINT* pwReserved, LPSTR pszName, UINT cchMax ) { - RecycleBin * This = impl_from_IContextMenu(iface); + RecycleBin * This = impl_from_IContextMenu2(iface); FIXME("%p %lu %u %p %p %u\n", This, idCmd, uType, pwReserved, pszName, cchMax ); @@ -776,15 +891,189 @@ return E_NOTIMPL; } -static const IContextMenuVtbl recycleBincmVtbl = -{ - RecycleBin_IContextMenu_QueryInterface, - RecycleBin_IContextMenu_AddRef, - RecycleBin_IContextMenu_Release, - RecycleBin_IContextMenu_QueryContextMenu, - RecycleBin_IContextMenu_InvokeCommand, - RecycleBin_IContextMenu_GetCommandString +/************************************************************************** +* RecycleBin_IContextMenu2Item_HandleMenuMsg() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Folder_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("RecycleBin_IContextMenu2Item_IContextMenu2Folder_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + + +static const IContextMenu2Vtbl recycleBincmVtblFolder = +{ + RecycleBin_IContextMenu2Folder_QueryInterface, + RecycleBin_IContextMenu2Folder_AddRef, + RecycleBin_IContextMenu2Folder_Release, + RecycleBin_IContextMenu2Folder_QueryContextMenu, + RecycleBin_IContextMenu2Folder_InvokeCommand, + RecycleBin_IContextMenu2Folder_GetCommandString, + RecycleBin_IContextMenu2Folder_HandleMenuMsg }; + + +/************************************************************************** +* IContextMenu2 Bitbucket Item Implementation +*/ + +/************************************************************************ + * RecycleBin_IContextMenu2Item_QueryInterface + */ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)\n", This); + + return RecycleBin_QueryInterface((IShellFolder2*)This, iid, ppvObject); +} + +/************************************************************************ + * RecycleBin_IContextMenu2Item_AddRef + */ +static ULONG WINAPI RecycleBin_IContextMenu2Item_AddRef(IContextMenu2 * iface) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(count=%u)\n", This, This->refCount); + + return RecycleBin_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * RecycleBin_IContextMenu2Item_Release + */ +static ULONG WINAPI RecycleBin_IContextMenu2Item_Release(IContextMenu2 * iface) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(count=%u)\n", This, This->refCount); + + return RecycleBin_Release((IShellFolder2*)This); +} + +/************************************************************************** +* RecycleBin_IContextMenu2Item_QueryContextMenu() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_QueryContextMenu( + IContextMenu2 *iface, + HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + char szBuffer[30] = {0}; + ULONG Count = 1; + + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", + This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (LoadStringA(shell32_hInstance, IDS_RESTORE, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); + Count++; + } + + if (LoadStringA(shell32_hInstance, IDS_CUT, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_DELETE, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); + } + + if (LoadStringA(shell32_hInstance, IDS_PROPERTIES, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + } + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); +} + + +/************************************************************************** +* RecycleBin_IContextMenu2Item_InvokeCommand() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_InvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); + + return S_OK; +} + +/************************************************************************** + * RecycleBin_IContextMenu2Item_GetCommandString() + * + */ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_GetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + + + return E_FAIL; +} + + + +/************************************************************************** +* RecycleBin_IContextMenu2Item_HandleMenuMsg() +*/ +static HRESULT WINAPI RecycleBin_IContextMenu2Item_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + RecycleBin * This = impl_from_IContextMenu2(iface); + + TRACE("RecycleBin_IContextMenu2Item_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl recycleBincmVtblBitbucketItem = +{ + RecycleBin_IContextMenu2Item_QueryInterface, + RecycleBin_IContextMenu2Item_AddRef, + RecycleBin_IContextMenu2Item_Release, + RecycleBin_IContextMenu2Item_QueryContextMenu, + RecycleBin_IContextMenu2Item_InvokeCommand, + RecycleBin_IContextMenu2Item_GetCommandString, + RecycleBin_IContextMenu2Item_HandleMenuMsg +}; + void toggleNukeOnDeleteOption(HWND hwndDlg, BOOL bEnable) { @@ -989,58 +1278,78 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - LONG res; + LONG ret; + DWORD dwNukeOnDelete, dwType, VolSerialNumber, MaxComponentLength; + DWORD FileSystemFlags, dwSize, dwDisposition; HKEY hKey; - DWORD RegSerial, dwNukeOnDelete, dwType; - DWORD dwLength; - - - static WCHAR szKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\c"; + WCHAR szBuffer[10]; + WCHAR szKey[150] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume\\"; + if (wszPath[1] != L':') { - /* path is UNC */ - return FALSE; + /* path is UNC */ + return FALSE; } - szKey[62] = wszPath[0]; - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hKey); - if (res != ERROR_SUCCESS) + if (GetDriveTypeW(wszPath) != DRIVE_FIXED) { - FIXME("Failed to open registry path\n"); - return FALSE; + /* no bitbucket on removable media */ + return FALSE; } - dwLength = sizeof(RegSerial); - res = RegQueryValueExW(hKey, L"VolumeSerialNumber", NULL, &dwType, (LPBYTE)&RegSerial, &dwLength); - if (res == ERROR_SUCCESS) + + if (!GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) { - DWORD FileSystemFlags, MaxComponentLength, VolSerialNumber; - - GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0); - if (VolSerialNumber != RegSerial) + ERR("GetVolumeInformationW failed with %u\n", GetLastError()); + return FALSE; + } + + sprintfW(szBuffer, L"%04X-%04X", LOWORD(VolSerialNumber), HIWORD(VolSerialNumber)); + wcscat(szKey, szBuffer); + + if (RegCreateKeyExW(HKEY_CURRENT_USER, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, &dwDisposition) != ERROR_SUCCESS) + { + ERR("RegCreateKeyExW failed\n"); + return FALSE; + } + + if (dwDisposition & REG_CREATED_NEW_KEY) + { + /* per default move to bitbucket */ + dwNukeOnDelete = 0; + RegSetValueExW(hKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&dwNukeOnDelete, sizeof(DWORD)); + /* per default unlimited size */ + dwSize = -1; + RegSetValueExW(hKey, L"MaxSize", 0, REG_DWORD, (LPBYTE)&dwSize, sizeof(DWORD)); + RegCloseKey(hKey); + return TRUE; + } + else + { + dwSize = sizeof(dwNukeOnDelete); + ret = RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)&dwNukeOnDelete, &dwSize); + if (ret != ERROR_SUCCESS) { - /* FIXME - * the current volume was mounted on a different path - */ - FIXME("mismatched serial volume number\n"); + sprintfW(szBuffer, L"ret %u\n", ret); + MessageBoxW(NULL, szBuffer, NULL, MB_OK); RegCloseKey(hKey); + if (ret == ERROR_FILE_NOT_FOUND) + { + /* restore key and enable bitbucket */ + dwNukeOnDelete = 0; + RegSetValueExW(hKey, L"NukeOnDelete", 0, REG_DWORD, (LPBYTE)&dwNukeOnDelete, sizeof(DWORD)); + } + return TRUE; + } + else if (dwNukeOnDelete) + { + /* do not delete to bitbucket */ return FALSE; } + /* FIXME + * check if bitbucket is full + */ + return TRUE; } - - dwLength = sizeof(dwNukeOnDelete); - res = RegQueryValueExW(hKey, L"NukeOnDelete", NULL, &dwType, (LPBYTE)&dwNukeOnDelete, &dwLength); - if (res == ERROR_SUCCESS && dwNukeOnDelete == 0x0) - { - RegCloseKey(hKey); - return FALSE; - } - - /* FIXME - * check if trash is already full - */ - - RegCloseKey(hKey); - return TRUE; } BOOL @@ -1049,3 +1358,14 @@ TRACE("(%s)\n", debugstr_w(wszPath)); return DeleteFileToRecycleBinW(wszPath); } + +/************************************************************************* + * SHUpdateRecycleBinIcon [SHELL32.@] + * + * Undocumented + */ +HRESULT WINAPI SHUpdateRecycleBinIcon(void) +{ + FIXME("stub\n"); + return S_OK; +} Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Fri Aug 8 20:48:18 2008 @@ -158,6 +158,8 @@ #define IDS_SHV_COLUMN_COMMENTS 320 #define IDS_SHV_COLUMN_LOCATION 321 #define IDS_SHV_COLUMN_MODEL 322 +#define IDS_CUT 323 +#define IDS_RESTORE 324 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

16 years, 2 months

← Newer
1
...
61
62
63
64
65
66
67
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008