January 2012 - Wine-commits

Francois Gouget : po: Remove English strings from the Swedish translation.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 1c49ea47fb33480e9f8c27f9ef7fd819463492cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c49ea47fb33480e9f8c27f9e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 17 00:07:23 2012 +0100 po: Remove English strings from the Swedish translation. --- po/sv.po | 113 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 55 insertions(+), 58 deletions(-) diff --git a/po/sv.po b/po/sv.po index 60d7001..c36eed2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -45,7 +45,7 @@ msgstr "&Supportinfo..." #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." -msgstr "&Modify..." +msgstr "" #: appwiz.rc:66 appwiz.rc:42 cryptui.rc:343 msacm32.rc:37 winecfg.rc:191 #: winecfg.rc:228 wordpad.rc:245 @@ -547,11 +547,11 @@ msgstr "Test" #: comdlg32.rc:267 msgid "AaBbYyZz" -msgstr "AaBbYyZz" +msgstr "" #: comdlg32.rc:268 msgid "Scr&ipt:" -msgstr "Scr&ipt:" +msgstr "" #: comdlg32.rc:276 msgid "Color" @@ -732,7 +732,7 @@ msgstr "Utskriftsformat" #: comdlg32.rc:432 msgid "&Tray:" -msgstr "&Tray:" +msgstr "" #: comdlg32.rc:435 wineps.rc:32 msgid "&Portrait" @@ -890,7 +890,7 @@ msgstr "Oliv" #: comdlg32.rc:121 wordpad.rc:118 msgid "Navy" -msgstr "Navy" +msgstr "" #: comdlg32.rc:122 wordpad.rc:119 msgid "Purple" @@ -898,7 +898,7 @@ msgstr "Lila" #: comdlg32.rc:123 wordpad.rc:120 msgid "Teal" -msgstr "Teal" +msgstr "" #: comdlg32.rc:124 wordpad.rc:121 msgid "Gray" @@ -914,7 +914,7 @@ msgstr "Röd" #: comdlg32.rc:127 wordpad.rc:124 msgid "Lime" -msgstr "Lime" +msgstr "" #: comdlg32.rc:128 wordpad.rc:125 msgid "Yellow" @@ -1234,7 +1234,7 @@ msgstr "Certifikatpolicyer" #: crypt32.rc:35 msgid "Subject Key Identifier" -msgstr "Subject Key Identifier" +msgstr "" #: crypt32.rc:36 msgid "CRL Reason Code" @@ -1250,7 +1250,7 @@ msgstr "Utökad nyckelanvändning" #: crypt32.rc:39 msgid "Authority Information Access" -msgstr "Authority Information Access" +msgstr "" #: crypt32.rc:40 msgid "Certificate Extensions" @@ -1278,7 +1278,7 @@ msgstr "Innehållstyp" #: crypt32.rc:46 msgid "Message Digest" -msgstr "Message Digest" +msgstr "" #: crypt32.rc:47 msgid "Signing Time" @@ -1316,7 +1316,7 @@ msgstr "Användarmeddelande" #: crypt32.rc:55 msgid "On-line Certificate Status Protocol" -msgstr "On-line Certificate Status Protocol" +msgstr "" #: crypt32.rc:56 msgid "Certification Authority Issuer" @@ -1437,7 +1437,7 @@ msgstr "CA-version" #: crypt32.rc:85 msgid "Cross CA Version" -msgstr "Cross CA Version" +msgstr "" #: crypt32.rc:86 msgid "Serialized Signature Serial Number" @@ -1577,15 +1577,15 @@ msgstr "Agent för nyckelåterställande" #: crypt32.rc:120 msgid "Certificate Template Information" -msgstr "Certificate Template Information" +msgstr "" #: crypt32.rc:121 msgid "Enterprise Root OID" -msgstr "Enterprise Root OID" +msgstr "" #: crypt32.rc:122 msgid "Dummy Signer" -msgstr "Dummy Signer" +msgstr "" #: crypt32.rc:123 msgid "Encrypted Private Key" @@ -1605,11 +1605,11 @@ msgstr "Transaktions-Id" #: crypt32.rc:127 msgid "Sender Nonce" -msgstr "Sender Nonce" +msgstr "" #: crypt32.rc:128 msgid "Recipient Nonce" -msgstr "Recipient Nonce" +msgstr "" #: crypt32.rc:129 msgid "Reg Info" @@ -1737,7 +1737,7 @@ msgstr "Dokumentsignering" #: crypt32.rc:160 msgid "IP security IKE intermediate" -msgstr "IP security IKE intermediate" +msgstr "" #: crypt32.rc:161 cryptui.rc:129 msgid "File Recovery" @@ -1841,7 +1841,7 @@ msgstr "Okänd nyckelanvändning" #: crypt32.rc:194 msgid "Subject Type=" -msgstr "Subject Type=" +msgstr "" #: crypt32.rc:195 #, fuzzy @@ -2217,11 +2217,11 @@ msgstr "Standard för kryptografisk meddelandesyntax/PKCS #7-meddelande (.p7b)" #: cryptui.rc:298 msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" -msgstr "Personal Information Exchange/PKCS #12 (.pfx, .p12)" +msgstr "" #: cryptui.rc:300 msgid "Microsoft Serialized Certificate Store (.sst)" -msgstr "Microsoft Serialized Certificate Store (.sst)" +msgstr "" #: cryptui.rc:308 msgid "" @@ -2371,7 +2371,7 @@ msgstr "&Inkludera alla certifikat i certifieringssökvägen om möjligt" #: cryptui.rc:413 msgid "&Personal Information Exchange/PKCS #12 (.pfx)" -msgstr "&Personal Information Exchange/PKCS #12 (.pfx)" +msgstr "" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -2592,7 +2592,7 @@ msgstr "X.509-certifikat (*.cer; *.crt)" #: cryptui.rc:75 msgid "Personal Information Exchange (*.pfx; *.p12)" -msgstr "Personal Information Exchange (*.pfx; *.p12)" +msgstr "" #: cryptui.rc:76 cryptui.rc:155 msgid "Certificate Revocation List (*.crl)" @@ -2604,7 +2604,7 @@ msgstr "Lista över betrodda certifikat (*.stl)" #: cryptui.rc:78 msgid "Microsoft Serialized Certificate Store (*.sst)" -msgstr "Microsoft Serialized Certificate Store (*.sst)" +msgstr "" #: cryptui.rc:79 msgid "CMS/PKCS #7 Messages (*.spc; *.p7b)" @@ -2656,7 +2656,7 @@ msgstr "CMS/PKCS #7-meddelande" #: cryptui.rc:94 msgid "Personal Information Exchange" -msgstr "Personal Information Exchange" +msgstr "" #: cryptui.rc:96 msgid "The import was successful." @@ -2873,7 +2873,7 @@ msgstr "CMS/PKCS #7-meddelanden (*.p7b)" #: cryptui.rc:158 msgid "Personal Information Exchange (*.pfx)" -msgstr "Personal Information Exchange (*.pfx)" +msgstr "" #: cryptui.rc:159 msgid "Serialized Certificate Store (*.sst)" @@ -3723,7 +3723,7 @@ msgstr "Filslut\n" #: winerror.mc:211 winerror.mc:436 msgid "Disk full\n" -msgstr "Disk full\n" +msgstr "" #: winerror.mc:216 msgid "Request not supported\n" @@ -4087,7 +4087,7 @@ msgstr "Ogiltig sökväg\n" #: winerror.mc:676 msgid "Signal pending\n" -msgstr "Signal pending\n" +msgstr "" #: winerror.mc:681 msgid "Max system-wide thread count reached\n" @@ -4103,7 +4103,7 @@ msgstr "Resursen används\n" #: winerror.mc:696 msgid "Cancel violation\n" -msgstr "Cancel violation\n" +msgstr "" #: winerror.mc:701 msgid "Atomic locks not supported\n" @@ -7104,7 +7104,7 @@ msgstr "Skapa från fil" #: oledlg.rc:65 msgid "&Add Control..." -msgstr "&Add Control..." +msgstr "" #: oledlg.rc:66 msgid "Display As Icon" @@ -7120,7 +7120,7 @@ msgstr "Fil:" #: oledlg.rc:75 msgid "Paste Special" -msgstr "Paste Special" +msgstr "" #: oledlg.rc:78 setupapi.rc:40 msgid "Source:" @@ -7496,11 +7496,11 @@ msgstr "Spola tillbaka" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "Trace Tags" +msgstr "" #: shdoclc.rc:197 msgid "Resource Failures" -msgstr "Resource Failures" +msgstr "" #: shdoclc.rc:198 msgid "Dump Tracking Info" @@ -7508,11 +7508,11 @@ msgstr "" #: shdoclc.rc:199 msgid "Debug Break" -msgstr "Debug Break" +msgstr "" #: shdoclc.rc:200 msgid "Debug View" -msgstr "Debug View" +msgstr "" #: shdoclc.rc:201 msgid "Dump Tree" @@ -8303,7 +8303,7 @@ msgstr "&Stoppa" #: user32.rc:80 msgid "&Retry" -msgstr "&Retry" +msgstr "" #: user32.rc:81 msgid "&Ignore" @@ -12605,7 +12605,7 @@ msgstr "Visa &avancerat" #: winecfg.rc:240 msgid "De&vice:" -msgstr "De&vice:" +msgstr "" #: winecfg.rc:242 msgid "Bro&wse..." @@ -12624,30 +12624,28 @@ msgid "Show &dot files" msgstr "Visa &punktfiler" #: winecfg.rc:256 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "" #: winecfg.rc:258 -#, fuzzy msgid "Defaults" -msgstr " Defaults " +msgstr "" #: winecfg.rc:259 msgid "Output device:" -msgstr "Output device:" +msgstr "" #: winecfg.rc:260 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "" #: winecfg.rc:261 msgid "Input device:" -msgstr "Input device:" +msgstr "" #: winecfg.rc:262 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "" #: winecfg.rc:267 msgid "&Test Sound" @@ -13005,7 +13003,7 @@ msgstr "Menyrad" #: wineconsole.rc:60 msgid "Cursor size" -msgstr "Cursor size" +msgstr "" #: wineconsole.rc:61 msgid "&Small" @@ -13025,11 +13023,11 @@ msgstr "Control" #: wineconsole.rc:66 msgid "Popup menu" -msgstr "Popup menu" +msgstr "" #: wineconsole.rc:67 msgid "&Control" -msgstr "&Control" +msgstr "" #: wineconsole.rc:68 msgid "S&hift" @@ -13037,24 +13035,23 @@ msgstr "S&hift" #: wineconsole.rc:69 msgid "Quick edit" -msgstr "Quick edit" +msgstr "" #: wineconsole.rc:70 msgid "&enable" -msgstr "&enable" +msgstr "" #: wineconsole.rc:72 msgid "Command history" msgstr "Kommandohistorik" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" -msgstr "&Number of recalled commands :" +msgstr "" #: wineconsole.rc:76 msgid "&Remove doubles" -msgstr "&Remove doubles" +msgstr "" #: wineconsole.rc:84 msgid "&Font" @@ -13071,7 +13068,7 @@ msgstr " Konfiguration " #: wineconsole.rc:100 msgid "Buffer zone" -msgstr "Buffer zone" +msgstr "" #: wineconsole.rc:101 #, fuzzy @@ -13099,11 +13096,11 @@ msgstr "H&öjd :" #: wineconsole.rc:116 msgid "End of program" -msgstr "End of program" +msgstr "" #: wineconsole.rc:117 msgid "&Close console" -msgstr "&Close console" +msgstr "" #: wineconsole.rc:119 msgid "Edition" @@ -13115,11 +13112,11 @@ msgstr "Konsollparametrar" #: wineconsole.rc:128 msgid "Retain these settings for later sessions" -msgstr "Retain these settings for later sessions" +msgstr "" #: wineconsole.rc:129 msgid "Modify only current session" -msgstr "Modify only current session" +msgstr "" #: wineconsole.rc:26 msgid "Set &Defaults"

1 0

Alexandre Julliard : include: Fix some typos in winioctl.h.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 5e5cbcc841c83cc5e500b7c11d09a5bf512eb448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5cbcc841c83cc5e500b7c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 11:39:45 2012 +0100 include: Fix some typos in winioctl.h. --- include/winioctl.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winioctl.h b/include/winioctl.h index 36d6e24..fb78821 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -226,9 +226,9 @@ #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_STORAGE_BREAK_RESERCATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS); -#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS); -#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS); +#define IOCTL_STORAGE_BREAK_RESERVATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_IN CTL_CODE(IOCTL_STORAGE_BASE, 0x0406, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_PERSISTENT_RESERVE_OUT CTL_CODE(IOCTL_STORAGE_BASE, 0x0407, METHOD_BUFFERED, FILE_READ_ACCESS|FILE_WRITE_ACCESS) #define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)

1 0

Alexandre Julliard : mountmgr: Create a symlink in DosDevices for cdroms.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: a6b6c0ebe58a425fe0e81b6780debf425f032cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b6c0ebe58a425fe0e81b678… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 11:41:15 2012 +0100 mountmgr: Create a symlink in DosDevices for cdroms. --- dlls/mountmgr.sys/device.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c6ba0b9..8367cba 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -195,11 +195,13 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** static const WCHAR cdromW[] = {'\\','D','e','v','i','c','e','\\','C','d','R','o','m','%','u',0}; static const WCHAR floppyW[] = {'\\','D','e','v','i','c','e','\\','F','l','o','p','p','y','%','u',0}; static const WCHAR ramdiskW[] = {'\\','D','e','v','i','c','e','\\','R','a','m','d','i','s','k','%','u',0}; + static const WCHAR cdromlinkW[] = {'\\','?','?','\\','C','d','R','o','m','%','u',0}; static const WCHAR physdriveW[] = {'\\','?','?','\\','P','h','y','s','i','c','a','l','D','r','i','v','e','%','u',0}; UINT i, first = 0; NTSTATUS status = 0; const WCHAR *format = NULL; + const WCHAR *link_format = NULL; UNICODE_STRING name; DEVICE_OBJECT *dev_obj; struct disk_device *device; @@ -210,6 +212,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** case DEVICE_HARDDISK: case DEVICE_NETWORK: /* FIXME */ format = harddiskW; + link_format = physdriveW; break; case DEVICE_HARDDISK_VOL: format = harddiskvolW; @@ -221,6 +224,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** case DEVICE_CDROM: case DEVICE_DVD: format = cdromW; + link_format = cdromlinkW; break; case DEVICE_RAMDISK: format = ramdiskW; @@ -246,6 +250,19 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** device->unix_mount = NULL; device->symlink.Buffer = NULL; + if (link_format) + { + UNICODE_STRING symlink; + + symlink.MaximumLength = (strlenW(link_format) + 10) * sizeof(WCHAR); + if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength))) + { + sprintfW( symlink.Buffer, link_format, i ); + symlink.Length = strlenW(symlink.Buffer) * sizeof(WCHAR); + if (!IoCreateSymbolicLink( &symlink, &name )) device->symlink = symlink; + } + } + switch (type) { case DEVICE_FLOPPY: @@ -267,20 +284,9 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** case DEVICE_UNKNOWN: case DEVICE_HARDDISK: case DEVICE_NETWORK: /* FIXME */ - { - UNICODE_STRING symlink; - - symlink.MaximumLength = sizeof(physdriveW) + 10 * sizeof(WCHAR); - if ((symlink.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, symlink.MaximumLength))) - { - sprintfW( symlink.Buffer, physdriveW, i ); - symlink.Length = strlenW(symlink.Buffer) * sizeof(WCHAR); - if (!IoCreateSymbolicLink( &symlink, &name )) device->symlink = symlink; - } - device->devnum.DeviceType = FILE_DEVICE_DISK; - device->devnum.DeviceNumber = i; - device->devnum.PartitionNumber = 0; - } + device->devnum.DeviceType = FILE_DEVICE_DISK; + device->devnum.DeviceNumber = i; + device->devnum.PartitionNumber = 0; break; case DEVICE_HARDDISK_VOL: device->devnum.DeviceType = FILE_DEVICE_DISK;

1 0

Aric Stewart : wineqtdecoder: Do not invert height.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 9aa3c74503b924e5b251901add6e34e2035cbdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa3c74503b924e5b251901ad… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:07 2012 -0600 wineqtdecoder: Do not invert height. --- dlls/wineqtdecoder/qtsplitter.c | 5 +++-- dlls/wineqtdecoder/qtutils.c | 5 +++-- dlls/wineqtdecoder/qtvdecoder.c | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 17f173c..362f535 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -767,12 +767,13 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) pvi = (VIDEOINFOHEADER *)amt.pbFormat; pvi->bmiHeader.biSize = sizeof (BITMAPINFOHEADER); pvi->bmiHeader.biWidth = outputWidth; - pvi->bmiHeader.biHeight = -outputHeight; + pvi->bmiHeader.biHeight = outputHeight; pvi->bmiHeader.biPlanes = 1; pvi->bmiHeader.biBitCount = 24; pvi->bmiHeader.biCompression = BI_RGB; + pvi->bmiHeader.biSizeImage = outputWidth * outputHeight * outputDepth; - filter->outputSize = outputWidth * outputHeight * outputDepth; + filter->outputSize = pvi->bmiHeader.biSizeImage; amt.lSampleSize = 0; pixelBufferOptions = CFDictionaryCreateMutable(NULL, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); diff --git a/dlls/wineqtdecoder/qtutils.c b/dlls/wineqtdecoder/qtutils.c index a1e8f05..19ba90c 100644 --- a/dlls/wineqtdecoder/qtutils.c +++ b/dlls/wineqtdecoder/qtutils.c @@ -126,7 +126,6 @@ typedef struct { HRESULT AccessPixelBufferPixels( CVPixelBufferRef pixelBuffer, LPBYTE pbDstStream) { LPBYTE pPixels = NULL; - LPBYTE out = NULL; size_t bytesPerRow = 0, height = 0, width = 0; OSType actualType; int i; @@ -143,9 +142,11 @@ HRESULT AccessPixelBufferPixels( CVPixelBufferRef pixelBuffer, LPBYTE pbDstStrea height = CVPixelBufferGetHeight(pixelBuffer); width = CVPixelBufferGetWidth(pixelBuffer); - for (out = pbDstStream, i = 0; i < height; i++) + for (i = 1; i <= height; i++) { int j; + LPBYTE out = pbDstStream + ((height - i) * width * 3); + for (j = 0; j < width; j++) { *((DWORD*)out) = (((ARGBPixelPtr)pPixels)[j].r) << 16 diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3690087..ceab21e 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -442,8 +442,6 @@ static HRESULT WINAPI QTVDecoder_SetMediaType(TransformFilter *tf, PIN_DIRECTION bmi->biCompression = BI_RGB; bmi->biBitCount = 24; outpmt->subtype = MEDIASUBTYPE_RGB24; - if (bmi->biHeight > 0) - bmi->biHeight = -bmi->biHeight; return S_OK; }

1 0

Aric Stewart : strmbase: In the TransformFilter add a critical section that protects the streaming state .
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: b32b1a924eb00b568ebb758fcf5afa12f80d984a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32b1a924eb00b568ebb758fc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:23 2012 -0600 strmbase: In the TransformFilter add a critical section that protects the streaming state. --- dlls/strmbase/transform.c | 25 +++++++++++++++---------- include/wine/strmbase.h | 1 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index ccdef39..b44becf 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -68,25 +68,25 @@ static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSa TRACE("%p\n", This); pTransform = (TransformFilter*)This->pin.pinInfo.pFilter; - EnterCriticalSection(&pTransform->filter.csFilter); + EnterCriticalSection(&pTransform->csReceive); if (pTransform->filter.state == State_Stopped) { - LeaveCriticalSection(&pTransform->filter.csFilter); + LeaveCriticalSection(&pTransform->csReceive); return VFW_E_WRONG_STATE; } if (This->end_of_stream || This->flushing) { - LeaveCriticalSection(&pTransform->filter.csFilter); + LeaveCriticalSection(&pTransform->csReceive); return S_FALSE; } - LeaveCriticalSection(&pTransform->filter.csFilter); if (pTransform->pFuncsTable->pfnReceive) hr = pTransform->pFuncsTable->pfnReceive(pTransform, pInSample); else hr = S_FALSE; + LeaveCriticalSection(&pTransform->csReceive); return hr; } @@ -176,6 +176,9 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p BaseFilter_Init(&pTransformFilter->filter, pVtbl, pClsid, (DWORD_PTR)(__FILE__ ": TransformFilter.csFilter"), &tfBaseFuncTable); + InitializeCriticalSection(&pTransformFilter->csReceive); + pTransformFilter->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": TransformFilter.csReceive"); + /* pTransformFilter is already allocated */ pTransformFilter->pFuncsTable = pFuncsTable; ZeroMemory(&pTransformFilter->pmt, sizeof(pTransformFilter->pmt)); @@ -286,6 +289,8 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); TRACE("Destroying transform filter\n"); + This->csReceive.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csReceive); FreeMediaType(&This->pmt); CoTaskMemFree(This); @@ -304,13 +309,13 @@ HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface) TRACE("(%p/%p)\n", This, iface); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); { This->filter.state = State_Stopped; if (This->pFuncsTable->pfnStopStreaming) hr = This->pFuncsTable->pfnStopStreaming(This); } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->csReceive); return hr; } @@ -322,7 +327,7 @@ HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface) TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); { if (This->filter.state == State_Stopped) hr = IBaseFilter_Run(iface, -1); @@ -332,7 +337,7 @@ HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface) if (SUCCEEDED(hr)) This->filter.state = State_Paused; } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->csReceive); return hr; } @@ -344,7 +349,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); - EnterCriticalSection(&This->filter.csFilter); + EnterCriticalSection(&This->csReceive); { if (This->filter.state == State_Stopped) { @@ -361,7 +366,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar This->filter.state = State_Running; } } - LeaveCriticalSection(&This->filter.csFilter); + LeaveCriticalSection(&This->csReceive); return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3d06bf8..6370530 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -232,6 +232,7 @@ typedef struct TransformFilter IPin **ppPins; ULONG npins; AM_MEDIA_TYPE pmt; + CRITICAL_SECTION csReceive; const struct TransformFilterFuncTable * pFuncsTable; QualityControlImpl qcimpl;

1 0

Aric Stewart : wineqtdecoder: Lock the Transform filter csReceive around the decommpression callback.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: ab735065288c808eb904133fdc51680b6296c1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab735065288c808eb904133fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 16 14:14:29 2012 -0600 wineqtdecoder: Lock the Transform filter csReceive around the decommpression callback. --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index ceab21e..79e06a5 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -179,7 +179,7 @@ static void trackingCallback( return; } - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); hr = BaseOutputPinImpl_GetDeliveryBuffer((BaseOutputPin*)This->tf.ppPins[1], &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); @@ -230,12 +230,12 @@ static void trackingCallback( IMediaSample_SetTime(pOutSample, &tStart, &tStop); } - LeaveCriticalSection(&This->tf.filter.csFilter); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) ERR("Error sending sample (%x)\n", hr); error: + LeaveCriticalSection(&This->tf.csReceive); if (pOutSample) IMediaSample_Release(pOutSample); @@ -278,7 +278,6 @@ static HRESULT WINAPI QTVDecoder_Receive(TransformFilter *tf, IMediaSample *pSam OSStatus err = noErr; LONGLONG tStart, tStop; - EnterCriticalSection(&This->tf.filter.csFilter); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { @@ -316,7 +315,6 @@ static HRESULT WINAPI QTVDecoder_Receive(TransformFilter *tf, IMediaSample *pSam hr = This->decodeHR; error: - LeaveCriticalSection(&This->tf.filter.csFilter); return hr; }

1 0

Andrew Eikum : dsound: Lock the source buffer during duplication.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 9cf7f95483cfa10b01a4cbd2dc97bee2b0c82235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf7f95483cfa10b01a4cbd2d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 16 14:02:45 2012 -0600 dsound: Lock the source buffer during duplication. --- dlls/dsound/buffer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bc9b955..1ea2d0d 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1083,9 +1083,15 @@ HRESULT IDirectSoundBufferImpl_Duplicate( *ppdsb = NULL; return DSERR_OUTOFMEMORY; } + + RtlAcquireResourceShared(&pdsb->lock, TRUE); + CopyMemory(dsb, pdsb, sizeof(*dsb)); dsb->pwfx = DSOUND_CopyFormat(pdsb->pwfx); + + RtlReleaseResource(&pdsb->lock); + if (dsb->pwfx == NULL) { HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL;

1 0

Gerald Pfeifer : libwine: Always build preloading code.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: 11e811411c272f7ea302ee5fba0a06d45afa222b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e811411c272f7ea302ee5fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 15 18:16:23 2012 +0100 libwine: Always build preloading code. --- libs/wine/config.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index fdd4700..d614825 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -456,7 +456,6 @@ const char *wine_get_build_id(void) /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ static void preloader_exec( char **argv, int use_preloader ) { -#ifdef linux if (use_preloader) { static const char preloader[] = "wine-preloader"; @@ -483,7 +482,6 @@ static void preloader_exec( char **argv, int use_preloader ) free( new_argv ); free( full_name ); } -#endif execv( argv[0], argv ); } @@ -494,7 +492,12 @@ void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) int use_preloader; if (!name) name = argv0_name; /* no name means default loader */ + +#ifdef linux use_preloader = !strendswith( name, "wineserver" ); +#else + use_preloader = 0; +#endif if ((ptr = strrchr( name, '/' ))) {

1 0

Austin English : wined3d: Recognize Nvidia 540M.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: fe30990e8d6d5daf7afa2315c175f9719ea29b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe30990e8d6d5daf7afa2315c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 16 14:54:48 2012 -0600 wined3d: Recognize Nvidia 540M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fd628e7..56cfa35 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1121,6 +1121,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1524,6 +1525,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ + {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f91e3f6..8e5edc5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1408,6 +1408,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, + CARD_NVIDIA_GEFORCE_GT540M = 0x0df4, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200,

1 0

Michael Stefaniuc : dsound: Drop "Buffer" from the IKsPropertySet method names.
by Alexandre Julliard 17 Jan '12

17 Jan '12

Module: wine Branch: master Commit: fd04e770f19b621f853dbdb061390f1c78c82812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd04e770f19b621f853dbdb06… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 17 01:50:14 2012 +0100 dsound: Drop "Buffer" from the IKsPropertySet method names. --- dlls/dsound/buffer.c | 56 +++++++++++++++++-------------------------------- 1 files changed, 20 insertions(+), 36 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 1ea2d0d..b0515bf 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1130,14 +1130,12 @@ HRESULT IDirectSoundBufferImpl_Duplicate( } /******************************************************************************* - * IKsBufferPropertySet + * IKsPropertySet */ /* IUnknown methods */ -static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface( - LPKSPROPERTYSET iface, - REFIID riid, - LPVOID *ppobj ) +static HRESULT WINAPI IKsPropertySetImpl_QueryInterface(IKsPropertySet *iface, REFIID riid, + void **ppobj) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); @@ -1145,7 +1143,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QueryInterface( return IDirectSoundBuffer_QueryInterface((LPDIRECTSOUNDBUFFER8)This->dsb, riid, ppobj); } -static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface) +static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); @@ -1153,7 +1151,7 @@ static ULONG WINAPI IKsBufferPropertySetImpl_AddRef(LPKSPROPERTYSET iface) return ref; } -static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface) +static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; ULONG ref = InterlockedDecrement(&(This->ref)); @@ -1168,15 +1166,9 @@ static ULONG WINAPI IKsBufferPropertySetImpl_Release(LPKSPROPERTYSET iface) return ref; } -static HRESULT WINAPI IKsBufferPropertySetImpl_Get( - LPKSPROPERTYSET iface, - REFGUID guidPropSet, - ULONG dwPropID, - LPVOID pInstanceData, - ULONG cbInstanceData, - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) +static HRESULT WINAPI IKsPropertySetImpl_Get(IKsPropertySet *iface, REFGUID guidPropSet, + ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData, + ULONG cbPropData, ULONG *pcbReturned) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; @@ -1186,14 +1178,9 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get( return E_PROP_ID_UNSUPPORTED; } -static HRESULT WINAPI IKsBufferPropertySetImpl_Set( - LPKSPROPERTYSET iface, - REFGUID guidPropSet, - ULONG dwPropID, - LPVOID pInstanceData, - ULONG cbInstanceData, - LPVOID pPropData, - ULONG cbPropData ) +static HRESULT WINAPI IKsPropertySetImpl_Set(IKsPropertySet *iface, REFGUID guidPropSet, + ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData, + ULONG cbPropData) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; @@ -1202,11 +1189,8 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set( return E_PROP_ID_UNSUPPORTED; } -static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport( - LPKSPROPERTYSET iface, - REFGUID guidPropSet, - ULONG dwPropID, - PULONG pTypeSupport ) +static HRESULT WINAPI IKsPropertySetImpl_QuerySupport(IKsPropertySet *iface, REFGUID guidPropSet, + ULONG dwPropID, ULONG *pTypeSupport) { IKsBufferPropertySetImpl *This = (IKsBufferPropertySetImpl *)iface; @@ -1216,12 +1200,12 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport( } static const IKsPropertySetVtbl iksbvt = { - IKsBufferPropertySetImpl_QueryInterface, - IKsBufferPropertySetImpl_AddRef, - IKsBufferPropertySetImpl_Release, - IKsBufferPropertySetImpl_Get, - IKsBufferPropertySetImpl_Set, - IKsBufferPropertySetImpl_QuerySupport + IKsPropertySetImpl_QueryInterface, + IKsPropertySetImpl_AddRef, + IKsPropertySetImpl_Release, + IKsPropertySetImpl_Get, + IKsPropertySetImpl_Set, + IKsPropertySetImpl_QuerySupport }; HRESULT IKsBufferPropertySetImpl_Create( @@ -1255,7 +1239,7 @@ HRESULT IKsBufferPropertySetImpl_Destroy( { TRACE("(%p)\n",piks); - while (IKsBufferPropertySetImpl_Release((LPKSPROPERTYSET)piks) > 0); + while (IKsPropertySetImpl_Release((LPKSPROPERTYSET)piks) > 0); return S_OK; }

1 0