May 2010 - Wine-commits - list.winehq.org

Vincent Povirk : ole32: Remove some assumptions about the internals of BlockChainStream.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 93cc582a8d040c3442513b26906d4093ff13ad84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93cc582a8d040c3442513b269… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 16 16:38:35 2010 -0500 ole32: Remove some assumptions about the internals of BlockChainStream. --- dlls/ole32/storage32.c | 92 +++++++++++------------------------------------- 1 files changed, 21 insertions(+), 71 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 434d8b2..c6a532c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5766,76 +5766,22 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( ULONG count = BlockChainStream_GetCount(This->parentStorage->smallBlockDepotChain); - ULONG sbdIndex = This->parentStorage->smallBlockDepotStart; - ULONG nextBlock, newsbdIndex; BYTE smallBlockDepot[MAX_BIG_BLOCK_SIZE]; + ULARGE_INTEGER newSize, offset; + ULONG bytesWritten; - nextBlock = sbdIndex; - while (nextBlock != BLOCK_END_OF_CHAIN) - { - sbdIndex = nextBlock; - StorageImpl_GetNextBlockInChain(This->parentStorage, sbdIndex, &nextBlock); - } - - newsbdIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); - if (sbdIndex != BLOCK_END_OF_CHAIN) - StorageImpl_SetNextBlockInChain( - This->parentStorage, - sbdIndex, - newsbdIndex); - - StorageImpl_SetNextBlockInChain( - This->parentStorage, - newsbdIndex, - BLOCK_END_OF_CHAIN); + newSize.QuadPart = (count + 1) * This->parentStorage->bigBlockSize; + BlockChainStream_Enlarge(This->parentStorage->smallBlockDepotChain, newSize); /* * Initialize all the small blocks to free */ memset(smallBlockDepot, BLOCK_UNUSED, This->parentStorage->bigBlockSize); - StorageImpl_WriteBigBlock(This->parentStorage, newsbdIndex, smallBlockDepot); - - if (count == 0) - { - /* - * We have just created the small block depot. - */ - DirEntry rootEntry; - ULONG sbStartIndex; - - /* - * Save it in the header - */ - This->parentStorage->smallBlockDepotStart = newsbdIndex; - StorageImpl_SaveFileHeader(This->parentStorage); + offset.QuadPart = count * This->parentStorage->bigBlockSize; + BlockChainStream_WriteAt(This->parentStorage->smallBlockDepotChain, + offset, This->parentStorage->bigBlockSize, smallBlockDepot, &bytesWritten); - /* - * And allocate the first big block that will contain small blocks - */ - sbStartIndex = - StorageImpl_GetNextFreeBigBlock(This->parentStorage); - - StorageImpl_SetNextBlockInChain( - This->parentStorage, - sbStartIndex, - BLOCK_END_OF_CHAIN); - - StorageImpl_ReadDirEntry( - This->parentStorage, - This->parentStorage->base.storageDirEntry, - &rootEntry); - - rootEntry.startingBlock = sbStartIndex; - rootEntry.size.u.HighPart = 0; - rootEntry.size.u.LowPart = This->parentStorage->bigBlockSize; - - StorageImpl_WriteDirEntry( - This->parentStorage, - This->parentStorage->base.storageDirEntry, - &rootEntry); - } - else - StorageImpl_SaveFileHeader(This->parentStorage); + StorageImpl_SaveFileHeader(This->parentStorage); } } @@ -5851,20 +5797,24 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( { DirEntry rootEntry; ULONG blocksRequired = (blockIndex / smallBlocksPerBigBlock) + 1; + ULARGE_INTEGER old_size, size_required; - StorageImpl_ReadDirEntry( - This->parentStorage, - This->parentStorage->base.storageDirEntry, - &rootEntry); + size_required.QuadPart = blocksRequired * This->parentStorage->bigBlockSize; - if (rootEntry.size.u.LowPart < - (blocksRequired * This->parentStorage->bigBlockSize)) - { - rootEntry.size.u.LowPart += This->parentStorage->bigBlockSize; + old_size = BlockChainStream_GetSize(This->parentStorage->smallBlockRootChain); + if (size_required.QuadPart > old_size.QuadPart) + { BlockChainStream_SetSize( This->parentStorage->smallBlockRootChain, - rootEntry.size); + size_required); + + StorageImpl_ReadDirEntry( + This->parentStorage, + This->parentStorage->base.storageDirEntry, + &rootEntry); + + rootEntry.size = size_required; StorageImpl_WriteDirEntry( This->parentStorage,

1 0

Vincent Povirk : ole32: Store the location of all blocks in a big block chain in memory.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 42550953a650e1ef166339fb4e2fdc06741ad5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42550953a650e1ef166339fb4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 4 15:15:41 2010 -0500 ole32: Store the location of all blocks in a big block chain in memory. A big block chain is a linked list, and we pretty much need random access to them. This should theoretically make accessing a random point in the chain O(log2 n) instead of O(n) (with disk access scaling based on the size of the read/write, not its location). It theoretically takes O(n) memory based on the size, but it can do better if the chain isn't very fragmented (which I believe will generally be the case for long chains). It also involves fetching all the big block locations when we open the chain, but we already do that anyway (and it should be faster to read it all in one go than piecemeal). --- dlls/ole32/storage32.c | 271 ++++++++++++++++++++++++++++++------------------ dlls/ole32/storage32.h | 13 ++- 2 files changed, 180 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42550953a650e1ef16633…

1 0

Damjan Jovanovic : wine.desktop: Add hr and sr@latin translations.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 75f34a615bb9e198e36240c16f1bdfcd9c7ec4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f34a615bb9e198e36240c16… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 06:35:38 2010 +0200 wine.desktop: Add hr and sr(a)latin translations. --- tools/wine.desktop | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 819560e..50489e1 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -17,6 +17,8 @@ Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner Name[sr]=Wine - дизач Windows програма +Name[sr(a)latin]=Wine - dizač Windows programa +Name[hr]=Wine - dizač Windows programa Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; Icon=wine

1 0

Charles Davis : ntdll: Implement IOCTL_SCSI_PASS_THROUGH(_DIRECT) on Mac OS .
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 1e0cee6d3c343ad21e3a4d69cfa9d1d164943745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0cee6d3c343ad21e3a4d69c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Tue May 4 23:57:02 2010 -0600 ntdll: Implement IOCTL_SCSI_PASS_THROUGH(_DIRECT) on Mac OS. --- dlls/ntdll/cdrom.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 069ac01..ab68459 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -83,8 +83,28 @@ # include <IOKit/storage/IOMedia.h> # include <IOKit/storage/IOCDMediaBSDClient.h> # include <IOKit/storage/IODVDMediaBSDClient.h> +# include <IOKit/scsi/SCSITask.h> # include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h> # define SENSEBUFLEN kSenseDefaultSize + +typedef struct +{ + uint32_t attribute; + uint32_t timeout; + uint32_t response; + uint32_t status; + uint8_t direction; + uint8_t cdbSize; + uint8_t reserved0144[2]; + uint8_t cdb[16]; + void* buffer; + uint64_t bufferSize; + void* sense; + uint64_t senseLen; +} dk_scsi_command_t; + +#define DKIOCSCSICOMMAND _IOWR('d', 253, dk_scsi_command_t) + #endif #define NONAMELESSUNION @@ -1649,6 +1669,9 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP #elif defined HAVE_SCSIREQ_T_CMD scsireq_t cmd; int io; +#elif defined __APPLE__ + dk_scsi_command_t cmd; + int io; #endif if (pPacket->Length < sizeof(SCSI_PASS_THROUGH_DIRECT)) @@ -1752,6 +1775,64 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP pPacket->ScsiStatus = cmd.status; ret = CDROM_GetStatusCode(io); + +#elif defined(__APPLE__) + + memset(&cmd, 0, sizeof(cmd)); + memcpy(cmd.cdb, pPacket->Cdb, pPacket->CdbLength); + + cmd.cdbSize = pPacket->CdbLength; + cmd.buffer = pPacket->DataBuffer; + cmd.bufferSize = pPacket->DataTransferLength; + cmd.sense = (char*)pPacket + pPacket->SenseInfoOffset; + cmd.senseLen = pPacket->SenseInfoLength; + cmd.timeout = pPacket->TimeOutValue*1000; /* in milliseconds */ + + switch (pPacket->DataIn) + { + case SCSI_IOCTL_DATA_OUT: + cmd.direction = kSCSIDataTransfer_FromInitiatorToTarget; + break; + case SCSI_IOCTL_DATA_IN: + cmd.direction = kSCSIDataTransfer_FromTargetToInitiator; + break; + case SCSI_IOCTL_DATA_UNSPECIFIED: + cmd.direction = kSCSIDataTransfer_NoDataTransfer; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + io = ioctl(fd, DKIOCSCSICOMMAND, &cmd); + + if (cmd.response == kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE) + { + /* Command failed */ + switch (cmd.status) + { + case kSCSITaskStatus_TaskTimeoutOccurred: return STATUS_TIMEOUT; + break; + case kSCSITaskStatus_ProtocolTimeoutOccurred: return STATUS_IO_TIMEOUT; + break; + case kSCSITaskStatus_DeviceNotResponding: return STATUS_DEVICE_BUSY; + break; + case kSCSITaskStatus_DeviceNotPresent: + return STATUS_NO_SUCH_DEVICE; + break; + case kSCSITaskStatus_DeliveryFailure: + return STATUS_DEVICE_PROTOCOL_ERROR; + break; + case kSCSITaskStatus_No_Status: + default: + return STATUS_UNSUCCESSFUL; + break; + } + } + + if (cmd.status != kSCSITaskStatus_No_Status) + pPacket->ScsiStatus = cmd.status; + + ret = CDROM_GetStatusCode(io); #endif return ret; } @@ -1770,6 +1851,9 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) #elif defined HAVE_SCSIREQ_T_CMD scsireq_t cmd; int io; +#elif defined __APPLE__ + dk_scsi_command_t cmd; + int io; #endif if (pPacket->Length < sizeof(SCSI_PASS_THROUGH)) @@ -1883,6 +1967,67 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) pPacket->ScsiStatus = cmd.status; ret = CDROM_GetStatusCode(io); + +#elif defined(__APPLE__) + + memset(&cmd, 0, sizeof(cmd)); + memcpy(cmd.cdb, pPacket->Cdb, pPacket->CdbLength); + + cmd.cdbSize = pPacket->CdbLength; + cmd.buffer = (char*)pPacket + pPacket->DataBufferOffset; + cmd.bufferSize = pPacket->DataTransferLength; + cmd.sense = (char*)pPacket + pPacket->SenseInfoOffset; + cmd.senseLen = pPacket->SenseInfoLength; + cmd.timeout = pPacket->TimeOutValue*1000; /* in milliseconds */ + + switch (pPacket->DataIn) + { + case SCSI_IOCTL_DATA_OUT: + cmd.direction = kSCSIDataTransfer_FromInitiatorToTarget; + break; + case SCSI_IOCTL_DATA_IN: + cmd.direction = kSCSIDataTransfer_FromTargetToInitiator; + break; + case SCSI_IOCTL_DATA_UNSPECIFIED: + cmd.direction = kSCSIDataTransfer_NoDataTransfer; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + io = ioctl(fd, DKIOCSCSICOMMAND, &cmd); + + if (cmd.response == kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE) + { + /* Command failed */ + switch (cmd.status) + { + case kSCSITaskStatus_TaskTimeoutOccurred: + return STATUS_TIMEOUT; + break; + case kSCSITaskStatus_ProtocolTimeoutOccurred: + return STATUS_IO_TIMEOUT; + break; + case kSCSITaskStatus_DeviceNotResponding: + return STATUS_DEVICE_BUSY; + break; + case kSCSITaskStatus_DeviceNotPresent: + return STATUS_NO_SUCH_DEVICE; + break; + case kSCSITaskStatus_DeliveryFailure: + return STATUS_DEVICE_PROTOCOL_ERROR; + break; + case kSCSITaskStatus_No_Status: + default: + return STATUS_UNSUCCESSFUL; + break; + } + } + + if (cmd.status != kSCSITaskStatus_No_Status) + pPacket->ScsiStatus = cmd.status; + + ret = CDROM_GetStatusCode(io); #endif return ret; }

1 0

Jörg Höhle : wineoss: Supply FFFFFFFF for midiOutGetVolume, not garbage.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 8aeb9ec03ae1ecb2d1700200858ff7bec9e1e8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aeb9ec03ae1ecb2d17002008… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 30 22:55:43 2010 +0100 wineoss: Supply FFFFFFFF for midiOutGetVolume, not garbage. --- dlls/wineoss.drv/midi.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 61d0383..20163b1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1632,6 +1632,17 @@ static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } /************************************************************************** + * modGetVolume [internal] + */ +static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) +{ + if (!lpdwVolume) return MMSYSERR_INVALPARAM; + if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; + *lpdwVolume = 0xFFFFFFFF; + return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} + +/************************************************************************** * modReset [internal] */ static DWORD modReset(WORD wDevID) @@ -1748,7 +1759,7 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MODM_GETNUMDEVS: return MODM_NumDevs; case MODM_GETVOLUME: - return 0; + return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: return 0; case MODM_RESET:

1 0

Jörg Höhle : wineoss: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: d531d229e5d2a857544a4e5f75c63d572fbf60fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d531d229e5d2a857544a4e5f7… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Tue May 4 15:44:05 2010 +0200 wineoss: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask. --- dlls/wineoss.drv/midi.c | 91 ++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 47 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 20163b1..6f29dcc 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -217,58 +217,60 @@ static LRESULT OSS_MidiInit(void) MidiOutDev[i].caps.wPid = 0x0001; /* FIXME Product ID */ /* Product Version. We simply say "1" */ MidiOutDev[i].caps.vDriverVersion = 0x001; + /* The following are mandatory for MOD_MIDIPORT */ MidiOutDev[i].caps.wChannelMask = 0xFFFF; - - /* FIXME Do we have this information? - * Assuming the soundcards can handle - * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but - * not MIDICAPS_CACHE. - */ - MidiOutDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[i].caps.wVoices = 0; + MidiOutDev[i].caps.wNotes = 0; + MidiOutDev[i].caps.dwSupport = 0; sinfo.device = i; status = ioctl(midiSeqFD, SNDCTL_SYNTH_INFO, &sinfo); if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; ERR("ioctl for synth info failed on %d, disabling it.\n", i); wsprintfW(MidiOutDev[i].caps.szPname, fmt, i); MidiOutDev[i].caps.wTechnology = MOD_MIDIPORT; - MidiOutDev[i].caps.wVoices = 16; - MidiOutDev[i].caps.wNotes = 16; MidiOutDev[i].bEnabled = FALSE; } else { MultiByteToWideChar( CP_UNIXCP, 0, sinfo.name, -1, MidiOutDev[i].caps.szPname, sizeof(MidiOutDev[i].caps.szPname)/sizeof(WCHAR) ); - MidiOutDev[i].caps.wTechnology = MIDI_UnixToWindowsDeviceType(sinfo.synth_type); - MidiOutDev[i].caps.wVoices = sinfo.nr_voices; - /* FIXME Is it possible to know the maximum - * number of simultaneous notes of a soundcard ? - * I believe we don't have this information, but - * it's probably equal or more than wVoices - */ - MidiOutDev[i].caps.wNotes = sinfo.nr_voices; + if (MOD_MIDIPORT != MidiOutDev[i].caps.wTechnology) { + /* FIXME Do we have this information? + * Assuming the soundcards can handle + * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but + * not MIDICAPS_CACHE. + */ + MidiOutDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[i].caps.wVoices = sinfo.nr_voices; + + /* FIXME Is it possible to know the maximum + * number of simultaneous notes of a soundcard ? + * I believe we don't have this information, but + * it's probably equal or more than wVoices + */ + MidiOutDev[i].caps.wNotes = sinfo.nr_voices; + } MidiOutDev[i].bEnabled = TRUE; - } - /* We also have the information sinfo.synth_subtype, not used here - */ - - if (sinfo.capabilities & SYNTH_CAP_INPUT) { - FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); - } + /* We also have the information sinfo.synth_subtype, not used here + */ + if (sinfo.capabilities & SYNTH_CAP_INPUT) { + FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); + } + TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", + i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); + } - TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "\tOSS info: synth subtype=%d capa=%lx\n", + TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", i, wine_dbgstr_w(MidiOutDev[i].caps.szPname), MidiOutDev[i].caps.wTechnology, MidiOutDev[i].caps.wVoices, MidiOutDev[i].caps.wNotes, - MidiOutDev[i].caps.wChannelMask, MidiOutDev[i].caps.dwSupport, - sinfo.synth_subtype, (long)sinfo.capabilities); + MidiOutDev[i].caps.wChannelMask, MidiOutDev[i].caps.dwSupport); } /* find how many MIDI devices are there in the system */ @@ -309,7 +311,7 @@ static LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiOutDev[numsynthdevs + i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiOutDev[numsynthdevs + i].caps.szPname, fmt, numsynthdevs + i); MidiOutDev[numsynthdevs + i].bEnabled = FALSE; } else { @@ -318,15 +320,11 @@ static LRESULT OSS_MidiInit(void) sizeof(MidiOutDev[numsynthdevs + i].caps.szPname) / sizeof(WCHAR)); MidiOutDev[numsynthdevs + i].bEnabled = TRUE; } - MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; /* FIXME Is this right? */ - /* Does it make any difference? */ - MidiOutDev[numsynthdevs + i].caps.wVoices = 16; - /* Does it make any difference? */ - MidiOutDev[numsynthdevs + i].caps.wNotes = 16; + MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; + MidiOutDev[numsynthdevs + i].caps.wVoices = 0; + MidiOutDev[numsynthdevs + i].caps.wNotes = 0; MidiOutDev[numsynthdevs + i].caps.wChannelMask= 0xFFFF; - - /* FIXME Does it make any difference? */ - MidiOutDev[numsynthdevs + i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[numsynthdevs + i].caps.dwSupport = 0; /* This whole part is somewhat obscure to me. I'll keep trying to dig info about it. If you happen to know, please tell us. The very @@ -340,7 +338,7 @@ static LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiInDev[i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','#','%','d',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else { @@ -349,18 +347,17 @@ static LRESULT OSS_MidiInit(void) sizeof(MidiInDev[i].caps.szPname) / sizeof(WCHAR)); MidiInDev[i].state = 0; } - /* FIXME : could we get better information than that ? */ - MidiInDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiInDev[i].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "MidiIn [%d]\tname='%s' support=%d\n" - "\tOSS info: midi dev-type=%d, capa=%lx\n", - i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname), + TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" + "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" + "\tMidiIn [%d] name='%s' support=%d\n", + i, minfo.dev_type, (long)minfo.capabilities, + numsynthdevs + i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname), MidiOutDev[numsynthdevs + i].caps.wTechnology, MidiOutDev[numsynthdevs + i].caps.wVoices, MidiOutDev[numsynthdevs + i].caps.wNotes, MidiOutDev[numsynthdevs + i].caps.wChannelMask, MidiOutDev[numsynthdevs + i].caps.dwSupport, - i, wine_dbgstr_w(MidiInDev[i].caps.szPname), MidiInDev[i].caps.dwSupport, - minfo.dev_type, (long)minfo.capabilities); + i, wine_dbgstr_w(MidiInDev[i].caps.szPname), MidiInDev[i].caps.dwSupport); } wrapup:

1 0

André Hentschel : winecfg: Fix builtin_only list.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 9c19df1d7b975254bdb9dac1ffc965eb50678c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c19df1d7b975254bdb9dac1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 4 20:16:57 2010 +0200 winecfg: Fix builtin_only list. --- programs/winecfg/libraries.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 37cc12b..19504d6 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -54,8 +54,8 @@ static const char * const builtin_only[] = "ddraw", "gdi32", "glu32", - "icmp", "gphoto2.ds", + "icmp", "iphlpapi", "kernel32", "mountmgr.sys", @@ -69,19 +69,10 @@ static const char * const builtin_only[] = "user32", "vdmdbg", "w32skrnl", - "winealsa.drv", - "wineaudioio.drv", "wined3d", "winedos", - "wineesd.drv", - "winejack.drv", - "winejoystick.drv", "winemp3.acm", - "winenas.drv", - "wineoss.drv", "wineps", - "wineps.drv", - "winex11.drv", "winmm", "wintab32", "wnaspi32",

1 0

Gerald Pfeifer : comctl32: Remove variable scrollRange which is not really used from PAGER_NCCalcSize .
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 34f9b1bc6391261e8a0807901f23cb12c91daa1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f9b1bc6391261e8a0807901… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:41 2010 +0200 comctl32: Remove variable scrollRange which is not really used from PAGER_NCCalcSize. --- dlls/comctl32/pager.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index fdf470c..f3461fd 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -841,7 +841,6 @@ static LRESULT PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) { RECT rcChild, rcWindow; - INT scrollRange; /* * lpRect points to a RECT struct. On entry, the struct @@ -863,8 +862,6 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) infoPtr->nWidth = lpRect->right - lpRect->left; PAGER_CalcSize (infoPtr, &infoPtr->nWidth, TRUE); - scrollRange = infoPtr->nWidth - (rcWindow.right - rcWindow.left); - if (infoPtr->TLbtnState && (lpRect->left + infoPtr->nButtonSize < lpRect->right)) lpRect->left += infoPtr->nButtonSize; if (infoPtr->BRbtnState && (lpRect->right - infoPtr->nButtonSize > lpRect->left)) @@ -875,8 +872,6 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) infoPtr->nHeight = lpRect->bottom - lpRect->top; PAGER_CalcSize (infoPtr, &infoPtr->nHeight, FALSE); - scrollRange = infoPtr->nHeight - (rcWindow.bottom - rcWindow.top); - if (infoPtr->TLbtnState && (lpRect->top + infoPtr->nButtonSize < lpRect->bottom)) lpRect->top += infoPtr->nButtonSize; if (infoPtr->BRbtnState && (lpRect->bottom - infoPtr->nButtonSize > lpRect->top))

1 0

Gerald Pfeifer : crypt32/tests: Remove variable entry which is not really used from test_decodeCRLToBeSigned .
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 52ead99288c810370adadf0342202ad9e26e3453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ead99288c810370adadf034… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:19 2010 +0200 crypt32/tests: Remove variable entry which is not really used from test_decodeCRLToBeSigned. --- dlls/crypt32/tests/encode.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1c33aee..d60843a 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4595,13 +4595,11 @@ static void test_decodeCRLToBeSigned(DWORD dwEncoding) if (buf) { CRL_INFO *info = (CRL_INFO *)buf; - CRL_ENTRY *entry; ok(size >= sizeof(CRL_INFO), "Wrong size %d\n", size); ok(info->cCRLEntry == 3, "Expected 3 CRL entries, got %d\n", info->cCRLEntry); ok(info->rgCRLEntry != NULL, "Expected a valid CRL entry array\n"); - entry = info->rgCRLEntry; ok(info->cExtension == 2, "Expected 2 extensions, got %d\n", info->cExtension); LocalFree(buf);

1 0

Alexandre Julliard : server: Store the prefix 32/ 64 architecture in the registry files.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 58791c9acd762ac074e7a46dea2cc0bc632d84a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58791c9acd762ac074e7a46de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 20:26:04 2010 +0200 server: Store the prefix 32/64 architecture in the registry files. --- server/registry.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/server/registry.c b/server/registry.c index f4dbf8e..e5c0da4 100644 --- a/server/registry.c +++ b/server/registry.c @@ -109,6 +109,7 @@ static struct key *root_key; static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC; static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between periodic saves */ static struct timeout_user *save_timeout_user; /* saving timer */ +static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; @@ -1305,6 +1306,35 @@ static struct key *load_key( struct key *base, const char *buffer, return create_key_recursive( base, &name, modif ); } +/* load a global option from the input file */ +static int load_global_option( const char *buffer, struct file_load_info *info ) +{ + const char *p; + + if (!strncmp( buffer, "#arch=", 6 )) + { + enum prefix_type type; + p = buffer + 6; + if (!strcmp( p, "win32" )) type = PREFIX_32BIT; + else if (!strcmp( p, "win64" )) type = PREFIX_64BIT; + else + { + file_read_error( "Unknown architecture", info ); + set_error( STATUS_NOT_REGISTRY_FILE ); + return 0; + } + if (prefix_type == PREFIX_UNKNOWN) prefix_type = type; + else if (type != prefix_type) + { + file_read_error( "Mismatched architecture", info ); + set_error( STATUS_NOT_REGISTRY_FILE ); + return 0; + } + } + /* ignore unknown options */ + return 1; +} + /* load a key option from the input file */ static int load_key_option( struct key *key, const char *buffer, struct file_load_info *info ) { @@ -1525,6 +1555,7 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi break; case '#': /* option */ if (subkey) load_key_option( subkey, p, &info ); + else if (!load_global_option( p, &info )) goto done; break; case ';': /* comment */ case 0: /* empty line */ @@ -1563,7 +1594,7 @@ static void load_registry( struct key *key, obj_handle_t handle ) } /* load one of the initial registry files */ -static void load_init_registry_from_file( const char *filename, struct key *key ) +static int load_init_registry_from_file( const char *filename, struct key *key ) { FILE *f; @@ -1574,7 +1605,7 @@ static void load_init_registry_from_file( const char *filename, struct key *key if (get_error() == STATUS_NOT_REGISTRY_FILE) { fprintf( stderr, "%s is not a valid registry file\n", filename ); - return; + return 1; } } @@ -1583,6 +1614,7 @@ static void load_init_registry_from_file( const char *filename, struct key *key save_branch_info[save_branch_count].path = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); make_object_static( &key->obj ); + return (f != NULL); } static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *path ) @@ -1639,7 +1671,10 @@ void init_registry(void) if (!(hklm = create_key_recursive( root_key, &HKLM_name, current_time ))) fatal_error( "could not create Machine registry key\n" ); - load_init_registry_from_file( "system.reg", hklm ); + if (!load_init_registry_from_file( "system.reg", hklm )) + prefix_type = sizeof(void *) > sizeof(int) ? PREFIX_64BIT : PREFIX_32BIT; + else if (prefix_type == PREFIX_UNKNOWN) + prefix_type = PREFIX_32BIT; /* load userdef.reg into Registry\User\.Default */ @@ -1660,7 +1695,7 @@ void init_registry(void) load_init_registry_from_file( "user.reg", hkcu ); /* set the shared flag on Software\Classes\Wow6432Node */ - if (sizeof(void *) > sizeof(int)) + if (prefix_type == PREFIX_64BIT) { if ((key = create_key_recursive( hklm, &classes_name, current_time ))) { @@ -1687,6 +1722,17 @@ static void save_all_subkeys( struct key *key, FILE *f ) fprintf( f, ";; All keys relative to " ); dump_path( key, NULL, f ); fprintf( f, "\n" ); + switch (prefix_type) + { + case PREFIX_32BIT: + fprintf( f, "\n#arch=win32\n" ); + break; + case PREFIX_64BIT: + fprintf( f, "\n#arch=win64\n" ); + break; + default: + break; + } save_subkeys( key, key, f ); }

1 0