Ros-diffs

ros-diffs@reactos.org

81390 discussions

[nyadav] 52115: [AUDSRV] Style Fixes, Warning Fixes, Documentation etc
by nyadav＠svn.reactos.org 06 Jun '11

06 Jun '11

Author: nyadav Date: Mon Jun 6 12:20:41 2011 New Revision: 52115 URL: http://svn.reactos.org/svn/reactos?rev=52115&view=rev Log: [AUDSRV] Style Fixes,Warning Fixes,Documentation etc Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -3,20 +3,21 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: services/audsrv.c * PURPOSE: Audio Server - * COPYRIGHT: Copyright 2011 Pankaj Yadav + * COPYRIGHT: Copyright 2011 Neeraj Yadav */ -/* INCLUDES *****************************************************************/ - #include "audsrv.h" -/* GLOBALS ******************************************************************/ - -static VOID CALLBACK ServiceMain(DWORD, LPWSTR *); +static VOID CALLBACK ServiceMain(DWORD, + LPWSTR *); + static DWORD ServiceInit(VOID); -static BOOL WINAPI close ( DWORD dwCtrlType ); + +static BOOL WINAPI close (DWORD dwCtrlType); + static WCHAR ServiceName[] = L"AudSrv"; + static SERVICE_TABLE_ENTRYW ServiceTable[2] = { { ServiceName, ServiceMain }, @@ -25,9 +26,6 @@ SERVICE_STATUS ServiceStatus; SERVICE_STATUS_HANDLE ServiceStatusHandle; - - -HANDLE MyHeap = NULL; #define _2pi 6.283185307179586476925286766559 @@ -44,10 +42,11 @@ const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; +/*Global Pointer to MixerEngine Structure*/ MixerEngine engine,*pengine; -/* FUNCTIONS ****************************************************************/ - -static VOID + +static +VOID UpdateServiceStatus(DWORD dwState) { ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; @@ -81,7 +80,7 @@ { case SERVICE_CONTROL_STOP: DPRINT(" SERVICE_CONTROL_STOP received\n"); - close(CTRL_CLOSE_EVENT); + close(CTRL_CLOSE_EVENT); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -103,7 +102,7 @@ case SERVICE_CONTROL_SHUTDOWN: DPRINT(" SERVICE_CONTROL_SHUTDOWN received\n"); - close(CTRL_CLOSE_EVENT); + close(CTRL_CLOSE_EVENT); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -113,7 +112,9 @@ } } -static VOID CALLBACK +static +VOID +CALLBACK ServiceMain(DWORD argc, LPWSTR *argv) { @@ -151,36 +152,85 @@ DPRINT("ServiceMain() done\n"); } - - -void mixandfill(MixerEngine * mixer,int buffer) -{ - while(WaitForSingleObject(mixer->streampresent,100)!=0){if(mixer->dead) return;} /*Check if there is at least one stream present.*/ - if(mixer->masterdatatype == 0)/*signed int*/ - { - if(mixer->masterbitspersample == 8)mixs8(mixer,buffer);else if(mixer->masterbitspersample == 16) mixs16(mixer,buffer);else if(mixer->masterbitspersample == 32) mixs32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixs64(mixer,buffer); - } - else if (mixer->masterdatatype == 1)/*unsigned int*/ - { - if(mixer->masterbitspersample == 8)mixu8(mixer,buffer);else if(mixer->masterbitspersample == 16) mixu16(mixer,buffer);else if(mixer->masterbitspersample == 32) mixu32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixu64(mixer,buffer); - } - else if(mixer->masterdatatype == 2)/*Float*/ - { - if(mixer->masterbitspersample == 32)mixfl32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixfl64(mixer,buffer); - } - - mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); - CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); - mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; -} +/*This Function is called repeatedly by mixer thread. + *This functions fetches FilteredBuffer from Every ClientStream Stucture + *and mixes them in oder to feed player thread*/ +void +mixandfill(MixerEngine * mixer, + int buffer) +{ + while(WaitForSingleObject(mixer->streampresent, + 100) != 0) + { + if(mixer->dead) + return; + } + + /*Master Stream's Datatype is signed int,unsigned int or float when masterdatatype =0,1 and 2 respectively*/ + if(mixer->masterdatatype == 0) + { + switch(mixer->masterbitspersample) + { + case 8: + mixs8(mixer,buffer); + break; + case 16: + mixs16(mixer,buffer); + break; + case 32: + mixs32(mixer,buffer); + break; + case 64: + mixs64(mixer,buffer); + break; + } + } + else if (mixer->masterdatatype == 1) + { + switch(mixer->masterbitspersample) + { + case 8: + mixu8(mixer,buffer); + break; + case 16: + mixu16(mixer,buffer); + break; + case 32: + mixu32(mixer,buffer); + break; + case 64: + mixu64(mixer,buffer); + break; + } + } + else if(mixer->masterdatatype == 2) + { + switch(mixer->masterbitspersample) + { + case 32: + mixfl32(mixer,buffer); + break; + case 64: + mixfl64(mixer,buffer); + break; + } + } +} + +/*Frees the Buffer Created in mixer thread*/ void freebuffer() { - HeapFree(GetProcessHeap(), 0, pengine->masterbuf[pengine->playcurrent]); - pengine->masterbuf[pengine->playcurrent] = NULL; -} + HeapFree(GetProcessHeap(), + 0, + pengine->masterbuf[pengine->playcurrent]); + + pengine->masterbuf[pengine->playcurrent] = NULL; +} + +/*Plays Master buffer pengine->masterbuf[pengine->playcurrent]*/ void playbuffer(MixerEngine * mixer,int buffer) { - SP_DEVICE_INTERFACE_DATA InterfaceData; + SP_DEVICE_INTERFACE_DATA InterfaceData; SP_DEVINFO_DATA DeviceData; PSP_DEVICE_INTERFACE_DETAIL_DATA DetailData; HDEVINFO DeviceHandle; @@ -191,8 +241,9 @@ DWORD Length; BOOL Result; NTSTATUS Status; -if(mixer->masterbuf[buffer]) -{ + + if(mixer->masterbuf[buffer]) + { // // Get a handle to KS Audio Interfaces // @@ -201,7 +252,6 @@ NULL, DIGCF_DEVICEINTERFACE |DIGCF_PRESENT); - //printf("DeviceHandle %p\n", DeviceHandle); // // Enumerate the first interface @@ -214,7 +264,6 @@ 1, &InterfaceData); - //printf("SetupDiEnumDeviceInterfaces %u Error %ld\n", Result, GetLastError()); // // Get the interface details (namely the device path) @@ -233,7 +282,6 @@ NULL, &DeviceData); - //wprintf(L"SetupDiGetDeviceInterfaceDetail %u Path DetailData %s\n", Result, (LPWSTR)&DetailData->DevicePath[0]); // // Open a handle to the device @@ -246,7 +294,6 @@ FILE_ATTRIBUTE_NORMAL, NULL); - //printf("Handle %p\n", mixer->FilterHandle); // // Close the interface handle and clean up @@ -279,41 +326,37 @@ // // Setup the KS Data Format Information // - //printf("DataFormat %p %p\n", DataFormat,(PVOID)((((ULONG_PTR)DataFormat + 7)) & ~7)); DataFormat->Flags = 0; DataFormat->Reserved = 0; DataFormat->MajorFormat = KSDATAFORMAT_TYPE_AUDIO; - if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) - DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - else - DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + else + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; DataFormat->Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; DataFormat->SampleSize = mixer->masterchannels * mixer->masterbitspersample / 8; DataFormat->FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEXTENSIBLE); WaveFormat->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - WaveFormat->Format.nChannels = mixer->masterchannels; + WaveFormat->Format.nChannels = mixer->masterchannels; WaveFormat->Format.nSamplesPerSec = mixer->masterfreq; WaveFormat->Format.nBlockAlign = (mixer->masterchannels * mixer->masterbitspersample)/8;; WaveFormat->Format.nAvgBytesPerSec = WaveFormat->Format.nSamplesPerSec * WaveFormat->Format.nBlockAlign; WaveFormat->Format.wBitsPerSample = mixer->masterbitspersample; WaveFormat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - WaveFormat->dwChannelMask = mixer->masterchannelmask; + WaveFormat->dwChannelMask = mixer->masterchannelmask; WaveFormat->Samples.wValidBitsPerSample = mixer->masterbitspersample; - if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) - WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - else - WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - - - // + if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + else + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + + + // // Create the pin // Status = KsCreatePin(mixer->FilterHandle, PinConnect, GENERIC_READ|GENERIC_WRITE, &(mixer->PinHandle)); - - //printf("PinHandle %p Status %lx\n", mixer->PinHandle, Status); - Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; // @@ -322,7 +365,7 @@ mixer->Packet = (PKSSTREAM_HEADER)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KSSTREAM_HEADER)); - mixer->Packet->Data = mixer->masterbuf[buffer]; + mixer->Packet->Data = mixer->masterbuf[buffer]; mixer->Packet->FrameExtent = mixer->bytes_to_play; mixer->Packet->DataUsed = mixer->bytes_to_play; mixer->Packet->Size = sizeof(KSSTREAM_HEADER); @@ -373,52 +416,96 @@ CloseHandle(mixer->FilterHandle); } } + +/*Thread Routine For Mixer Thread*/ DWORD WINAPI RunMixerThread(LPVOID param) { - MixerEngine * mixer = (MixerEngine *) param; - - SetEvent(mixer->played); - while(1) - { - while(WaitForSingleObject(mixer->played,100)!=0){if(mixer->dead)goto DEAD;} - mixandfill(mixer,1-mixer->playcurrent); - SetEvent(mixer->filled); - } + MixerEngine * mixer = (MixerEngine *) param; + + SetEvent(mixer->played); + + while(1) + { + while(WaitForSingleObject(mixer->played, + 100)!=0) + { + if(mixer->dead) + goto DEAD; + } + + mixandfill(mixer, + 1-mixer->playcurrent); + + SetEvent(mixer->filled); + } + DEAD: - printf("\nMixer Thread Ended\n"); - return 0; -} + return 0; +} + +/*Thread Routine For Player Thread*/ DWORD WINAPI RunPlayerThread(LPVOID param) { - MixerEngine * mixer = (MixerEngine *) param; - while(1) - { - while(WaitForSingleObject(mixer->filled,100)!=0){if(mixer->dead)goto DEAD;} - SetEvent(mixer->played); - playbuffer(mixer,mixer->playcurrent); - freebuffer(); - mixer->playcurrent=1-mixer->playcurrent; - } + MixerEngine * mixer = (MixerEngine *) param; + + while(1) + { + while(WaitForSingleObject(mixer->filled, + 100)!=0) + { + if(mixer->dead) + goto DEAD; + } + + SetEvent(mixer->played); + playbuffer(mixer, + mixer->playcurrent); + + freebuffer(); + + mixer->playcurrent=1-mixer->playcurrent; + } DEAD: - printf("\nPlayer Thread Ended\n"); - return 0; -} + return 0; +} + +/*Create Mixer Thread*/ void SpawnMixerThread(MixerEngine * mixer) { - DWORD dwID; - mixer->mixerthread=CreateThread(NULL,0,RunMixerThread,pengine,0,&dwID); -} + DWORD dwID; + mixer->mixerthread=CreateThread(NULL, + 0, + RunMixerThread, + pengine, + 0, + &dwID); +} + +/*Create Player Thread*/ void SpawnPlayerThread(MixerEngine * mixer) { - DWORD dwID; - mixer->playerthread=CreateThread(NULL,0,RunPlayerThread,pengine,0,&dwID); -} + DWORD dwID; + mixer->playerthread=CreateThread(NULL, + 0, + RunPlayerThread, + pengine, + 0, + &dwID); +} + +/*Create RPC Thread*/ void SpawnRPCThread(MixerEngine * mixer) { - DWORD dwID; - mixer->rpcthread=CreateThread(NULL,0,RunRPCThread,pengine,0,&dwID); -} + DWORD dwID; + mixer->rpcthread=CreateThread(NULL, + 0, + RunRPCThread, + pengine, + 0, + &dwID); +} + void ShutdownRPC(void) { RPC_STATUS status; @@ -437,92 +524,107 @@ exit(status); } } + +/*This Functions Kills the application, in any condition*/ static BOOL WINAPI close ( DWORD dwCtrlType ) { - pengine->dead=1; - WaitForSingleObject(pengine->mixerthread,INFINITE); - WaitForSingleObject(pengine->playerthread,INFINITE); - ShutdownRPC(); - WaitForSingleObject(pengine->rpcthread,INFINITE); - - CloseHandle(pengine->mixerthread); - CloseHandle(pengine->playerthread); - CloseHandle(pengine->rpcthread); - return TRUE; + pengine->dead=1; + + WaitForSingleObject(pengine->mixerthread, + INFINITE); + WaitForSingleObject(pengine->playerthread, + INFINITE); + + ShutdownRPC(); + + WaitForSingleObject(pengine->rpcthread,INFINITE); + + CloseHandle(pengine->mixerthread); + CloseHandle(pengine->playerthread); + CloseHandle(pengine->rpcthread); + + return TRUE; } INT wmain(int argc, char *argv[]) { INT RetCode = 0; -/*For Temporary Debug purpose, If there is any argument it acts as simple command line app,otherwise it is a NTSERVICE*/ -if(argc==1) -{ -printf("Under Construction.Please Use audsrv.exe -n to start as normal command line application.\n"); - MyHeap = HeapCreate(0, 1024 * 256, 0); - - if (!MyHeap) - { - DPRINT1("FATAL ERROR, can't create heap.\n"); - RetCode = 1; - goto err; - } - - StartServiceCtrlDispatcher(ServiceTable); -} -else -{ - pengine=&engine; - - /*Later these will be loaded from a Conf file*/ - pengine->mastervolume=1000; - pengine->mute=FALSE; - - pengine->dead=0; - pengine->streamidpool=0; - pengine->playcurrent=1; - pengine->masterbuf[0] = NULL; - pengine->masterbuf[1] = NULL; - pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); - SetConsoleCtrlHandler(close,TRUE); - SpawnMixerThread(pengine); - SpawnPlayerThread(pengine); - SpawnRPCThread(pengine); - WaitForSingleObject(pengine->mixerthread,INFINITE); - WaitForSingleObject(pengine->playerthread,INFINITE); - WaitForSingleObject(pengine->rpcthread,INFINITE); -} - err: -CloseHandle(pengine->mixerthread); -CloseHandle(pengine->playerthread); -CloseHandle(pengine->rpcthread); - if (MyHeap) - HeapDestroy(MyHeap); + + /*For Temporary Debugging purpose, If there is any argument it acts as simple command line app,otherwise it is a NTSERVICE*/ + if(argc==1) + { + StartServiceCtrlDispatcher(ServiceTable); + } + else + { + pengine=&engine; + + /*Later these will be loaded from a Conf file*/ + pengine->mastervolume=1000; + pengine->mute=FALSE; + + pengine->dead=0; + pengine->streamidpool=0; + pengine->playcurrent=1; + pengine->masterbuf[0] = NULL; + pengine->masterbuf[1] = NULL; + pengine->played=CreateEvent(NULL, + FALSE, + FALSE, + NULL); + + pengine->filled=CreateEvent(NULL, + FALSE, + FALSE, + NULL); + + pengine->streampresent=CreateEvent(NULL, + TRUE, + FALSE, + NULL); + + SetConsoleCtrlHandler(close, + TRUE); + + SpawnMixerThread(pengine); + SpawnPlayerThread(pengine); + SpawnRPCThread(pengine); + + WaitForSingleObject(pengine->mixerthread, + INFINITE); + WaitForSingleObject(pengine->playerthread, + INFINITE); + WaitForSingleObject(pengine->rpcthread,INFINITE); + } + + CloseHandle(pengine->mixerthread); + CloseHandle(pengine->playerthread); + CloseHandle(pengine->rpcthread); return RetCode; } + static DWORD ServiceInit(VOID) { - pengine=&engine; - - /*Later these will be loaded from a Conf file*/ - pengine->mastervolume=1000; - pengine->mute=FALSE; - - pengine->dead=0; - pengine->streamidpool=0; - pengine->playcurrent=1; - pengine->masterbuf[0] = NULL; - pengine->masterbuf[1] = NULL; - pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); - SetConsoleCtrlHandler(close,TRUE); - SpawnMixerThread(pengine); - SpawnPlayerThread(pengine); - SpawnRPCThread(pengine); + pengine=&engine; + + /*Later these will be loaded from a Conf file*/ + pengine->mastervolume=1000; + pengine->mute=FALSE; + + pengine->dead=0; + pengine->streamidpool=0; + pengine->playcurrent=1; + pengine->masterbuf[0] = NULL; + pengine->masterbuf[1] = NULL; + pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); + SetConsoleCtrlHandler(close,TRUE); + SpawnMixerThread(pengine); + SpawnPlayerThread(pengine); + SpawnRPCThread(pengine); return ERROR_SUCCESS; } Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -2,8 +2,8 @@ * PROJECT: ReactOS kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: services/audsrv/audsrv.h - * PURPOSE: Event logging service - * COPYRIGHT: Copyright 2011 Pankaj Yadav + * PURPOSE: Audio Service + * COPYRIGHT: Copyright 2011 Neeraj Yadav */ #ifndef __AUDSRV_H__ @@ -29,79 +29,121 @@ typedef struct ServerStream { - long streamid; - int volume; - LONG freq; - int bitspersample; - int datatype; /*0=signed int,1=unsigned int,2=float*/ - int channels; - ULONG channelmask; - HANDLE played; - HANDLE threadready; - HANDLE thread; - float balance; - BOOL ready; - PVOID genuinebuf; - int length_genuine; - PVOID filteredbuf; - int length_filtered; - PVOID minsamplevalue; - PVOID maxsamplevalue; - struct ServerStream * next; + long streamid; + int volume; + LONG freq; + int bitspersample; + + /*0=signed int,1=unsigned int,2=float*/ + int datatype; + + int channels; + + /*Standard channelmasks from WINAPI/ksmeida.h*/ + ULONG channelmask; + + /*Balance from -1.0 to 1.0*/ + float balance; + BOOL ready; + /*This buffer is filled by the client using RPC calls*/ + PVOID genuinebuf; + int length_genuine; + /*This Buffer is filled by Stream-Specific Server Thread, This Buffer's matches masterbuffer specifications*/ + PVOID filteredbuf; + int length_filtered; + /*These values must be filled by Stream-Specific Server Thread,these are helful for Mixer Thread*/ + PVOID minsamplevalue; + PVOID maxsamplevalue; + + HANDLE played; + HANDLE threadready; + HANDLE thread; + + struct ServerStream * next; } ServerStream; typedef struct MixerEngine { -/*Should be Initialized at Server Start*/ - char dead; - long streamidpool; - HANDLE played; - HANDLE filled; - HANDLE streampresent; - HANDLE mixerthread; - HANDLE playerthread; - HANDLE rpcthread; - int playcurrent; -/*Should be Initialized at Server Start from configuration file,Currently there is no configuration file so initialized to a fixed value at start*/ - int mastervolume; - BOOL mute; -/*Should be Initialized before playing First Stream*/ - long masterfreq; - int masterchannels; - unsigned long masterchannelmask; - int masterbitspersample; - int masterdatatype; - PVOID masterbuf[2]; -/*Currently don't know the future of following variables*/ - long bytes_to_play; - HANDLE FilterHandle; + /*Should be Initialized at Server Start*/ + char dead; + long streamidpool; + HANDLE played; + HANDLE filled; + HANDLE streampresent; + HANDLE mixerthread; + HANDLE playerthread; + HANDLE rpcthread; + int playcurrent; + /*Should be Initialized at Server Start from configuration file,Currently there is no configuration file so initialized to a fixed value at start*/ + int mastervolume; + BOOL mute; + /*Should be Initialized before playing First Stream*/ + long masterfreq; + int masterchannels; + unsigned long masterchannelmask; + int masterbitspersample; + int masterdatatype; + PVOID masterbuf[2]; + /*Currently don't know the future of following variables*/ + long bytes_to_play; + HANDLE FilterHandle; HANDLE PinHandle; - PKSPROPERTY Property; - PKSSTREAM_HEADER Packet; - ServerStream * serverstreamlist; + PKSPROPERTY Property; + PKSSTREAM_HEADER Packet; + ServerStream * serverstreamlist; } MixerEngine; extern MixerEngine engine,*pengine; /* rpc.c */ DWORD WINAPI RunRPCThread(LPVOID lpParameter); + /* audsrv.c*/ -void mixandfill(MixerEngine * mixer,int buffer); -void playbuffer(MixerEngine * mixer,int buffer); +void mixandfill(MixerEngine * mixer, + int buffer); +void playbuffer(MixerEngine * mixer, + int buffer); + /*stream.c*/ long getnewstreamid(); -long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance); +long addstream(LONG frequency, + int channels, + int bitspersample, + int datatype, + ULONG channelmask, + int volume, + int mute, + float balance); + /*mixer.c*/ -void * mixs8(MixerEngine * mixer,int buffer); -void * mixs16(MixerEngine * mixer,int buffer); -void * mixs32(MixerEngine * mixer,int buffer); -void * mixs64(MixerEngine * mixer,int buffer); -void * mixu8(MixerEngine * mixer,int buffer); -void * mixu16(MixerEngine * mixer,int buffer); -void * mixu32(MixerEngine * mixer,int buffer); -void * mixu64(MixerEngine * mixer,int buffer); -void * mixfl32(MixerEngine * mixer,int buffer); -void * mixfl64(MixerEngine * mixer,int buffer); -/********************************/ +void * mixs8(MixerEngine * mixer, + int buffer); + +void * mixs16(MixerEngine * mixer, + int buffer); + +void * mixs32(MixerEngine * mixer, + int buffer); + +void * mixs64(MixerEngine * mixer, + int buffer); + +void * mixu8(MixerEngine * mixer, + int buffer); + +void * mixu16(MixerEngine * mixer, + int buffer); + +void * mixu32(MixerEngine * mixer, + int buffer); + +void * mixu64(MixerEngine * mixer, + int buffer); + +void * mixfl32(MixerEngine * mixer, + int buffer); + +void * mixfl64(MixerEngine * mixer, + int buffer); #endif /* __AUDSRV_H__ */ Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -2,34 +2,45 @@ #include "audsrv.h" void * mixs8(MixerEngine * mixer,int buffer) { + return NULL; } void * mixs16(MixerEngine * mixer,int buffer) { - mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); - CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); - mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; + mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); + CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); + mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; + + return NULL; } void * mixs32(MixerEngine * mixer,int buffer) { + return NULL; } void * mixs64(MixerEngine * mixer,int buffer) { + return NULL; } void * mixu8(MixerEngine * mixer,int buffer) { + return NULL; } void * mixu16(MixerEngine * mixer,int buffer) { + return NULL; } void * mixu32(MixerEngine * mixer,int buffer) { + return NULL; } void * mixu64(MixerEngine * mixer,int buffer) { + return NULL; } void * mixfl32(MixerEngine * mixer,int buffer) { + return NULL; } void * mixfl64(MixerEngine * mixer,int buffer) { + return NULL; } Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -3,56 +3,74 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: services/audsrv/rpc.c * PURPOSE: Audio Server - * COPYRIGHT: Copyright 2011 Pankaj Yadav + * COPYRIGHT: Copyright 2011 Neeraj Yadav */ - -/* INCLUDES *****************************************************************/ #include "audsrv.h" LIST_ENTRY LogHandleListHead; -/* FUNCTIONS ****************************************************************/ - +/*RPC Listener Thread,Returns values less than 0 in failures*/ DWORD WINAPI RunRPCThread(LPVOID lpParameter) { RPC_STATUS Status; InitializeListHead(&LogHandleListHead); - Status = RpcServerUseProtseqEp(L"ncacn_np", 20, L"\\pipe\\audsrv", NULL); + + Status = RpcServerUseProtseqEp(L"ncacn_np", + 20, + L"\\pipe\\audsrv", + NULL); if (Status != RPC_S_OK) { - printf("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); - return 0; + return -1; } - Status = RpcServerRegisterIfEx(audsrv_v0_0_s_ifspec, NULL, NULL, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL ); + Status = RpcServerRegisterIfEx(audsrv_v0_0_s_ifspec, + NULL, + NULL, + 0, + RPC_C_LISTEN_MAX_CALLS_DEFAULT, + NULL ); if (Status != RPC_S_OK) { - printf("RpcServerRegisterIf() failed (Status %lx)\n", Status); - return 0; + return -2; } - Status = RpcServerListen(1, 20, FALSE); + Status = RpcServerListen(1, + 20, + FALSE); + if (Status != RPC_S_OK) { - printf("RpcServerListen() failed (Status %lx)\n", Status); + return -3; } return 0; } - /*************************RPC Functions**********************************/ -long AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) +long AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { - long stream; - printf("Client Connected and Initiated Stream Freq: %ld,Channle: %d,Bitspersample: %d,Datatype: %d,Mask: %ld,Volume: %d,Mute: %d,Balance: %f\n",frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); - stream = addstream(frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); - if( stream != 0 ){printf("Stream added\n");} + long stream; + + stream = addstream(frequency, + channels, + bitspersample, + datatype, + channelmask, + volume, + mute, + balance); + + if( stream != 0 ) + { + /*ERROR*/ + } return stream; } + /*************************************************************************/ void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) { Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -2,100 +2,193 @@ long getnewstreamid() { - long streamid= pengine->streamidpool; - pengine->streamidpool+=1; - return streamid; + long streamid= pengine->streamidpool; + pengine->streamidpool+=1; + return streamid; } + DWORD WINAPI RunStreamThread(LPVOID param) { - UINT i = 0; - ServerStream * localstream = (ServerStream *) param; + UINT i = 0; + ServerStream * localstream = (ServerStream *) param; +/*UGLY HACK--WILL be removed soon-- fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ +/******************************************************/ + BOOL initmin=FALSE,initmax =FALSE; + short minimum=0,maximum=0; + PSHORT tempbuf; - printf("Signaling Mixer Thread For First Stream\n"); -/*HACK fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ -/******************************************************/ -PSHORT tempbuf; -localstream->ready =TRUE; -localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; -tempbuf = (PSHORT)HeapAlloc(GetProcessHeap(), 0, localstream->length_filtered); + localstream->ready =TRUE; + localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; + tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), + 0, + localstream->length_filtered); + while (i < localstream->length_filtered / 2) { tempbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * 6.28 / 48000); + if(initmin) + { + if(tempbuf[i]<minimum) + minimum = tempbuf[i]; + }else + minimum = tempbuf[i]; + if(initmax) + { + if(tempbuf[i]>maximum) + maximum = tempbuf[i]; + }else + maximum = tempbuf[i]; + + if(initmin == FALSE || initmax == FALSE ) + { + initmin = TRUE; + initmax = TRUE; + } i++; + tempbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * 6.28 / 48000); + if(initmin) + { + if(tempbuf[i]<minimum) + minimum = tempbuf[i]; + } + else + minimum = tempbuf[i]; + + if(initmax) + { + if(tempbuf[i]>maximum) + maximum = tempbuf[i]; + }else + maximum = tempbuf[i]; i++; } -localstream->filteredbuf = tempbuf; + + *((int *)localstream->minsamplevalue) = minimum; + *((int *)localstream->maxsamplevalue) = maximum; + localstream->filteredbuf = tempbuf; /******************************************************/ - SetEvent(localstream->threadready); + SetEvent(localstream->threadready); - while (1){OutputDebugStringA("Stream Thread Running.");Sleep(100);}; - /*Clean Stream's data*/ + while (1) + { + OutputDebugStringA("Stream Thread Running."); + Sleep(100); + } + /*Clean Stream's data*/ } long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { - ServerStream * newstream,*localstream; - DWORD dwID; + ServerStream * newstream,*localstream; + DWORD dwID; - /*Add Data to Linked list*/ - localstream = pengine->serverstreamlist; - newstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ServerStream)); - if(newstream == NULL) {goto error;} - if(volume < 0) {newstream->volume = 0;}else if (volume > 1000) {newstream->volume = 1000;}else {newstream->volume = volume;} - if(volume < -1.0) {newstream->volume = -1.0;}else if (volume > 1.0) {newstream->volume = 1.0;}else {newstream->volume = volume;} - newstream->freq = frequency; /*TODO frequency validation required*/ - if(datatype==0 || datatype==1 || datatype==2){newstream->datatype=datatype;}else goto error; - if ((datatype==0 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64 )) || - (datatype==1 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64)) || - (datatype==2 && (bitspersample == 32 || bitspersample == 64)) ) - newstream->bitspersample = bitspersample; /*TODO bitspersample validation*/ - else goto error; + /*Add Data to Linked list*/ + localstream = pengine->serverstreamlist; + newstream = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(ServerStream)); - newstream->channels = channels; /*TODO validation*/ - newstream->channelmask = channelmask; /*TODO validation*/ + if(newstream == NULL) + goto error; - newstream->ready = FALSE; - newstream->length_genuine = 0; - newstream->genuinebuf = NULL; - newstream->length_filtered = 0; - newstream->filteredbuf = NULL; - newstream->minsamplevalue = NULL; - newstream->maxsamplevalue = NULL; - - newstream->next = NULL; - newstream->played = CreateEvent(NULL,FALSE,FALSE,NULL); - newstream->threadready = CreateEvent(NULL,FALSE,FALSE,NULL); + if(volume < 0) + newstream->volume = 0; + else if (volume > 1000) + newstream->volume = 1000; + else + newstream->volume = volume; - if(newstream->played == NULL || newstream->threadready == NULL) {goto error;} - newstream->thread=CreateThread(NULL,0,RunStreamThread,newstream,0,&dwID); - if(newstream->thread == NULL) {goto error;} + if(volume < -1.0) + newstream->volume = -1.0; + else if (volume > 1.0) + newstream->volume = 1.0; + else + newstream->volume = volume; + + newstream->freq = frequency; /*TODO frequency validation required*/ + + if(datatype==0 || datatype==1 || datatype==2) + newstream->datatype=datatype; + else + goto error; + + if ((datatype==0 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64 )) || + (datatype==1 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64)) || + (datatype==2 && (bitspersample == 32 || bitspersample == 64)) ) + newstream->bitspersample = bitspersample; /*TODO bitspersample validation*/ + else + goto error; + + newstream->channels = channels; /*TODO validation*/ + newstream->channelmask = channelmask; /*TODO validation*/ + + newstream->ready = FALSE; + newstream->length_genuine = 0; + newstream->genuinebuf = NULL; + newstream->length_filtered = 0; + newstream->filteredbuf = NULL; + newstream->minsamplevalue = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + bitspersample/8); + + newstream->maxsamplevalue = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + bitspersample/8); + + newstream->next = NULL; + + newstream->played = CreateEvent(NULL, + FALSE, + FALSE, + NULL); + + newstream->threadready = CreateEvent(NULL, + FALSE, + FALSE, + NULL); + + if(newstream->played == NULL || newstream->threadready == NULL) + goto error; + + newstream->thread=CreateThread(NULL, + 0, + RunStreamThread, + newstream, + 0, + &dwID); + + if(newstream->thread == NULL) + goto error; - WaitForSingleObject(newstream->threadready,INFINITE); + WaitForSingleObject(newstream->threadready, + INFINITE); - newstream->streamid=getnewstreamid(); - if(localstream == NULL) - { - pengine->serverstreamlist = newstream; + newstream->streamid=getnewstreamid(); - pengine->masterfreq=frequency; - pengine->masterchannels=channels; - pengine->masterchannelmask=channelmask; - pengine->masterbitspersample=bitspersample; - pengine->masterdatatype = datatype; - } - else - { - while(localstream->next != NULL){localstream = localstream->next;} - localstream->next = newstream; - } - SetEvent(pengine->streampresent); - return newstream->streamid; + if(localstream == NULL) + { + pengine->serverstreamlist = newstream; + pengine->masterfreq=frequency; + pengine->masterchannels=channels; + pengine->masterchannelmask=channelmask; + pengine->masterbitspersample=bitspersample; + pengine->masterdatatype = datatype; + } + else + { + while(localstream->next != NULL) + localstream = localstream->next; + localstream->next = newstream; + } + SetEvent(pengine->streampresent); + return newstream->streamid; error: - printf("Stream Rejected \n"); - HeapFree(GetProcessHeap(), 0, newstream); - return 0; + HeapFree(GetProcessHeap(), 0, newstream); + return 0; } + +/*Dont forget to clean ServerStream's minsamplevalue and maxsamplevalue while removing the stream*/ Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -7,76 +7,114 @@ */ WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) { - long streamid; - if (clientstream == NULL ) return -1; - if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; - /*Validity of all other data will be checked at server*/ - /*Check Connection Status If not connected call Connect()*/ - /*If connected Properly call the remote audsrv_initstream() function*/ + long streamid; - RpcTryExcept + if (clientstream == NULL ) + return -1; + + if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) + return -2; + + /*Validity of all other data will be checked at server*/ + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_initstream() function*/ + + RpcTryExcept { - streamid = AUDInitStream (audsrv_v0_0_c_ifspec,frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); - printf("AUDInitStream Returned %ld",streamid); - if(streamid != 0) {clientstream->stream = streamid;} + streamid = AUDInitStream (audsrv_v0_0_c_ifspec, + frequency, + channels, + bitspersample, + datatype, + channelmask, + volume, + mute, + balance); + + if(streamid != 0) + clientstream->stream = streamid; } RpcExcept(1) { status = RpcExceptionCode(); - printf("Runtime reported exception 0x%lx = %ld\n", status, status); } RpcEndExcept - /*Analyse the return by the function*/ - /*Currently Suppose the return is 0 and a valid streamid is returned*/ - clientstream->ClientEventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); - clientstream->dead = 0; + /*Analyse the return by the function*/ + /*Currently Suppose the return is 0 and a valid streamid is returned*/ + clientstream->ClientEventPool[0]=CreateEvent(NULL, + FALSE, + FALSE, + NULL); - return 0; + clientstream->dead = 0; + + return 0; } WINAPI int playaudio ( ClientStream * clientstream ) { - /*This is an ActiveScheduler*/ - clientstream->callbacks.OpenComplete(0); - while(1) - { - while(WaitForSingleObject(clientstream->ClientEventPool[0],100)!=0){if(clientstream->dead)goto DEAD;} - /*Check Connection Status If not connected call Connect()*/ - /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ - Sleep(1000); - printf("Played a virtual buffer on Virtual Audio Server :) %d\n",clientstream->dead); - clientstream->callbacks.BufferCopied(0); - } - clientstream->callbacks.PlayComplete(0); + /*This is an ActiveScheduler*/ + clientstream->callbacks.OpenComplete(0); + + while(1) + { + while(WaitForSingleObject(clientstream->ClientEventPool[0], + 100)!=0) + { + if(clientstream->dead) + goto DEAD; + } + /*Check Connection Status If not connected call Connect()*/ + /*If connected Properly call the remote audsrv_play() function,This will be a blocking call, placing a dummy wait function here is a good idea.*/ + Sleep(1000); + clientstream->callbacks.BufferCopied(0); + } + clientstream->callbacks.PlayComplete(0); DEAD: -printf("\nAudio Thread Ended\n"); +/*Audio Thread Ended*/ - return 0; + return 0; } + WINAPI int stopaudio (ClientStream * clientstream ) { - /*Server Side termination is remaining*/ - /*If connected Properly call the remote audsrv_stop() function*/ - clientstream->dead = 1; /*Client Side termination*/ + /*Server Side termination is remaining*/ + /*If connected Properly call the remote audsrv_stop() function*/ + clientstream->dead = 1; /*Client Side termination*/ + + return 0; } + WINAPI int Volume(ClientStream * clientstream, int * volume ) { + return 0; } + WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume) { + return 0; } + WINAPI int Write(ClientStream * clientstream ,const char * aData) { - if(clientstream->dead) return -1; - SetEvent(clientstream->ClientEventPool[0]); + if(clientstream->dead) + return -1; + + SetEvent(clientstream->ClientEventPool[0]); + + return 0; } + WINAPI int SetBalance(ClientStream * clientstream ,float balance) { + return 0; } + WINAPI int GetBalance(ClientStream * clientstream ,float * balance) { + return 0; } Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -5,30 +5,42 @@ BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved - ) + ) { - RPC_STATUS status; + RPC_STATUS status; unsigned short * pszStringBinding = NULL; - - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - status = RpcStringBindingComposeW(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); + + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\audsrv", + NULL, + &pszStringBinding); - status = RpcBindingFromStringBindingW(pszStringBinding, &audsrv_v0_0_c_ifspec); + status = RpcBindingFromStringBindingW(pszStringBinding, + &audsrv_v0_0_c_ifspec); - if (status) printf("Connection Problem p %d \n",status); + if (status) + { + /*Connection Problem*/ + } - status = RpcStringFree(&pszStringBinding); + status = RpcStringFree(&pszStringBinding); - if (status) printf("Problem Freeing String : %d \n",status); - break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - status = RpcBindingFree(audsrv_v0_0_c_ifspec); - if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",status); - break; - } - return TRUE; + if (status) + { + /*problem*/ + } + break; + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + status = RpcBindingFree(audsrv_v0_0_c_ifspec); + if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",(int)status); + break; + } + return TRUE; } Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… ============================================================================== --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -8,49 +8,79 @@ void buffercopied (int error ); void playcomplete (int error ); -ClientStream clientstream = {0,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ +ClientStream clientstream = {0, + 0, + {NULL}, + {opencomplete, + buffercopied, + playcomplete} + }; DWORD WINAPI RunAudioThread(LPVOID param) { - ClientStream * localstream = (ClientStream *) param; - printf("Starting Audio Thread \n"); - playaudio(localstream); + ClientStream * localstream = (ClientStream *) param; + playaudio(localstream); + + return 0; } void opencomplete (int error ) { - /*Copy First Buffer and write*/ - Write(&clientstream,"HELLO_RANDOM_STRING"); + /*Copy First Buffer and write*/ + Write(&clientstream, + "HELLO_RANDOM_STRING"); } void buffercopied (int error ) { - Write(&clientstream,"HELLO_RANDOM_STRING"); + Write(&clientstream, + "HELLO_RANDOM_STRING"); } void playcomplete (int error ) { - printf("Play Complete Code %d\n",error); + printf("Play Complete Code %d\n", + error); } int __cdecl wmain(int argc, char* argv[]) { - int error; - DWORD dwID; - HANDLE audiothread; - char input='\0'; - printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); - //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); - error = initstream ( &clientstream , 44100 , 2 , 16 ,0, KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ - if ( error ) - printf("Failed to Initialize Stream.Error %d\n", error); - else - { - printf("StreamID : %ld\n",clientstream.stream); - audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); - } - while ( input != 'a' ) - scanf("%c",&input); - printf("Stoping Audio Stream.\n"); - stopaudio(&clientstream); - WaitForSingleObject(audiothread,INFINITE); + int error; + DWORD dwID; + HANDLE audiothread = NULL; + char input='\0'; + printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); + //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); + + /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ + error = initstream ( &clientstream , + 44100 , + 2 , + 16 , + 0, + KSAUDIO_SPEAKER_STEREO , + 1000 , + 0, + 0.0 ); + + if ( error ) + { + printf("Failed to Initialize Stream.Error %d\n", error); + goto error; + } + else + { + printf("StreamID : %ld\n",clientstream.stream); + audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); + } + + while ( input != 'a' ) + scanf("%c",&input); + + printf("Stoping Audio Stream.\n"); + stopaudio(&clientstream); + WaitForSingleObject(audiothread,INFINITE); + return 0; + +error: + return -1; } Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Mon Jun 6 12:20:41 2011 @@ -10,26 +10,42 @@ typedef struct CallBacks { - void (*OpenComplete) (int error ); - void (*BufferCopied) (int error ); - void (*PlayComplete) (int error ); + void (*OpenComplete) (int error ); + void (*BufferCopied) (int error ); + void (*PlayComplete) (int error ); } CallBacks; typedef struct ClientStream { -long stream; -int dead; -HANDLE ClientEventPool[1]; //0]th event is for Activescheduler -struct CallBacks callbacks; + long stream; + int dead; + HANDLE ClientEventPool[1]; + struct CallBacks callbacks; } ClientStream; /********************API Functions******************/ -WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance); +WINAPI int initstream (ClientStream * clientstream, + LONG frequency, + int channels, + int bitspersample, + int datatype, /*0=signed int,1=unsigned int,2=float*/ + ULONG channelmask, + int volume, + int mute, + float balance); + WINAPI int playaudio ( ClientStream * clientstream); WINAPI int stopaudio (ClientStream * clientstream ); -WINAPI int Volume(ClientStream * clientstream, int * volume ); -WINAPI int SetVolume(ClientStream * clientstream ,const int newvolume); -WINAPI int Write(ClientStream * clientstream ,const char * aData); -WINAPI int SetBalance(ClientStream * clientstream ,float balance); -WINAPI int GetBalance(ClientStream * clientstream ,float * balance); + +WINAPI int Volume(ClientStream * clientstream, + int * volume ); + +WINAPI int SetVolume(ClientStream * clientstream , + const int newvolume); +WINAPI int Write(ClientStream * clientstream , + const char * aData); +WINAPI int SetBalance(ClientStream * clientstream , + float balance); +WINAPI int GetBalance(ClientStream * clientstream , + float * balance); #endif

1 0

[akhaldi] 52114: [CMAKE] * Fix several modules to compile with the recent gcc versions. * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. * Dedicated to dreimer.
by akhaldi＠svn.reactos.org 06 Jun '11

06 Jun '11

Author: akhaldi Date: Mon Jun 6 11:44:58 2011 New Revision: 52114 URL: http://svn.reactos.org/svn/reactos?rev=52114&view=rev Log: [CMAKE] * Fix several modules to compile with the recent gcc versions. * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. * Dedicated to dreimer. Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/sti/CMakeLists.txt trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt trunk/reactos/lib/pseh/CMakeLists.txt Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -44,6 +44,7 @@ rpcrt4 ole32 oleaut32 + msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -114,7 +114,7 @@ set_entrypoint(kernel32 DllMain@12) set_image_base(kernel32 ${baseaddress_kernel32}) -target_link_libraries(kernel32 ${PSEH_LIB}) +target_link_libraries(kernel32 chkstk ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -28,7 +28,7 @@ wine ${PSEH_LIB}) -add_importlibs(lsasrv rpcrt4 kernel32 ntdll) +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) add_dependencies(lsasrv psdk) add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) add_importlib_target(lsasrv.spec) Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -18,7 +18,7 @@ target_link_libraries(msports wine) -add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) +add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) add_importlib_target(msports.spec) Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -36,6 +36,7 @@ oleaut32 rpcrt4 advapi32 + msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -9,8 +9,8 @@ set_entrypoint(ufatx 0) -target_link_libraries(ufatx vfatxlib -lgcc) -add_importlibs(ufatx kernel32 ntdll) +target_link_libraries(ufatx vfatxlib) +add_importlibs(ufatx msvcrt kernel32 ntdll) add_importlib_target(ufatx.spec) add_dependencies(ufatx psdk) add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -17,7 +17,7 @@ wine ${PSEH_LIB}) -add_importlibs(wlanapi rpcrt4 kernel32 ntdll) +add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) add_importlib_target(wlanapi.spec) add_dependencies(wlanapi psdk) Modified: trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/CMakeLi… ============================================================================== --- trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -1,4 +1,8 @@ add_library(vfatxlib fatx.c vfatxlib.c) + +if(NOT MSVC) + target_link_libraries(vfatxlib -lgcc) +endif() + add_dependencies(vfatxlib psdk) - Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 @@ -14,6 +14,7 @@ endif() add_library(pseh ${SOURCE}) + target_link_libraries(pseh chkstk) add_dependencies(pseh psdk) else()

1 0

[akhaldi] 52113: [SYSSETUP] * Make the lengthy strings compatible with the recent gcc preprocessor.
by akhaldi＠svn.reactos.org 06 Jun '11

06 Jun '11

Author: akhaldi Date: Mon Jun 6 11:41:54 2011 New Revision: 52113 URL: http://svn.reactos.org/svn/reactos?rev=52113&view=rev Log: [SYSSETUP] * Make the lengthy strings compatible with the recent gcc preprocessor. Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/syssetup.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu…

1 0

[akhaldi] 52112: [SHELL32] * Make the lengthy strings compatible with the recent gcc preprocessor.
by akhaldi＠svn.reactos.org 06 Jun '11

06 Jun '11

Author: akhaldi Date: Mon Jun 6 11:40:39 2011 New Revision: 52112 URL: http://svn.reactos.org/svn/reactos?rev=52112&view=rev Log: [SHELL32] * Make the lengthy strings compatible with the recent gcc preprocessor. 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/ro-RO.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 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] Mon Jun 6 11:40:39 2011 @@ -656,10 +656,7 @@ IDS_CANTTRASH_TEXT "Ïðåäìåòúò '%1' íå ìîæå äà áúäå èçïðàòåí â êîø÷åòî. Èñêàòå ëè íàïðàâî äà ãî èçòðèåòå?" IDS_OVERWRITEFILE_TEXT "Ïàïêàòà âå÷å ñúäúðæà ôàéë ñ èìå '%1'.\n\nÈñêàòå ëè äà ãî çàìåíèòå?" IDS_OVERWRITEFILE_CAPTION "Ïîòâúðæäàâàíå çàìÿíàòà íà ôàéëà" - IDS_OVERWRITEFOLDER_TEXT "Òàçè ïàïêà âå÷å ñúäúðæà ïàïêà ñ èìå '%1'.\n\n"\ - "Àêî ôàéëîâåòå â öåëåâàòà ïàïêà èìàò ñúùèòå èìåíà êàòî ôàéëîâåòå â\n"\ - "èçáðàíàòà ïàïêà, òå ùå áúäàò çàìåíåíè. Âñå îùå ëè èñêàòå äà ïðåìåñòèòå\n"\ - "èëè ïðåçàïèøåòå ïàïêàòà?" + IDS_OVERWRITEFOLDER_TEXT "Òàçè ïàïêà âå÷å ñúäúðæà ïàïêà ñ èìå '%1'.\n\nÀêî ôàéëîâåòå â öåëåâàòà ïàïêà èìàò ñúùèòå èìåíà êàòî ôàéëîâåòå â\nèçáðàíàòà ïàïêà, òå ùå áúäàò çàìåíåíè. Âñå îùå ëè èñêàòå äà ïðåìåñòèòå\nèëè ïðåçàïèøåòå ïàïêàòà?" // message box strings IDS_RESTART_TITLE "Ïðåçàïóñê" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -643,9 +643,7 @@ IDS_CANTTRASH_TEXT "Poloka '%1' nemùe být pøesunuta do Koe. Chcete ji místo toho smazat?" IDS_OVERWRITEFILE_TEXT "Tato sloka ji obsahuje soubor s názvem '%1'.\n\nChcete jej pøepsat?" IDS_OVERWRITEFILE_CAPTION "Potvrdit pøepsání souboru" - IDS_OVERWRITEFOLDER_TEXT "Tato sloka ji obsahuje sloku s názvem '%1'.\n\n"\ - "Pokud mají soubory v cílové sloce stejné názvy jako soubory ve zvolené\n"\ - "sloce, budou pøepsány. Opravdu chcete pøesunout nebo zkopírovat tuto sloku?" + IDS_OVERWRITEFOLDER_TEXT "Tato sloka ji obsahuje sloku s názvem '%1'.\n\nPokud mají soubory v cílové sloce stejné názvy jako soubory ve zvolené\nsloce, budou pøepsány. Opravdu chcete pøesunout nebo zkopírovat tuto sloku?" /* message box strings */ IDS_RESTART_TITLE "Restartovat" 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] Mon Jun 6 11:40:39 2011 @@ -644,10 +644,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "Overskriv fil %1?" IDS_OVERWRITEFILE_CAPTION "Bekræft overskrivelse af fil" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Genstart" 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] Mon Jun 6 11:40:39 2011 @@ -660,9 +660,7 @@ IDS_CANTTRASH_TEXT "Das Objekt '%1' kann nicht in den Papierkorb verschoben werden. Möchten Sie es stattdessen löschen?" IDS_OVERWRITEFILE_TEXT "Dieser Ordner enthält bereits eine Datei namens '%1'.\n\nWollen Sie diese überschreiben?" IDS_OVERWRITEFILE_CAPTION "Bestätigung: Datei überschreiben" - IDS_OVERWRITEFOLDER_TEXT "Dieser Ordner enthält bereits einen Ordner namens '%1'.\n\n"\ - "Wenn Dateien im Zielordner die gleichen Namen haben, wie Dateien\n"\ - "im gewählten Ordner, werden diese ersetzt. Soll der Vorgang fortgesetzt werden?" + IDS_OVERWRITEFOLDER_TEXT "Dieser Ordner enthält bereits einen Ordner namens '%1'.\n\nWenn Dateien im Zielordner die gleichen Namen haben, wie Dateien\nim gewählten Ordner, werden diese ersetzt. Soll der Vorgang fortgesetzt werden?" /* message box strings */ IDS_RESTART_TITLE "Neu starten" 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] Mon Jun 6 11:40:39 2011 @@ -656,10 +656,7 @@ IDS_CANTTRASH_TEXT "Ôï óôïé÷åßï '%1' äåí ìðïñåß íá ìåôáöåñèåß óôïí êÜäï áíáêýêëùóçò. ÈÝëåôå íá ôï äéáãñÜøåôå;" IDS_OVERWRITEFILE_TEXT "Áõôüò ï öÜêåëïò ðåñéÝ÷åé Þäç Ýíá áñ÷åßï ìå ôï üíïìá '%1'.\n\nÈÝëåôå íá ôï áíôéêáôáóôÞóåôå;" IDS_OVERWRITEFILE_CAPTION "Åðéâåâáßùóç äéáãñáöÞò áñ÷åßïõ" - IDS_OVERWRITEFOLDER_TEXT "Áõôüò ï öÜêåëïò ðåñéÝ÷åé Þäç Ýíáí öÜêåëï ed '%1'.\n\n"\ - "Áí ôá áñ÷åßá óôïí öÜêåëï ðñïïñéóìïý Ý÷ïõí ßäéá ïíüìáôá ìå ôá áñ÷åßá óôïí\n"\ - "åðéëåãìÝíï öÜêåëï èá áíôéêáôáóôáèïýí. Åßóôå óßãïõñïé üôé èÝëåôå íá óõíå÷ßóåôå;\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "Áõôüò ï öÜêåëïò ðåñéÝ÷åé Þäç Ýíáí öÜêåëï ed '%1'.\n\nÁí ôá áñ÷åßá óôïí öÜêåëï ðñïïñéóìïý Ý÷ïõí ßäéá ïíüìáôá ìå ôá áñ÷åßá óôïí\nåðéëåãìÝíï öÜêåëï èá áíôéêáôáóôáèïýí. Åßóôå óßãïõñïé üôé èÝëåôå íá óõíå÷ßóåôå;\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Åðáíåêêßíçóç" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -666,10 +666,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -668,10 +668,7 @@ IDS_CANTTRASH_TEXT "El elemento '%1' no puede ser enviado a la Papelera de reciclaje. ¿En vez de ello ¿Desea borrarlo?" IDS_OVERWRITEFILE_TEXT "Esta carpeta ya contiene un archivo con el nombre '%1'.\n\n¿Desea reemplazar el archivo existente?" IDS_OVERWRITEFILE_CAPTION "Confirmar el reemplazo de archivo" - IDS_OVERWRITEFOLDER_TEXT "Esta carpeta ya contiene una carpeta con el nombre '%1'.\n\n"\ - "Si los archivos de la carpeta existente tienen el mismo nombre que los\n"\ - "archivos de la carpeta que está moviendo o copiando, serán\n"\ - "reemplazados. ¿Desea mover o copiar la carpeta de todas formas?" + IDS_OVERWRITEFOLDER_TEXT "Esta carpeta ya contiene una carpeta con el nombre '%1'.\n\nSi los archivos de la carpeta existente tienen el mismo nombre que los\narchivos de la carpeta que está moviendo o copiando, serán\nreemplazados. ¿Desea mover o copiar la carpeta de todas formas?" /* message box strings */ IDS_RESTART_TITLE "Reiniciar" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Käynnistä uudestaan" 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] Mon Jun 6 11:40:39 2011 @@ -659,10 +659,7 @@ IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer ?" IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer ?" IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" - IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\n"\ - "Si les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\n"\ - "dossier sélectionné, ils seront remplacés. Voulez-vous toujours déplacer ou copier\n"\ - "le dossier?" + IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\nSi les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\ndossier sélectionné, ils seront remplacés. Voulez-vous toujours déplacer ou copier\nle dossier?" /* message box strings */ IDS_RESTART_TITLE "Redémarrer" 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] Mon Jun 6 11:40:39 2011 @@ -658,10 +658,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Állomány felülírása" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Újraindítás" 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] Mon Jun 6 11:40:39 2011 @@ -666,10 +666,7 @@ IDS_CANTTRASH_TEXT "L'elemento '%1' non può essere spostato nel cestino. Volete cancellarlo?" IDS_OVERWRITEFILE_TEXT "Questa cartella contiene già un file con nome '%1'.\n\nVolete sostituirlo?" IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrittura del File" - IDS_OVERWRITEFOLDER_TEXT "Questa cartella contiene già una cartella con nome '%1'.\n\n"\ - "Se i file nella cartella di destinazione hanno gli stessi nomi di quelli della \n"\ - "cartella selezionata saranno sovrascritti. Volete procedere comunque?\n"\ - "" + IDS_OVERWRITEFOLDER_TEXT "Questa cartella contiene già una cartella con nome '%1'.\n\nSe i file nella cartella di destinazione hanno gli stessi nomi di quelli della \ncartella selezionata saranno sovrascritti. Volete procedere comunque?\n" /* message box strings */ IDS_RESTART_TITLE "Riavvia" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "Ú '%1' Í²Ý ÉêÜ¹ñB ãíèÉíµÄàæëµ¢Å·©?" IDS_OVERWRITEFILE_TEXT "±ÌtH_ÉÍùÉt@C'%1'ªÜÜêÄ¢Ü·B\n\nu«·¦Äàæëµ¢Å·©?" IDS_OVERWRITEFILE_CAPTION "t@Cã«ÌmF" - IDS_OVERWRITEFOLDER_TEXT "±ÌtH_ÉÍùÉtH_'%1'ªÜÜêÄ¢Ü·B\n\n"\ - "fBNgtH_àÌt@C¼ªIð³ê½tH_àÌt@C¼\n"\ - "Æ¯¶Íu«·¦çêÜ·B»êÅàAtH_ðÚ®Ü½Í\n"\ - "Rs[µÜ·©?" + IDS_OVERWRITEFOLDER_TEXT "±ÌtH_ÉÍùÉtH_'%1'ªÜÜêÄ¢Ü·B\n\nfBNgtH_àÌt@C¼ªIð³ê½tH_àÌt@C¼\nÆ¯¶Íu«·¦çêÜ·B»êÅàAtH_ðÚ®Ü½Í\nRs[µÜ·©?" /* message box strings */ IDS_RESTART_TITLE "ÄN®" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -658,10 +658,7 @@ IDS_CANTTRASH_TEXT "Elementet «%1» kan ikke legges i papirkurven. Vil du slette det i stedet?" IDS_OVERWRITEFILE_TEXT "Denne mapppen innholder allerede en fil som heter '%1'.\n\nVil du overskrive denne?" IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" - IDS_OVERWRITEFOLDER_TEXT "Denne mappen inneholder allerede en mappe som heter '%1'.\n\n"\ - "Hvis filene i destinasjon mappen har samme navn filer i \n"\ - "valgte mapper her vil bli overskrevet. Ønsker du fortsatt å flytte eller kopiere \n"\ - "denne mappen?" + IDS_OVERWRITEFOLDER_TEXT "Denne mappen inneholder allerede en mappe som heter '%1'.\n\nHvis filene i destinasjon mappen har samme navn filer i \nvalgte mapper her vil bli overskrevet. Ønsker du fortsatt å flytte eller kopiere \ndenne mappen?" /* message box strings */ IDS_RESTART_TITLE "Starte på nytt" 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] Mon Jun 6 11:40:39 2011 @@ -663,10 +663,7 @@ IDS_CANTTRASH_TEXT "Nie mogê przenieæ elementu '%1' do Kosza. Czy chcesz go zamiast tego usun¹æ?" IDS_OVERWRITEFILE_TEXT "Ten folder zawiera ju¿ plik o nazwie '%1'.\n\nCzy chcesz go zast¹piæ?" IDS_OVERWRITEFILE_CAPTION "Potwierd zast¹pienie pliku" - IDS_OVERWRITEFOLDER_TEXT "Ten folder zawiera ju¿ katalog o nazwie '%1'.\n\n"\ - "Je¿eli w docelowym folderze wyst¹pi¹ pliki o takich samych nazwach jak\n"\ - "w wybranym folderze, to zostan¹ one zast¹pione. Czy chcesz mimo to przenieæ\n"\ - "lub skopiowaæ folder?" + IDS_OVERWRITEFOLDER_TEXT "Ten folder zawiera ju¿ katalog o nazwie '%1'.\n\nJe¿eli w docelowym folderze wyst¹pi¹ pliki o takich samych nazwach jak\nw wybranym folderze, to zostan¹ one zast¹pione. Czy chcesz mimo to przenieæ\nlub skopiowaæ folder?" /* message box strings */ IDS_RESTART_TITLE "Uruchom ponownie" 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] Mon Jun 6 11:40:39 2011 @@ -657,10 +657,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Reiniciar" 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] Mon Jun 6 11:40:39 2011 @@ -658,10 +658,7 @@ IDS_CANTTRASH_TEXT "O item '%1' não pode ser enviado para a reciclagem. Em vez disso pretende eliminá-lo?" IDS_OVERWRITEFILE_TEXT "Esta pasta já contém um ficheiro com o nome '%1'.\n\npretende substituí-lo?" IDS_OVERWRITEFILE_CAPTION "Confirmar substituição de ficheiro" - IDS_OVERWRITEFOLDER_TEXT "Esta pasta já contém uma pasta com o nome '%1'.\n\n"\ - "Se os ficheiros na pasta de destino tiverem o mesmo nome dos ficheiros na\n"\ - "pasta seleccionada, serão substituídos. Ainda assim pretende mover ou copiar\n"\ - "a pasta?" + IDS_OVERWRITEFOLDER_TEXT "Esta pasta já contém uma pasta com o nome '%1'.\n\nSe os ficheiros na pasta de destino tiverem o mesmo nome dos ficheiros na\npasta seleccionada, serão substituídos. Ainda assim pretende mover ou copiar\na pasta?" /* message box strings */ IDS_RESTART_TITLE "Reiniciar" Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon Jun 6 11:40:39 2011 @@ -658,10 +658,7 @@ IDS_CANTTRASH_TEXT "Elementul '%1' nu poate fi trimit la gunoi. VreÈi sÄ Ã®l ÈtergeÈi definitiv Ã®n schimb?" IDS_OVERWRITEFILE_TEXT "Acest dosar deja conÈine un fiÈier numit '%1'.\n\nVreÈi sÄ Ã®l Ã®nlocuiÈi" IDS_OVERWRITEFILE_CAPTION "Confirmare Ã®nlocuire fiÈier" - IDS_OVERWRITEFOLDER_TEXT "Acest dosar deja conÈine un sub-dosar cu numele '%1'.\n\n"\ - "DacÄ fiÈierele din dosarul de destinaÈie au acelaÈi nume ca cele din\n"\ - "dosarul selectat, ele vor fi Ã®nlocuite. Sigur vreÈi sÄ copiaÈi sau\n"\ - "mutaÈi dosarul?" + IDS_OVERWRITEFOLDER_TEXT "Acest dosar deja conÈine un sub-dosar cu numele '%1'.\n\nDacÄ fiÈierele din dosarul de destinaÈie au acelaÈi nume ca cele din\ndosarul selectat, ele vor fi Ã®nlocuite. Sigur vreÈi sÄ copiaÈi sau\nmutaÈi dosarul?" /* message box strings */ IDS_RESTART_TITLE "Repornire" 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] Mon Jun 6 11:40:39 2011 @@ -655,9 +655,7 @@ IDS_CANTTRASH_TEXT "Ôàéë '%1' íå ìîæåò áûòü ïîìåùåí â Êîðçèíó. Óäàëèòü áåçâîçâðàòíî?" IDS_OVERWRITEFILE_TEXT "Â ýòîé ïàïêå óæå èìååòñÿ ýëåìåíò '%1'.\n\nÇàìåíèòü åãî?" IDS_OVERWRITEFILE_CAPTION "Ïîäòâåðæäåíèå çàìåíû ôàéëà" - IDS_OVERWRITEFOLDER_TEXT "Ýòà ïàïêà óæå ñîäåðæèò ïàïêó ñ èìåíåì '%1'.\n\n"\ - "Åñëè â ïàïêå ñîäåðæàòñÿ ôàéëû ñ îäèíàêîâûìè èìåíàìè, òî îíè òàê æå áóäóò\n"\ - "çåìåíåíû. Ïðîäîëæèòü?" + IDS_OVERWRITEFOLDER_TEXT "Ýòà ïàïêà óæå ñîäåðæèò ïàïêó ñ èìåíåì '%1'.\n\nÅñëè â ïàïêå ñîäåðæàòñÿ ôàéëû ñ îäèíàêîâûìè èìåíàìè, òî îíè òàê æå áóäóò\nçåìåíåíû. Ïðîäîëæèòü?" /* message box strings */ IDS_RESTART_TITLE "Ïåðåçàãðóçèòü" 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] Mon Jun 6 11:40:39 2011 @@ -661,10 +661,7 @@ IDS_CANTTRASH_TEXT "Poloka '%1' nemôe by odoslaná do koa. Chcete ju namiesto toho vymaza?" IDS_OVERWRITEFILE_TEXT "Tento prieèinok u obsahuje súbor s názvom '%1'.\n\nChcete ho nahradi?" IDS_OVERWRITEFILE_CAPTION "Potvrdenie prepísania súboru" - IDS_OVERWRITEFOLDER_TEXT "Tento prieèinok u obsahuje prieèinok s názvom '%1'.\n\n"\ - "Ak budú ma súbory v cie¾ovom prieèinku rovnaké názvy ako súbory\n"\ - "vo vybranom prieèinku, tak budú nahradené. Stále chcete presunú\n"\ - "alebo skopírova prieèinok?" + IDS_OVERWRITEFOLDER_TEXT "Tento prieèinok u obsahuje prieèinok s názvom '%1'.\n\nAk budú ma súbory v cie¾ovom prieèinku rovnaké názvy ako súbory\nvo vybranom prieèinku, tak budú nahradené. Stále chcete presunú\nalebo skopírova prieèinok?" /* message box strings */ IDS_RESTART_TITLE "Retartova" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart" 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] Mon Jun 6 11:40:39 2011 @@ -655,10 +655,7 @@ IDS_CANTTRASH_TEXT "'%1' adlý öðe çöpe gönderilemiyor. Tamamen silmek ister misiniz?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Dosya Üzerine Yazmayý Onayla" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Yeniden Baþlat" 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] Mon Jun 6 11:40:39 2011 @@ -668,10 +668,7 @@ IDS_CANTTRASH_TEXT "Îá'ºêò '%1' íå ìîæíà ïåðåì³ñòèòè äî êîøèêà. Áàæàºòå âèäàëèòè éîãî?" IDS_OVERWRITEFILE_TEXT "Öÿ ïàïêà âæå ì³ñòèòü ôàéë ç ³ì'ÿì '%1'.\n\nÁàæàºòå çàì³íèòè éîãî?" IDS_OVERWRITEFILE_CAPTION "Ï³äòâåðäæåííÿ Ïåðåçàïèñó Ôàéëó" - IDS_OVERWRITEFOLDER_TEXT "Öÿ ïàïêà âæå ì³ñòèòü ïàïêó ç ³ì'ÿì '%1'.\n\n"\ - "ßêùî ôàéëè â ïàïö³ ïðèçíà÷åííÿ ìàþòü ò³ æ ³ìåíà, ùî ôàéëè ó âèáðàí³é ïàïö³,\n"\ - "âîíè áóäóòü çàì³íåí³. Âè âñå ùå áàæàºòå ïåðåì³ñòèòè àáî\n"\ - "ñêîï³þâàòè ïàïêó?" + IDS_OVERWRITEFOLDER_TEXT "Öÿ ïàïêà âæå ì³ñòèòü ïàïêó ç ³ì'ÿì '%1'.\n\nßêùî ôàéëè â ïàïö³ ïðèçíà÷åííÿ ìàþòü ò³ æ ³ìåíà, ùî ôàéëè ó âèáðàí³é ïàïö³,\nâîíè áóäóòü çàì³íåí³. Âè âñå ùå áàæàºòå ïåðåì³ñòèòè àáî\nñêîï³þâàòè ïàïêó?" /* message box strings */ IDS_RESTART_TITLE "Ïåðåçàâàíòàæèòè" 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] Mon Jun 6 11:40:39 2011 @@ -644,10 +644,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "ÖØÐÂÆô¶¯" 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] Mon Jun 6 11:40:39 2011 @@ -656,10 +656,7 @@ IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" /* message box strings */ IDS_RESTART_TITLE "Restart"

1 0

[akhaldi] 52111: [CRT/STARTUP] * Sync startup code to recent mingw-w64. RosBE 2.0 here we come !
by akhaldi＠svn.reactos.org 06 Jun '11

06 Jun '11

Author: akhaldi Date: Mon Jun 6 10:01:14 2011 New Revision: 52111 URL: http://svn.reactos.org/svn/reactos?rev=52111&view=rev Log: [CRT/STARTUP] * Sync startup code to recent mingw-w64. RosBE 2.0 here we come ! Added: trunk/reactos/lib/sdk/crt/startup/crt_handler.c (with props) trunk/reactos/lib/sdk/crt/startup/pesect.c (with props) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/cinitexe.c trunk/reactos/lib/sdk/crt/startup/crtexe.c trunk/reactos/lib/sdk/crt/startup/gccmain.c trunk/reactos/lib/sdk/crt/startup/gs_support.c trunk/reactos/lib/sdk/crt/startup/merr.c trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c trunk/reactos/lib/sdk/crt/startup/tlssup.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -8,6 +8,7 @@ list(APPEND MSVCRTEX_SOURCE startup/crtexe.c startup/wcrtexe.c + startup/crt_handler.c startup/crtdll.c startup/_newmode.c startup/wildcard.c @@ -18,6 +19,7 @@ startup/merr.c startup/atonexit.c startup/txtmode.c + startup/pesect.c startup/pseudo-reloc.c startup/pseudo-reloc-list.c startup/tlsmcrt.c Modified: trunk/reactos/lib/sdk/crt/startup/cinitexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/cinite… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/cinitexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/cinitexe.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -1,11 +1,12 @@ #include <stdio.h> -#include <internal.h> #include <sect_attribs.h> #ifdef _MSC_VER #pragma comment(linker, "/merge:.CRT=.rdata") #endif +typedef void (__cdecl *_PVFV)(void); + _CRTALLOC(".CRT$XIA") _PVFV __xi_a[] = { NULL }; _CRTALLOC(".CRT$XIZ") _PVFV __xi_z[] = { NULL }; _CRTALLOC(".CRT$XCA") _PVFV __xc_a[] = { NULL }; Added: trunk/reactos/lib/sdk/crt/startup/crt_handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crt_ha… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crt_handler.c (added) +++ trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -1,0 +1,290 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include <windows.h> +#include <excpt.h> +#include <string.h> +#include <stdlib.h> +#include <malloc.h> +#include <memory.h> +#include <signal.h> +#include <stdio.h> + +#if defined (_WIN64) && defined (__ia64__) +#error FIXME: Unsupported __ImageBase implementation. +#else +#ifndef _MSC_VER +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif +/* This symbol is defined by the linker. */ +extern IMAGE_DOS_HEADER __ImageBase; +#endif + +#pragma pack(push,1) +typedef struct _UNWIND_INFO { + BYTE VersionAndFlags; + BYTE PrologSize; + BYTE CountOfUnwindCodes; + BYTE FrameRegisterAndOffset; + ULONG AddressOfExceptionHandler; +} UNWIND_INFO,*PUNWIND_INFO; +#pragma pack(pop) + +PIMAGE_SECTION_HEADER _FindPESectionByName (const char *); +PIMAGE_SECTION_HEADER _FindPESectionExec (size_t); +PBYTE _GetPEImageBase (void); + +int __mingw_init_ehandler (void); +extern void _fpreset (void); + +#ifdef _WIN64 +EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +#define MAX_PDATA_ENTRIES 32 +static RUNTIME_FUNCTION emu_pdata[MAX_PDATA_ENTRIES]; +static UNWIND_INFO emu_xdata[MAX_PDATA_ENTRIES]; + +int +__mingw_init_ehandler (void) +{ + static int was_here = 0; + size_t e = 0; + PIMAGE_SECTION_HEADER pSec; + PBYTE _ImageBase = _GetPEImageBase (); + + if (was_here || !_ImageBase) + return was_here; + was_here = 1; + if (_FindPESectionByName (".pdata") != NULL) + return 1; + + /* Allocate # of e tables and entries. */ + memset (emu_pdata, 0, sizeof (RUNTIME_FUNCTION) * MAX_PDATA_ENTRIES); + memset (emu_xdata, 0, sizeof (UNWIND_INFO) * MAX_PDATA_ENTRIES); + + e = 0; + /* Fill tables and entries. */ + while (e < MAX_PDATA_ENTRIES && (pSec = _FindPESectionExec (e)) != NULL) + { + emu_xdata[e].VersionAndFlags = 9; /* UNW_FLAG_EHANDLER | UNW_VERSION */ + emu_xdata[e].AddressOfExceptionHandler = + (DWORD)(size_t) ((LPBYTE)__mingw_SEH_error_handler - _ImageBase); + emu_pdata[e].BeginAddress = pSec->VirtualAddress; + emu_pdata[e].EndAddress = pSec->VirtualAddress + pSec->Misc.VirtualSize; + emu_pdata[e].UnwindData = + (DWORD)(size_t)((LPBYTE)&emu_xdata[e] - _ImageBase); + ++e; + } +#ifdef _DEBUG_CRT + if (!e || e > MAX_PDATA_ENTRIES) + abort (); +#endif + /* RtlAddFunctionTable. */ + if (e != 0) + RtlAddFunctionTable (emu_pdata, e, (DWORD64)_ImageBase); + return 1; +} + +extern void _fpreset (void); + +EXCEPTION_DISPOSITION +__mingw_SEH_error_handler (struct _EXCEPTION_RECORD* ExceptionRecord, + void *EstablisherFrame __attribute__ ((unused)), + struct _CONTEXT* ContextRecord __attribute__ ((unused)), + void *DispatcherContext __attribute__ ((unused))) +{ + EXCEPTION_DISPOSITION action = ExceptionContinueSearch; /* EXCEPTION_CONTINUE_SEARCH; */ + void (*old_handler) (int); + int reset_fpu = 0; + + switch (ExceptionRecord->ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + /* test if the user has set SIGSEGV */ + old_handler = signal (SIGSEGV, SIG_DFL); + if (old_handler == SIG_IGN) + { + /* this is undefined if the signal was raised by anything other + than raise (). */ + signal (SIGSEGV, SIG_IGN); + action = 0; //EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGSEGV); + action = 0; // EXCEPTION_CONTINUE_EXECUTION; + } + else + action = 4; /* EXCEPTION_EXECUTE_HANDLER; */ + break; + case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_PRIV_INSTRUCTION: + /* test if the user has set SIGILL */ + old_handler = signal (SIGILL, SIG_DFL); + if (old_handler == SIG_IGN) + { + /* this is undefined if the signal was raised by anything other + than raise (). */ + signal (SIGILL, SIG_IGN); + action = 0; // EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGILL); + action = 0; // EXCEPTION_CONTINUE_EXECUTION; + } + else + action = 4; /* EXCEPTION_EXECUTE_HANDLER;*/ + break; + case EXCEPTION_FLT_INVALID_OPERATION: + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + case EXCEPTION_FLT_DENORMAL_OPERAND: + case EXCEPTION_FLT_OVERFLOW: + case EXCEPTION_FLT_UNDERFLOW: + case EXCEPTION_FLT_INEXACT_RESULT: + reset_fpu = 1; + /* fall through. */ + + case EXCEPTION_INT_DIVIDE_BY_ZERO: + /* test if the user has set SIGFPE */ + old_handler = signal (SIGFPE, SIG_DFL); + if (old_handler == SIG_IGN) + { + signal (SIGFPE, SIG_IGN); + if (reset_fpu) + _fpreset (); + action = 0; // EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGFPE); + action = 0; // EXCEPTION_CONTINUE_EXECUTION; + } + break; + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_INT_OVERFLOW: + case EXCEPTION_INVALID_HANDLE: + /*case EXCEPTION_POSSIBLE_DEADLOCK: */ + action = 0; // EXCEPTION_CONTINUE_EXECUTION; + break; + default: + break; + } + return action; +} + +#endif + +LPTOP_LEVEL_EXCEPTION_FILTER __mingw_oldexcpt_handler = NULL; + +long CALLBACK +_gnu_exception_handler (EXCEPTION_POINTERS *exception_data); + +#define GCC_MAGIC (('G' << 16) | ('C' << 8) | 'C' | (1U << 29)) + +long CALLBACK +_gnu_exception_handler (EXCEPTION_POINTERS *exception_data) +{ + void (*old_handler) (int); + long action = EXCEPTION_CONTINUE_SEARCH; + int reset_fpu = 0; + +#ifdef __SEH__ + if ((exception_data->ExceptionRecord->ExceptionCode & 0x20ffffff) == GCC_MAGIC) + { + if ((exception_data->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == 0) + return EXCEPTION_CONTINUE_EXECUTION; + } +#endif + + switch (exception_data->ExceptionRecord->ExceptionCode) + { + case EXCEPTION_ACCESS_VIOLATION: + /* test if the user has set SIGSEGV */ + old_handler = signal (SIGSEGV, SIG_DFL); + if (old_handler == SIG_IGN) + { + /* this is undefined if the signal was raised by anything other + than raise (). */ + signal (SIGSEGV, SIG_IGN); + action = EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGSEGV); + action = EXCEPTION_CONTINUE_EXECUTION; + } + break; + + case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_PRIV_INSTRUCTION: + /* test if the user has set SIGILL */ + old_handler = signal (SIGILL, SIG_DFL); + if (old_handler == SIG_IGN) + { + /* this is undefined if the signal was raised by anything other + than raise (). */ + signal (SIGILL, SIG_IGN); + action = EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGILL); + action = EXCEPTION_CONTINUE_EXECUTION; + } + break; + + case EXCEPTION_FLT_INVALID_OPERATION: + case EXCEPTION_FLT_DIVIDE_BY_ZERO: + case EXCEPTION_FLT_DENORMAL_OPERAND: + case EXCEPTION_FLT_OVERFLOW: + case EXCEPTION_FLT_UNDERFLOW: + case EXCEPTION_FLT_INEXACT_RESULT: + reset_fpu = 1; + /* fall through. */ + + case EXCEPTION_INT_DIVIDE_BY_ZERO: + /* test if the user has set SIGFPE */ + old_handler = signal (SIGFPE, SIG_DFL); + if (old_handler == SIG_IGN) + { + signal (SIGFPE, SIG_IGN); + if (reset_fpu) + _fpreset (); + action = EXCEPTION_CONTINUE_EXECUTION; + } + else if (old_handler != SIG_DFL) + { + /* This means 'old' is a user defined function. Call it */ + (*old_handler) (SIGFPE); + action = EXCEPTION_CONTINUE_EXECUTION; + } + break; +#ifdef _WIN64 + case EXCEPTION_DATATYPE_MISALIGNMENT: + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: + case EXCEPTION_FLT_STACK_CHECK: + case EXCEPTION_INT_OVERFLOW: + case EXCEPTION_INVALID_HANDLE: + /*case EXCEPTION_POSSIBLE_DEADLOCK: */ + action = EXCEPTION_CONTINUE_EXECUTION; + break; +#endif + default: + break; + } + + if (action == EXCEPTION_CONTINUE_SEARCH && __mingw_oldexcpt_handler) + action = (*__mingw_oldexcpt_handler)(exception_data); + return action; +} Propchange: trunk/reactos/lib/sdk/crt/startup/crt_handler.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -20,7 +20,6 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> -#include <intrin.h> #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); @@ -44,11 +43,11 @@ #define SPACECHAR _T(' ') #define DQUOTECHAR _T('\"') -__declspec(dllimport) void __setusermatherr(int (__cdecl *)(struct _exception *)); - extern int * __MINGW_IMP_SYMBOL(_fmode); extern int * __MINGW_IMP_SYMBOL(_commode); +#undef _fmode +extern int _fmode; extern int * __MINGW_IMP_SYMBOL(_commode); #define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; @@ -56,7 +55,7 @@ #if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; #else -int __declspec(selectany) _MINGW_INSTALL_DEBUG_MATHERR = 0; +int _MINGW_INSTALL_DEBUG_MATHERR = 0; #endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -81,8 +80,8 @@ DWORD __mingw_winmain_nShowCmd; static int argc; -#ifdef WPRFLAG extern void __main(void); +#ifdef WPRFLAG static wchar_t **argv; static wchar_t **envp; #else @@ -95,10 +94,10 @@ static int managedapp; static int has_cctor = 0; static _startupinfo startinfo; -static LPTOP_LEVEL_EXCEPTION_FILTER __mingw_oldexcpt_handler = NULL; +extern LPTOP_LEVEL_EXCEPTION_FILTER __mingw_oldexcpt_handler; extern void _pei386_runtime_relocator (void); -static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); +long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); #ifdef WPRFLAG static void duplicate_ppstrings (int ac, wchar_t ***av); #else @@ -108,8 +107,10 @@ static int __cdecl pre_c_init (void); static void __cdecl pre_cpp_init (void); static void __cdecl __mingw_prepare_except_for_msvcr80_and_higher (void); -_CRTALLOC(".CRT$XIAA") _PIFV __declspec(selectany) mingw_pcinit = pre_c_init; -_CRTALLOC(".CRT$XCAA") _PVFV __declspec(selectany) mingw_pcppinit = pre_cpp_init; +_CRTALLOC(".CRT$XIAA") _PIFV mingw_pcinit = pre_c_init; +_CRTALLOC(".CRT$XCAA") _PVFV mingw_pcppinit = pre_cpp_init; + +extern int _MINGW_INSTALL_DEBUG_MATHERR; static int __cdecl pre_c_init (void) @@ -131,11 +132,7 @@ #endif if (_MINGW_INSTALL_DEBUG_MATHERR) { - if (! __defaultmatherr) - { - __setusermatherr (_matherr); - __defaultmatherr = 1; - } + __setusermatherr (_matherr); } if (__globallocalestatus == -1) @@ -162,9 +159,24 @@ int WinMainCRTStartup (void) { + int ret = 255; +#ifdef __SEH__ + asm ("\t.l_startw:\n" + "\t.seh_handler __C_specific_handler, @except\n" + "\t.seh_handlerdata\n" + "\t.long 1\n" + "\t.rva .l_startw, .l_endw, _gnu_exception_handler ,.l_endw\n" + "\t.text" + ); +#endif mingw_app_type = 1; __security_init_cookie (); - return __tmainCRTStartup (); + ret = __tmainCRTStartup (); +#ifdef __SEH__ + asm ("\tnop\n" + "\t.l_endw: nop\n"); +#endif + return ret; } int mainCRTStartup (void); @@ -175,9 +187,24 @@ int mainCRTStartup (void) { + int ret = 255; +#ifdef __SEH__ + asm ("\t.l_start:\n" + "\t.seh_handler __C_specific_handler, @except\n" + "\t.seh_handlerdata\n" + "\t.long 1\n" + "\t.rva .l_start, .l_end, _gnu_exception_handler ,.l_end\n" + "\t.text" + ); +#endif mingw_app_type = 0; __security_init_cookie (); - return __tmainCRTStartup (); + ret = __tmainCRTStartup (); +#ifdef __SEH__ + asm ("\tnop\n" + "\t.l_end: nop\n"); +#endif + return ret; } static @@ -188,7 +215,16 @@ STARTUPINFO StartupInfo; WINBOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); - + +#ifndef _WIN64 + /* We need to make sure that this function is build with frame-pointer + and that we align the stack to 16 bytes for the sake of SSE ops in main + or in functions inlined into main. */ + lpszCommandLine = (_TCHAR *) alloca (32); + memset (lpszCommandLine, 0xcc, 32); + asm __volatile__ ("andl $-16, %%esp" : : : "%esp"); +#endif + if (mingw_app_type) GetStartupInfo (&StartupInfo); { @@ -267,11 +303,11 @@ StartupInfo.wShowWindow : SW_SHOWDEFAULT; } duplicate_ppstrings (argc, &argv); + __main (); #ifdef WPRFLAG __winitenv = envp; /* C++ initialization. gcc inserts this call automatically for a function called main, but not for wmain. */ - __main (); mainret = wmain (argc, argv, envp); #else __initenv = envp; @@ -329,97 +365,6 @@ return 0; } -static long CALLBACK -_gnu_exception_handler (EXCEPTION_POINTERS *exception_data) -{ - void (*old_handler) (int); - long action = EXCEPTION_CONTINUE_SEARCH; - int reset_fpu = 0; - - switch (exception_data->ExceptionRecord->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - /* test if the user has set SIGSEGV */ - old_handler = signal (SIGSEGV, SIG_DFL); - if (old_handler == SIG_IGN) - { - /* this is undefined if the signal was raised by anything other - than raise (). */ - signal (SIGSEGV, SIG_IGN); - action = EXCEPTION_CONTINUE_EXECUTION; - } - else if (old_handler != SIG_DFL) - { - /* This means 'old' is a user defined function. Call it */ - (*old_handler) (SIGSEGV); - action = EXCEPTION_CONTINUE_EXECUTION; - } - break; - - case EXCEPTION_ILLEGAL_INSTRUCTION: - case EXCEPTION_PRIV_INSTRUCTION: - /* test if the user has set SIGILL */ - old_handler = signal (SIGILL, SIG_DFL); - if (old_handler == SIG_IGN) - { - /* this is undefined if the signal was raised by anything other - than raise (). */ - signal (SIGILL, SIG_IGN); - action = EXCEPTION_CONTINUE_EXECUTION; - } - else if (old_handler != SIG_DFL) - { - /* This means 'old' is a user defined function. Call it */ - (*old_handler) (SIGILL); - action = EXCEPTION_CONTINUE_EXECUTION; - } - break; - - case EXCEPTION_FLT_INVALID_OPERATION: - case EXCEPTION_FLT_DIVIDE_BY_ZERO: - case EXCEPTION_FLT_DENORMAL_OPERAND: - case EXCEPTION_FLT_OVERFLOW: - case EXCEPTION_FLT_UNDERFLOW: - case EXCEPTION_FLT_INEXACT_RESULT: - reset_fpu = 1; - /* fall through. */ - - case EXCEPTION_INT_DIVIDE_BY_ZERO: - /* test if the user has set SIGFPE */ - old_handler = signal (SIGFPE, SIG_DFL); - if (old_handler == SIG_IGN) - { - signal (SIGFPE, SIG_IGN); - if (reset_fpu) - _fpreset (); - action = EXCEPTION_CONTINUE_EXECUTION; - } - else if (old_handler != SIG_DFL) - { - /* This means 'old' is a user defined function. Call it */ - (*old_handler) (SIGFPE); - action = EXCEPTION_CONTINUE_EXECUTION; - } - break; -#ifdef _WIN64 - case EXCEPTION_DATATYPE_MISALIGNMENT: - case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: - case EXCEPTION_FLT_STACK_CHECK: - case EXCEPTION_INT_OVERFLOW: - case EXCEPTION_INVALID_HANDLE: - /*case EXCEPTION_POSSIBLE_DEADLOCK: */ - action = EXCEPTION_CONTINUE_EXECUTION; - break; -#endif - default: - break; - } - - if (action == EXCEPTION_CONTINUE_SEARCH && __mingw_oldexcpt_handler) - action = (*__mingw_oldexcpt_handler)(exception_data); - return action; -} - #ifdef WPRFLAG static size_t wbytelen(const wchar_t *p) { Modified: trunk/reactos/lib/sdk/crt/startup/gccmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/gccmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/gccmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/gccmain.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -11,13 +11,6 @@ typedef void (*func_ptr) (void); extern func_ptr __CTOR_LIST__[]; extern func_ptr __DTOR_LIST__[]; - -static HMODULE hMsvcrt = NULL; -static int free_Msvcrt = 0; - -typedef void __cdecl flongjmp(jmp_buf _Buf,int _Value); - -flongjmp *fctMsvcrtLongJmp = NULL; void __do_global_dtors (void); void __do_global_ctors (void); @@ -33,12 +26,6 @@ (*(p)) (); p++; } - if (free_Msvcrt && hMsvcrt) - { - free_Msvcrt = 0; - FreeLibrary (hMsvcrt); - hMsvcrt = NULL; - } } void @@ -46,19 +33,6 @@ { unsigned long nptrs = (unsigned long) (ptrdiff_t) __CTOR_LIST__[0]; unsigned long i; - - if (!hMsvcrt) { - hMsvcrt = GetModuleHandleA ("msvcr80.dll"); - if (!hMsvcrt) - hMsvcrt = GetModuleHandleA ("msvcr70.dll"); - if (!hMsvcrt) - hMsvcrt = GetModuleHandleA ("msvcrt.dll"); - if (!hMsvcrt) { - hMsvcrt = LoadLibraryA ("msvcrt.dll"); - free_Msvcrt = 1; - } - fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); - } if (nptrs == (unsigned long) -1) { Modified: trunk/reactos/lib/sdk/crt/startup/gs_support.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/gs_sup… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/gs_support.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/gs_support.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -23,11 +23,6 @@ #endif /* Externals. */ -#ifdef _WIN64 -PRUNTIME_FUNCTION RtlLookupFunctionEntry (ULONG64, PULONG64, PVOID); -PVOID RtlVirtualUnwind (ULONG HandlerType, ULONG64, ULONG64, PRUNTIME_FUNCTION, - PCONTEXT, PVOID *, PULONG64, PVOID); -#endif typedef LONG NTSTATUS; /* same as in ntdef.h / winternl.h */ Modified: trunk/reactos/lib/sdk/crt/startup/merr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/merr.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/merr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/merr.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -9,6 +9,31 @@ #include <stdio.h> int __defaultmatherr = 0; + +typedef int (__cdecl *fUserMathErr)(struct _exception *); +static fUserMathErr stUserMathErr; + +void __mingw_raise_matherr (int typ, const char *name, double a1, double a2, + double rslt) +{ + struct _exception ex; + if (!stUserMathErr) + return; + ex.type = typ; + ex.name = name; + ex.arg1 = a1; + ex.arg2 = a2; + ex.retval = rslt; + (*stUserMathErr)(&ex); +} + +#undef __setusermatherr + +void __mingw_setusermatherr (int (__cdecl *f)(struct _exception *)) +{ + stUserMathErr = f; + __setusermatherr (f); +} int __CRTDECL _matherr (struct _exception *pexcept) @@ -50,3 +75,4 @@ type, pexcept->name, pexcept->arg1, pexcept->arg2, pexcept->retval); return 0; } + Added: trunk/reactos/lib/sdk/crt/startup/pesect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/pesect… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/pesect.c (added) +++ trunk/reactos/lib/sdk/crt/startup/pesect.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -1,0 +1,186 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include <windows.h> +#include <string.h> + +#if defined (_WIN64) && defined (__ia64__) +#error FIXME: Unsupported __ImageBase implementation. +#else +/* Hack, for bug in ld. Will be removed soon. */ +#ifndef _MSC_VER +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +#endif +/* This symbol is defined by the linker. */ +extern IMAGE_DOS_HEADER __ImageBase; +#endif + +WINBOOL _ValidateImageBase (PBYTE); + +WINBOOL +_ValidateImageBase (PBYTE pImageBase) +{ + PIMAGE_DOS_HEADER pDOSHeader; + PIMAGE_NT_HEADERS pNTHeader; + PIMAGE_OPTIONAL_HEADER pOptHeader; + + pDOSHeader = (PIMAGE_DOS_HEADER) pImageBase; + if (pDOSHeader->e_magic != IMAGE_DOS_SIGNATURE) + return FALSE; + pNTHeader = (PIMAGE_NT_HEADERS) ((PBYTE) pDOSHeader + pDOSHeader->e_lfanew); + if (pNTHeader->Signature != IMAGE_NT_SIGNATURE) + return FALSE; + pOptHeader = (PIMAGE_OPTIONAL_HEADER) &pNTHeader->OptionalHeader; + if (pOptHeader->Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) + return FALSE; + return TRUE; +} + +PIMAGE_SECTION_HEADER _FindPESection (PBYTE, DWORD_PTR); + +PIMAGE_SECTION_HEADER +_FindPESection (PBYTE pImageBase, DWORD_PTR rva) +{ + PIMAGE_NT_HEADERS pNTHeader; + PIMAGE_SECTION_HEADER pSection; + unsigned int iSection; + + pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); + + for (iSection = 0, pSection = IMAGE_FIRST_SECTION (pNTHeader); + iSection < pNTHeader->FileHeader.NumberOfSections; + ++iSection,++pSection) + { + if (rva >= pSection->VirtualAddress + && rva < pSection->VirtualAddress + pSection->Misc.VirtualSize) + return pSection; + } + return NULL; +} + +PIMAGE_SECTION_HEADER _FindPESectionByName (const char *); + +PIMAGE_SECTION_HEADER +_FindPESectionByName (const char *pName) +{ + PBYTE pImageBase; + PIMAGE_NT_HEADERS pNTHeader; + PIMAGE_SECTION_HEADER pSection; + unsigned int iSection; + + /* Long names aren't supported. */ + if (strlen (pName) > IMAGE_SIZEOF_SHORT_NAME) + return NULL; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + + pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); + + for (iSection = 0, pSection = IMAGE_FIRST_SECTION (pNTHeader); + iSection < pNTHeader->FileHeader.NumberOfSections; + ++iSection,++pSection) + { + if (!strncmp ((char *) &pSection->Name[0], pName, IMAGE_SIZEOF_SHORT_NAME)) + return pSection; + } + return NULL; +} + +int __mingw_GetSectionCount (void); +PIMAGE_SECTION_HEADER __mingw_GetSectionForAddress (LPVOID p); + +PIMAGE_SECTION_HEADER +__mingw_GetSectionForAddress (LPVOID p) +{ + PBYTE pImageBase; + DWORD_PTR rva; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + + rva = (DWORD_PTR) (((PBYTE) p) - pImageBase); + return _FindPESection (pImageBase, rva); +} + +int +__mingw_GetSectionCount (void) +{ + PBYTE pImageBase; + PIMAGE_NT_HEADERS pNTHeader; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return 0; + + pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); + + return (int) pNTHeader->FileHeader.NumberOfSections; +} + + +PIMAGE_SECTION_HEADER _FindPESectionExec (size_t); + +PIMAGE_SECTION_HEADER +_FindPESectionExec (size_t eNo) +{ + PBYTE pImageBase; + PIMAGE_NT_HEADERS pNTHeader; + PIMAGE_SECTION_HEADER pSection; + unsigned int iSection; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + + pNTHeader = (PIMAGE_NT_HEADERS) (pImageBase + ((PIMAGE_DOS_HEADER) pImageBase)->e_lfanew); + + for (iSection = 0, pSection = IMAGE_FIRST_SECTION (pNTHeader); + iSection < pNTHeader->FileHeader.NumberOfSections; + ++iSection,++pSection) + { + if ((pSection->Characteristics & IMAGE_SCN_MEM_EXECUTE) != 0) + { + if (!eNo) + return pSection; + --eNo; + } + } + return NULL; +} + +PBYTE _GetPEImageBase (void); + +PBYTE +_GetPEImageBase (void) +{ + PBYTE pImageBase; + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return NULL; + return pImageBase; +} + +WINBOOL _IsNonwritableInCurrentImage (PBYTE); + +WINBOOL +_IsNonwritableInCurrentImage (PBYTE pTarget) +{ + PBYTE pImageBase; + DWORD_PTR rvaTarget; + PIMAGE_SECTION_HEADER pSection; + + pImageBase = (PBYTE) &__ImageBase; + if (! _ValidateImageBase (pImageBase)) + return FALSE; + rvaTarget = pTarget - pImageBase; + pSection = _FindPESection (pImageBase, rvaTarget); + if (pSection == NULL) + return FALSE; + return (pSection->Characteristics & IMAGE_SCN_MEM_WRITE) == 0; +} Propchange: trunk/reactos/lib/sdk/crt/startup/pesect.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/pseudo… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -158,6 +158,87 @@ #endif } +/* For mingw-w64 we have additional helpers to get image information + on runtime. This allows us to cache for pseudo-relocation pass + the temporary access of code/read-only sections. + This step speeds up pseudo-relocation pass. */ +#ifdef __MINGW64_VERSION_MAJOR +extern int __mingw_GetSectionCount (void); +extern PIMAGE_SECTION_HEADER __mingw_GetSectionForAddress (LPVOID p); +extern PBYTE _GetPEImageBase (void); + +typedef struct sSecInfo { + /* Keeps altered section flags, or zero if nothing was changed. */ + DWORD old_protect; + PBYTE sec_start; + PIMAGE_SECTION_HEADER hash; +} sSecInfo; + +static sSecInfo *the_secs = NULL; +static int maxSections = 0; + +static void +mark_section_writable (LPVOID addr) +{ + MEMORY_BASIC_INFORMATION b; + PIMAGE_SECTION_HEADER h; + int i; + + for (i = 0; i < maxSections; i++) + { + if (the_secs[i].sec_start <= ((LPBYTE) addr) + && ((LPBYTE) addr) < (the_secs[i].sec_start + the_secs[i].hash->Misc.VirtualSize)) + return; + } + h = __mingw_GetSectionForAddress (addr); + if (!h) + { + __report_error ("Address %p has no image-section", addr); + return; + } + the_secs[i].hash = h; + the_secs[i].old_protect = 0; + the_secs[i].sec_start = _GetPEImageBase () + h->VirtualAddress; + + if (!VirtualQuery (the_secs[i].sec_start, &b, sizeof(b))) + { + __report_error (" VirtualQuery failed for %d bytes at address %p", + (int) h->Misc.VirtualSize, the_secs[i].sec_start); + return; + } + + if (b.Protect != PAGE_EXECUTE_READWRITE && b.Protect != PAGE_READWRITE) + VirtualProtect (b.BaseAddress, b.RegionSize, PAGE_EXECUTE_READWRITE, + &the_secs[i].old_protect); + ++maxSections; + return; +} + +static void +restore_modified_sections (void) +{ + int i; + MEMORY_BASIC_INFORMATION b; + DWORD oldprot; + + for (i = 0; i < maxSections; i++) + { + if (the_secs[i].old_protect == 0) + continue; + if (!VirtualQuery (the_secs[i].sec_start, &b, sizeof(b))) + { + __report_error (" VirtualQuery failed for %d bytes at address %p", + (int) the_secs[i].hash->Misc.VirtualSize, + the_secs[i].sec_start); + return; + } + VirtualProtect (b.BaseAddress, b.RegionSize, the_secs[i].old_protect, + &oldprot); + } +} + +#endif /* __MINGW64_VERSION_MAJOR */ + /* This function temporarily marks the page containing addr * writable, before copying len bytes from *src to *addr, and * then restores the original protection settings to the page. @@ -174,12 +255,15 @@ static void __write_memory (void *addr, const void *src, size_t len) { +#ifndef __MINGW64_VERSION_MAJOR MEMORY_BASIC_INFORMATION b; DWORD oldprot; +#endif /* ! __MINGW64_VERSION_MAJOR */ if (!len) return; +#ifndef __MINGW64_VERSION_MAJOR if (!VirtualQuery (addr, &b, sizeof(b))) { __report_error (" VirtualQuery failed for %d bytes at address %p", @@ -189,12 +273,18 @@ /* Temporarily allow write access to read-only protected memory. */ if (b.Protect != PAGE_EXECUTE_READWRITE && b.Protect != PAGE_READWRITE) VirtualProtect (b.BaseAddress, b.RegionSize, PAGE_EXECUTE_READWRITE, - &oldprot); + &oldprot); +#else /* ! __MINGW64_VERSION_MAJOR */ + mark_section_writable ((LPVOID) addr); +#endif /* __MINGW64_VERSION_MAJOR */ + /* write the data. */ memcpy (addr, src, len); /* Restore original protection. */ +#ifndef __MINGW64_VERSION_MAJOR if (b.Protect != PAGE_EXECUTE_READWRITE && b.Protect != PAGE_READWRITE) VirtualProtect (b.BaseAddress, b.RegionSize, oldprot, &oldprot); +#endif /* !__MINGW64_VERSION_MAJOR */ } #define RP_VERSION_V1 0 @@ -361,10 +451,23 @@ _pei386_runtime_relocator (void) { static NO_COPY int was_init = 0; +#ifdef __MINGW64_VERSION_MAJOR + int mSecs; +#endif /* __MINGW64_VERSION_MAJOR */ + if (was_init) return; ++was_init; +#ifdef __MINGW64_VERSION_MAJOR + mSecs = __mingw_GetSectionCount (); + the_secs = (sSecInfo *) alloca (sizeof (sSecInfo) * (size_t) mSecs); + maxSections = 0; +#endif /* __MINGW64_VERSION_MAJOR */ + do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &__ImageBase); -} + &__MINGW_LSYMBOL(_image_base__)); +#ifdef __MINGW64_VERSION_MAJOR + restore_modified_sections (); +#endif /* __MINGW64_VERSION_MAJOR */ +} Modified: trunk/reactos/lib/sdk/crt/startup/tlssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/tlssup… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/tlssup.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/tlssup.c [iso-8859-1] Mon Jun 6 10:01:14 2011 @@ -50,18 +50,11 @@ _CRTALLOC(".CRT$XLA") PIMAGE_TLS_CALLBACK __xl_a = 0; _CRTALLOC(".CRT$XLZ") PIMAGE_TLS_CALLBACK __xl_z = 0; -#ifdef _WIN64 -_CRTALLOC(".tls") const IMAGE_TLS_DIRECTORY64 _tls_used = { - (ULONGLONG) &_tls_start+1, (ULONGLONG) &_tls_end, (ULONGLONG) &_tls_index, - (ULONGLONG) (&__xl_a+1), (ULONG) 0, (ULONG) 0 -}; -#else _CRTALLOC(".tls") const IMAGE_TLS_DIRECTORY _tls_used = { - (ULONG)(ULONG_PTR) &_tls_start+1, (ULONG)(ULONG_PTR) &_tls_end, - (ULONG)(ULONG_PTR) &_tls_index, (ULONG)(ULONG_PTR) (&__xl_a+1), + (ULONG_PTR) &_tls_start+1, (ULONG_PTR) &_tls_end, + (ULONG_PTR) &_tls_index, (ULONG_PTR) (&__xl_a+1), (ULONG) 0, (ULONG) 0 }; -#endif #ifndef __CRT_THREAD #ifdef HAVE_ATTRIBUTE_THREAD @@ -99,6 +92,7 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { _PVFV *pfunc; + uintptr_t ps; #ifndef _WIN64 if (_winmajor < 4) @@ -135,8 +129,11 @@ return TRUE; } - for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc) - { + ps = (uintptr_t) &__xd_a; + ps += sizeof (uintptr_t); + for ( ; ps != (uintptr_t) &__xd_z; ps += sizeof (uintptr_t)) + { + pfunc = (_PVFV *) ps; if (*pfunc != NULL) (*pfunc)(); }

1 0

[tkreuzer] 52110: [SPEC2DEF] - Fix build of importlibraries on MSVC / amd64
by tkreuzer＠svn.reactos.org 06 Jun '11

06 Jun '11

Author: tkreuzer Date: Mon Jun 6 09:58:58 2011 New Revision: 52110 URL: http://svn.reactos.org/svn/reactos?rev=52110&view=rev Log: [SPEC2DEF] - Fix build of importlibraries on MSVC / amd64 Modified: trunk/reactos/msc.cmake trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=52110&r1=521… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Mon Jun 6 09:58:58 2011 @@ -24,6 +24,9 @@ if(${ARCH} MATCHES amd64) add_definitions(-D__x86_64) + set(SPEC2DEF_ARCH x86_64) +else() + set(SPEC2DEF_ARCH i386) endif() link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/sdk/crt) @@ -130,7 +133,7 @@ # Generate the asm stub file and the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def --ms --kill-at -r -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -r -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) # Assemble the stub file @@ -149,7 +152,7 @@ # Build the importlib add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - COMMAND LINK /LIB /NOLOGO /MACHINE:X86 /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries} + COMMAND LINK /LIB /NOLOGO /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def) # Add the importlib target @@ -174,7 +177,7 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c - COMMAND native-spec2def --ms --kill-at -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c PROPERTIES GENERATED TRUE) Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Mon Jun 6 09:58:58 2011 @@ -10,7 +10,7 @@ typedef struct { char *pcName; - int nNameLength; + size_t nNameLength; char *pcRedirection; int nRedirectionLength; int nCallingConvention; @@ -21,11 +21,21 @@ unsigned int uFlags; } EXPORT; +enum _ARCH +{ + ARCH_X86, + ARCH_AMD64, + ARCH_IA64, + ARCH_ARM, + ARCH_PPC +}; + typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbKillAt = 0; int gbUseDeco = 0; int gbMSComp = 0; int no_redirections = 0; +int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; char *pszDllName = 0; @@ -151,7 +161,7 @@ (pexp->uFlags & FL_STUB) == 0) return 0; fprintf(file, "int "); - if (strcmp(pszArchString, "i386") == 0 && + if ((giArch == ARCH_X86) && pexp->nCallingConvention == CC_STDCALL) { fprintf(file, "__stdcall "); @@ -218,8 +228,12 @@ void OutputHeader_asmstub(FILE *file, char *libname) { - fprintf(file, "; File generated automatically, do not edit! \n\n" - ".586\n.model flat\n.code\n"); + fprintf(file, "; File generated automatically, do not edit! \n\n"); + + if (giArch == ARCH_X86) + fprintf(file, ".586\n.model flat\n"); + + fprintf(file, ".code\n"); } int @@ -230,6 +244,12 @@ { fprintf(fileDest, "PUBLIC ordinal%d\nordinal%d: nop\n", pexp->nOrdinal, pexp->nOrdinal); + } + else if (giArch == ARCH_AMD64) + { + fprintf(fileDest, "PUBLIC %.*s\n%.*s: nop\n", + pexp->nNameLength, pexp->pcName, + pexp->nNameLength, pexp->pcName); } else if (pexp->nCallingConvention == CC_STDCALL) { @@ -274,7 +294,7 @@ PrintName(FILE *fileDest, EXPORT *pexp, int fRedir, int fDeco) { char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; - int nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; + size_t nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; if (fDeco && pexp->nCallingConvention == CC_FASTCALL) fprintf(fileDest, "@"); @@ -450,7 +470,7 @@ } else if (CompareToken(pc, "-i386")) { - if (strcasecmp(pszArchString, "i386") != 0) included = 0; + if (giArch == ARCH_X86) included = 0; } else if (CompareToken(pc, "-private")) { @@ -572,7 +592,7 @@ { /* Check for stdcall name */ char *p = strchr(pc, '@'); - if (p && (p - pc < exp.nNameLength)) + if (p && ((size_t)(p - pc) < exp.nNameLength)) { int i; exp.nNameLength = p - pc; @@ -694,15 +714,20 @@ } } - if ((strcasecmp(pszArchString, "x86_64") == 0) || - (strcasecmp(pszArchString, "ia64") == 0)) + if (strcasecmp(pszArchString, "i386") == 0) giArch = ARCH_X86; + else if (strcasecmp(pszArchString, "x86_64") == 0) giArch = ARCH_AMD64; + else if (strcasecmp(pszArchString, "ia64") == 0) giArch = ARCH_IA64; + else if (strcasecmp(pszArchString, "arm") == 0) giArch = ARCH_ARM; + else if (strcasecmp(pszArchString, "ppc") == 0) giArch = ARCH_PPC; + + if ((giArch == ARCH_AMD64) || (giArch = ARCH_IA64)) { pszArchString2 = "win64"; } else pszArchString2 = "win32"; - if (strcasecmp(pszArchString, "i386") == 0) + if (giArch == ARCH_X86) { gbUseDeco = 1; } @@ -711,7 +736,7 @@ if (!pszDllName) { char *p1, *p2; - int len; + size_t len; p1 = strrchr(argv[i], '\\'); if (!p1) p1 = strrchr(argv[i], '/');

1 0

[cgutman] 52109: [WININET_WINETEST] - Update to wine 1.3.21
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 23:17:36 2011 New Revision: 52109 URL: http://svn.reactos.org/svn/reactos?rev=52109&view=rev Log: [WININET_WINETEST] - Update to wine 1.3.21 Modified: trunk/rostests/winetests/wininet/CMakeLists.txt trunk/rostests/winetests/wininet/ftp.c trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/internet.c trunk/rostests/winetests/wininet/url.c trunk/rostests/winetests/wininet/urlcache.c trunk/rostests/winetests/wininet/wininet.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… Modified: trunk/rostests/winetests/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/ftp.c?r… Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… Modified: trunk/rostests/winetests/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/interne… Modified: trunk/rostests/winetests/wininet/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/url.c?r… Modified: trunk/rostests/winetests/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/urlcach… Modified: trunk/rostests/winetests/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/wininet…

1 0

[cgutman] 52108: - Add forgotten language files
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 23:13:47 2011 New Revision: 52108 URL: http://svn.reactos.org/svn/reactos?rev=52108&view=rev Log: - Add forgotten language files Added: trunk/reactos/dll/win32/wininet/wininet_Eo.rc (with props) trunk/reactos/dll/win32/wininet/wininet_He.rc (with props) trunk/reactos/dll/win32/wininet/wininet_Sr.rc (with props) Added: trunk/reactos/dll/win32/wininet/wininet_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Eo.rc (added) +++ trunk/reactos/dll/win32/wininet/wininet_Eo.rc [iso-8859-1] Sun Jun 5 23:13:47 2011 @@ -1,0 +1,43 @@ +/* + * Wininet Resources - Esperanto Language Support + * + * Copyright 2006 Antonio Codazzi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Enmetu Retan Pasvorton" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Enmetu uzantonomon kaj pasvorton:", -1, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Realm", -1, 40, 46, 50, 10 + LTEXT "Uzanto", -1, 40, 66, 50, 10 + LTEXT "Pasvorto", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Storu pasvorton ( RISKE! )", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Bone", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Rezigni", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/wininet/wininet_Eo.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wininet/wininet_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_He.rc (added) +++ trunk/reactos/dll/win32/wininet/wininet_He.rc [iso-8859-1] Sun Jun 5 23:13:47 2011 @@ -1,0 +1,79 @@ +/* + * Copyright 2003 Mike McCormack for CodeWeavers + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "××× ×ª ×¡×¡××ª ××¨×©×ª" +FONT 8, "MS Shell Dlg" +{ + LTEXT "× × ××××× ××ª ×©× ×××©×ª××© ×××ª ××¡×¡×× ×©××:", -1, 40, 6, 150, 15 + LTEXT "××ª×××", -1, 40, 26, 50, 10 + LTEXT "×ª×××", -1, 40, 46, 50, 10 + LTEXT "××©×ª××©", -1, 40, 66, 50, 10 + LTEXT "×¡×¡××", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&×©×××¨×ª ×¡×¡×× ×× (×× ××××××)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "×××©××¨", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "×××××", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "× ××¨×© ×××××ª" +FONT 8, "MS Shell Dlg" +{ + LTEXT "× × ××××× ××ª ×©× ×××©×ª××© ×××ª ××¡×¡×× ×©××:", -1, 40, 6, 150, 15 + LTEXT "×©×¨×ª", -1, 40, 26, 50, 10 + LTEXT "×ª×××", -1, 40, 46, 50, 10 + LTEXT "×©× ××©×ª××©", -1, 40, 66, 50, 10 + LTEXT "×¡×¡××", -1, 40, 86, 50, 10 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&×©×××¨×ª ×¡×¡×× ×× (×× ××××××)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "×××©××¨", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "×××××", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "××××¨×ª ×××××" +FONT 8, "MS Shell Dlg" +{ + LTEXT "×××¨×¢× ×ª×§×× ×¢× ××××©××¨ ×××ª×¨ ××.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "××× ××¨×¦×× × ××××©×× ××× ×××ª?", -1, 40, 46, 200, 20 + PUSHBUTTON "××", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "××", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/wininet/wininet_He.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/wininet/wininet_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_Sr.rc (added) +++ trunk/reactos/dll/win32/wininet/wininet_Sr.rc [iso-8859-1] Sun Jun 5 23:13:47 2011 @@ -1,0 +1,106 @@ +/* + * Copyright 2003 Mike McCormack for CodeWeavers + * Copyright 2010 ÄorÄe VasiljeviÄ + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ð£Ð½Ð¾Ñ Ð¼ÑÐµÐ¶Ð½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ð£Ð½ÐµÑÐ¸ÑÐµ ÑÐ²Ð¾ÑÐµ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ:", -1, 40, 6, 150, 15 + LTEXT "ÐÐ¾ÑÑÐµÐ´Ð½Ð¸Ðº", -1, 40, 26, 50, 10 + LTEXT "ÐÐ¾Ð¼ÐµÐ½", -1, 40, 46, 50, 10 + LTEXT "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ Ð¸Ð¼Ðµ", -1, 40, 66, 50, 10 + LTEXT "ÐÐ¾Ð·Ð¸Ð½ÐºÐ°", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Ð¡Ð°ÑÑÐ²Ð°Ñ Ð¾Ð²Ñ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ (Ð½ÐµÐ±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ð£ ÑÐµÐ´Ñ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÑÐºÐ°Ð¶Ð¸", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÐÐ¾ÑÐ²ÑÐ´Ð° Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐµÑÐ°" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ð£Ð½ÐµÑÐ¸ÑÐµ ÑÐ²Ð¾ÑÐµ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ Ð¸Ð¼Ðµ Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ:", -1, 40, 6, 150, 15 + LTEXT "Ð¡ÐµÑÐ²ÐµÑ", -1, 40, 26, 50, 10 + LTEXT "ÐÐ¾Ð¼ÐµÐ½", -1, 40, 46, 50, 10 + LTEXT "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ¾ Ð¸Ð¼Ðµ", -1, 40, 66, 50, 10 + LTEXT "ÐÐ¾Ð·Ð¸Ð½ÐºÐ°", -1, 40, 86, 50, 10 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Ð¡Ð°ÑÑÐ²Ð°Ñ Ð¾Ð²Ñ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ (Ð½ÐµÐ±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ð£ ÑÐµÐ´Ñ", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÑÐºÐ°Ð¶Ð¸", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Unos mreÅ¾ne lozinke" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Unesite svoje korisniÄko ime i lozinku:", -1, 40, 6, 150, 15 + LTEXT "Posrednik", -1, 40, 26, 50, 10 + LTEXT "Domen", -1, 40, 46, 50, 10 + LTEXT "KorisniÄko ime", -1, 40, 66, 50, 10 + LTEXT "Lozinka", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&SaÄuvaj ovu lozinku (nebezbedno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "OtkaÅ¾i", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Potvrda identiteta" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Unesite svoje korisniÄko ime i lozinku:", -1, 40, 6, 150, 15 + LTEXT "Server", -1, 40, 26, 50, 10 + LTEXT "Domen", -1, 40, 46, 50, 10 + LTEXT "KorisniÄko ime", -1, 40, 66, 50, 10 + LTEXT "Lozinka", -1, 40, 86, 50, 10 + LTEXT "", IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&SaÄuvaj ovu lozinku (nebezbedno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "OtkaÅ¾i", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/wininet/wininet_Sr.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 52107: [WININET] - Sync to wine 1.3.21 [PSDK] - Update headers from sync
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 23:11:41 2011 New Revision: 52107 URL: http://svn.reactos.org/svn/reactos?rev=52107&view=rev Log: [WININET] - Sync to wine 1.3.21 [PSDK] - Update headers from sync Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/resource.h trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet_Bg.rc trunk/reactos/dll/win32/wininet/wininet_Cs.rc trunk/reactos/dll/win32/wininet/wininet_Da.rc trunk/reactos/dll/win32/wininet/wininet_De.rc trunk/reactos/dll/win32/wininet/wininet_En.rc trunk/reactos/dll/win32/wininet/wininet_Es.rc trunk/reactos/dll/win32/wininet/wininet_Fi.rc trunk/reactos/dll/win32/wininet/wininet_Fr.rc trunk/reactos/dll/win32/wininet/wininet_Hu.rc trunk/reactos/dll/win32/wininet/wininet_It.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Lt.rc trunk/reactos/dll/win32/wininet/wininet_Nl.rc trunk/reactos/dll/win32/wininet/wininet_No.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/dll/win32/wininet/wininet_Pt.rc trunk/reactos/dll/win32/wininet/wininet_Ro.rc trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Sv.rc trunk/reactos/dll/win32/wininet/wininet_Tr.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_Zh.rc trunk/reactos/dll/win32/wininet/wininet_ros.diff trunk/reactos/include/psdk/winhttp.h trunk/reactos/include/psdk/wininet.h trunk/reactos/include/psdk/winineti.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/resource… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/include/psdk/winhttp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winhttp.h?rev… Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… Modified: trunk/reactos/include/psdk/winineti.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winineti.h?re…

1 0

[cgutman] 52106: [WINHTTP_WINETEST] - Sync to wine 1.3.21
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 21:41:14 2011 New Revision: 52106 URL: http://svn.reactos.org/svn/reactos?rev=52106&view=rev Log: [WINHTTP_WINETEST] - Sync to wine 1.3.21 Modified: trunk/rostests/winetests/winhttp/notification.c trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/notification.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/notific… ============================================================================== --- trunk/rostests/winetests/winhttp/notification.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/notification.c [iso-8859-1] Sun Jun 5 21:41:14 2011 @@ -46,6 +46,7 @@ unsigned int status; /* status received */ int todo; int ignore; + int skipped_for_proxy; }; struct info @@ -58,6 +59,25 @@ unsigned int line; }; +static BOOL proxy_active(void) +{ + WINHTTP_PROXY_INFO proxy_info; + BOOL active = FALSE; + + if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) + { + active = (proxy_info.lpszProxy != NULL); + if (active) + GlobalFree((HGLOBAL) proxy_info.lpszProxy); + if (proxy_info.lpszProxyBypass != NULL) + GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + } + else + active = FALSE; + + return active; +} + static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD buflen ) { BOOL status_ok, function_ok; @@ -88,6 +108,12 @@ } } if (status_ok) info->index++; + if (proxy_active()) + { + while (info->test[info->index].skipped_for_proxy) + info->index++; + } + if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) { SetEvent( info->wait ); @@ -222,10 +248,10 @@ { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, @@ -269,6 +295,7 @@ setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); @@ -299,10 +326,10 @@ { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Sun Jun 5 21:41:14 2011 @@ -33,6 +33,25 @@ {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; + +static BOOL proxy_active(void) +{ + WINHTTP_PROXY_INFO proxy_info; + BOOL active = FALSE; + + if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) + { + active = (proxy_info.lpszProxy != NULL); + if (active) + GlobalFree((HGLOBAL) proxy_info.lpszProxy); + if (proxy_info.lpszProxyBypass != NULL) + GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + } + else + active = FALSE; + + return active; +} static void test_QueryOption(void) { @@ -770,6 +789,8 @@ DWORD size, status, policy, bitness; BOOL ret; CERT_CONTEXT *cert; + WINHTTP_CERTIFICATE_INFO info; + char buffer[32]; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -794,7 +815,7 @@ ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret, "succeeded unexpectedly\n"); + ok(!ret || proxy_active(), "succeeded unexpectedly\n"); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -823,6 +844,17 @@ ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); ok(ret, "failed to retrieve key bitness %u\n", GetLastError()); + size = sizeof(info); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); + ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); + + trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); + trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); + trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); + trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); + trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); + trace("dwKeySize %u\n", info.dwKeySize); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError()); @@ -834,6 +866,14 @@ size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); + + for (;;) + { + size = 0; + ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); + if (!size) break; + } cleanup: WinHttpCloseHandle(req); @@ -1648,28 +1688,33 @@ DWORD timeout; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); - - timeout = 10000; - ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - - con = WinHttpConnect(ses, nxdomain, 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - - req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); - - SetLastError(0xdeadbeef); - ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(!ret, "sent request\n"); - ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, - "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); - - WinHttpCloseHandle(req); - WinHttpCloseHandle(con); - WinHttpCloseHandle(ses); + if (! proxy_active()) + { + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + timeout = 10000; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); + ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + + con = WinHttpConnect(ses, nxdomain, 0, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(!ret, "sent request\n"); + ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, + "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + } + else + skip("Skipping host resolution tests, host resolution preformed by proxy\n"); ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError());

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs