February 2012 - Wine-Commits

Andrew Eikum : wineoss.drv: Downgrade most ERRs to WARNs.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 67617c78a55d5e14df4759927f4f839e538f1853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67617c78a55d5e14df4759927… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 7 10:07:38 2012 -0600 wineoss.drv: Downgrade most ERRs to WARNs. --- dlls/wineoss.drv/mmdevdrv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 35ff7d7..5f8c4ac 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -491,7 +491,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, return E_INVALIDARG; } if(This->fd < 0){ - ERR("Unable to open device %s: %d (%s)\n", devnode, errno, + WARN("Unable to open device %s: %d (%s)\n", devnode, errno, strerror(errno)); HeapFree(GetProcessHeap(), 0, This); return AUDCLNT_E_DEVICE_INVALIDATED; @@ -501,7 +501,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, This->ai.dev = -1; if(ioctl(This->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){ - ERR("Unable to get audio info for device %s: %d (%s)\n", devnode, + WARN("Unable to get audio info for device %s: %d (%s)\n", devnode, errno, strerror(errno)); close(This->fd); HeapFree(GetProcessHeap(), 0, This); @@ -1106,7 +1106,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, fd = open(This->devnode, O_RDONLY | O_NONBLOCK, 0); if(fd < 0){ - ERR("Unable to open device %s: %d (%s)\n", This->devnode, errno, + WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno, strerror(errno)); return AUDCLNT_E_DEVICE_INVALIDATED; } @@ -1161,7 +1161,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.wBitsPerSample = 24; fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }else{ - ERR("Didn't recognize any available OSS formats: %x\n", formats); + WARN("Didn't recognize any available OSS formats: %x\n", formats); CoTaskMemFree(fmt); return E_FAIL; }

1 0

Austin English : kernel32: Add support for IOCTL_STORAGE_CHECK_VERIFY2.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 93ed8a062d659a06340864568865601efa80ca7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ed8a062d659a06340864568… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 7 11:42:42 2012 -0800 kernel32: Add support for IOCTL_STORAGE_CHECK_VERIFY2. --- dlls/ntdll/cdrom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 2722998..802782b 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -182,6 +182,7 @@ X(IOCTL_SCSI_GET_INQUIRY_DATA) X(IOCTL_SCSI_PASS_THROUGH) X(IOCTL_SCSI_PASS_THROUGH_DIRECT) X(IOCTL_STORAGE_CHECK_VERIFY) +X(IOCTL_STORAGE_CHECK_VERIFY2) X(IOCTL_STORAGE_EJECTION_CONTROL) X(IOCTL_STORAGE_EJECT_MEDIA) X(IOCTL_STORAGE_GET_DEVICE_NUMBER) @@ -2857,9 +2858,10 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, switch (dwIoControlCode) { - case IOCTL_STORAGE_CHECK_VERIFY: case IOCTL_CDROM_CHECK_VERIFY: case IOCTL_DISK_CHECK_VERIFY: + case IOCTL_STORAGE_CHECK_VERIFY: + case IOCTL_STORAGE_CHECK_VERIFY2: sz = 0; CDROM_ClearCacheEntry(dev); if (lpInBuffer != NULL || nInBufferSize != 0 || lpOutBuffer != NULL || nOutBufferSize != 0)

1 0

Andrew Eikum : winmm: Downgrade most ERRs to WARNs.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: be7a93cf56e8a8a54d2ec08760e4e32d18ce04bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7a93cf56e8a8a54d2ec0876… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 7 10:07:49 2012 -0600 winmm: Downgrade most ERRs to WARNs. --- dlls/winmm/waveform.c | 86 ++++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be7a93cf56e8a8a54d2ec…

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in the Slovenian translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: a91464b05d7334a96e1408c8960dbe729b779eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91464b05d7334a96e1408c89… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 10:30:03 2012 +0100 po: Fix some trailing ellipses errors in the Slovenian translation. --- po/sl.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 58be381..f7e2f25 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6756,7 +6756,7 @@ msgstr "&Nastavi ..." #: msvfw32.rc:40 msgid "&About" -msgstr "&O ..." +msgstr "&O" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -12599,7 +12599,7 @@ msgstr "&Dodaj ..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "&Samodejno zaznaj ..." +msgstr "&Samodejno zaznaj" #: winecfg.rc:232 msgid "&Path:" @@ -13299,7 +13299,7 @@ msgstr "Preime&nuj ..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "&Lastnosti ...\tAlt+Enter" +msgstr "&Lastnosti\tAlt+Enter" #: winefile.rc:33 msgid "&Run..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Brazilian Portuguese translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 78ce1bd0c3e6f022f324eb517e753578128209e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ce1bd0c3e6f022f324eb517… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:10 2012 +0100 po: Fix some trailing ellipses errors in Brazilian Portuguese translation. --- po/pt_BR.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index dfcf031..cdee8a5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10818,7 +10818,7 @@ msgstr "&Copiar...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "&Propriedades...\tAlt+Enter" +msgstr "&Propriedades\tAlt+Enter" #: progman.rc:37 msgid "&Execute..."

1 0

Huw Davies : ole32: Don't hold a ref to the drop target in the wrapper. Apps tend to destroy the target object without calling RevokeDragDrop.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 5c8edb0449f6c261b9d7d1756011a08decd4c081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8edb0449f6c261b9d7d1756… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 12:02:26 2012 +0000 ole32: Don't hold a ref to the drop target in the wrapper. Apps tend to destroy the target object without calling RevokeDragDrop. --- dlls/ole32/ole2.c | 72 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b449a76..cb667c9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -382,10 +382,12 @@ static HRESULT create_stream_from_map(HANDLE map, IStream **stream) * IDropTarget::QueryInterface(). Windows doesn't expose this because it * doesn't call CoMarshallInterface() in RegisterDragDrop(). * The wrapper is only used internally, and only exists for the life of - * the marshal. */ + * the marshal. We don't want to hold a ref on the app provided target + * as some apps destroy this prior to CoUninitialize without calling + * RevokeDragDrop. The only (long-term) ref is held by the window prop. */ typedef struct { IDropTarget IDropTarget_iface; - IDropTarget* inner; + HWND hwnd; LONG refs; } DropTargetWrapper; @@ -420,22 +422,34 @@ static ULONG WINAPI DropTargetWrapper_Release(IDropTarget* iface) { DropTargetWrapper* This = impl_from_IDropTarget(iface); ULONG refs = InterlockedDecrement(&This->refs); - if (!refs) - { - IDropTarget_Release(This->inner); - HeapFree(GetProcessHeap(), 0, This); - } + if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; } +static inline HRESULT get_target_from_wrapper( IDropTarget *wrapper, IDropTarget **target ) +{ + DropTargetWrapper* This = impl_from_IDropTarget( wrapper ); + *target = GetPropW( This->hwnd, prop_oledroptarget ); + if (!*target) return DRAGDROP_E_NOTREGISTERED; + IDropTarget_AddRef( *target ); + return S_OK; +} + static HRESULT WINAPI DropTargetWrapper_DragEnter(IDropTarget* iface, IDataObject* pDataObj, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragEnter(This->inner, pDataObj, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragEnter( target, pDataObj, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, @@ -443,14 +457,28 @@ static HRESULT WINAPI DropTargetWrapper_DragOver(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragOver(This->inner, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragOver( target, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_DragLeave(IDropTarget* iface) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_DragLeave(This->inner); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_DragLeave( target ); + IDropTarget_Release( target ); + } + return r; } static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, @@ -459,8 +487,15 @@ static HRESULT WINAPI DropTargetWrapper_Drop(IDropTarget* iface, POINTL pt, DWORD* pdwEffect) { - DropTargetWrapper* This = impl_from_IDropTarget(iface); - return IDropTarget_Drop(This->inner, pDataObj, grfKeyState, pt, pdwEffect); + IDropTarget *target; + HRESULT r = get_target_from_wrapper( iface, &target ); + + if (SUCCEEDED( r )) + { + r = IDropTarget_Drop( target, pDataObj, grfKeyState, pt, pdwEffect ); + IDropTarget_Release( target ); + } + return r; } static const IDropTargetVtbl DropTargetWrapperVTbl = @@ -474,15 +509,14 @@ static const IDropTargetVtbl DropTargetWrapperVTbl = DropTargetWrapper_Drop }; -static IDropTarget* WrapDropTarget(IDropTarget* inner) +static IDropTarget* WrapDropTarget( HWND hwnd ) { DropTargetWrapper* This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (This) { - IDropTarget_AddRef(inner); This->IDropTarget_iface.lpVtbl = &DropTargetWrapperVTbl; - This->inner = inner; + This->hwnd = hwnd; This->refs = 1; } return &This->IDropTarget_iface; @@ -562,7 +596,7 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) if(FAILED(hr)) return hr; /* IDropTarget::QueryInterface() shouldn't be called, some (broken) apps depend on this. */ - wrapper = WrapDropTarget(pDropTarget); + wrapper = WrapDropTarget( hwnd ); if(!wrapper) { IStream_Release(stream);

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Russian translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: ed3c69091054505a199683d321940013cc7ba533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3c69091054505a199683d32… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:18 2012 +0100 po: Fix some trailing ellipses errors in Russian translation. --- po/ru.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4bc676f..61e20a3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6751,7 +6751,7 @@ msgstr "&Настройки..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Информация..." +msgstr "&Информация" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -10765,7 +10765,7 @@ msgstr "&Создать..." #: progman.rc:31 msgid "O&pen\tEnter" -msgstr "О&ткрыть...\tEnter" +msgstr "О&ткрыть\tEnter" #: progman.rc:32 winefile.rc:27 msgid "&Move...\tF7"

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Italian translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 6900853f91c1e1da66f69156a88e813e1c2da600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6900853f91c1e1da66f69156a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:12 2012 +0100 po: Fix some trailing ellipses errors in Italian translation. --- po/it.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/it.po b/po/it.po index 8256063..088d8d4 100644 --- a/po/it.po +++ b/po/it.po @@ -10828,7 +10828,7 @@ msgstr "&Copia...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "Propri&età...\tAlt+Invio" +msgstr "Propri&età\tAlt+Invio" #: progman.rc:37 msgid "&Execute..." @@ -13326,7 +13326,7 @@ msgstr "Ri&nomina..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "Propri&età...\tAlt+Invio" +msgstr "Propri&età\tAlt+Invio" #: winefile.rc:33 msgid "&Run..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Norwegian Bokmål translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: c6b237896ca9a834fcc9a951babb2b9ae641b31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b237896ca9a834fcc9a951b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:15 2012 +0100 po: Fix some trailing ellipses errors in Norwegian Bokmål translation. --- po/nb_NO.po | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 60d146c..65a8874 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2269,8 +2269,9 @@ msgid "&File name:" msgstr "&Filnavn:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Bla" +msgstr "Bla..." #: cryptui.rc:294 #, fuzzy @@ -6983,7 +6984,7 @@ msgstr "&Oppsett..." #: msvfw32.rc:40 msgid "&About" -msgstr "O&m..." +msgstr "O&m" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -8028,7 +8029,7 @@ msgstr "&Åpne:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Bla" +msgstr "&Bla..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -9496,8 +9497,9 @@ msgid "Digi&tal" msgstr "Digi&tal" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 +#, fuzzy msgid "&Font..." -msgstr "Skrift" +msgstr "Skrift..." #: clock.rc:34 msgid "&Without Titlebar" @@ -12848,7 +12850,7 @@ msgstr "Gjeldende overstyringer:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "R&ediger" +msgstr "R&ediger..." #: winecfg.rc:196 msgid "Edit Override" @@ -12902,7 +12904,7 @@ msgstr "&Legg til..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "&Automatisk..." +msgstr "&Automatisk" #: winecfg.rc:232 msgid "&Path:" @@ -13867,7 +13869,7 @@ msgstr "&Ekspert" #: winemine.rc:42 msgid "&Custom..." -msgstr "E&gendefinert" +msgstr "E&gendefinert..." #: winemine.rc:44 #, fuzzy @@ -13984,8 +13986,9 @@ msgid "Always on &top" msgstr "All&tid øverst" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" -msgstr "&Informasjon..." +msgstr "&Informasjon" #: winhlp32.rc:64 msgid "Annotation..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Portuguese translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: a4c2d85b164ea531997893d9e58c1822e525b369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c2d85b164ea531997893d9e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:17 2012 +0100 po: Fix some trailing ellipses errors in Portuguese translation. --- po/pt_PT.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 566b5b4..d6db7c0 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2281,7 +2281,7 @@ msgstr "&Nome do ficheiro:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "P&rocurar" +msgstr "P&rocurar..." #: cryptui.rc:294 #, fuzzy @@ -6991,7 +6991,7 @@ msgstr "Con&figurar..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Sobre..." +msgstr "&Sobre" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -8039,7 +8039,7 @@ msgstr "&Abrir:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Procurar" +msgstr "&Procurar..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -9540,7 +9540,7 @@ msgstr "Digi&tal" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "Tipo de &Letra" +msgstr "Tipo de &Letra..." #: clock.rc:34 msgid "&Without Titlebar" @@ -10511,7 +10511,7 @@ msgstr "Serviços dependentes estão a correr\n" #: notepad.rc:27 msgid "&New\tCtrl+N" -msgstr "&Novo..." +msgstr "&Novo\tCtrl+N" #: notepad.rc:28 wordpad.rc:29 #, fuzzy @@ -10624,7 +10624,7 @@ msgstr "&Conteúdo" #: notepad.rc:59 msgid "&About Notepad" -msgstr "&Acerca do Notepad..." +msgstr "&Acerca do Notepad" #: notepad.rc:97 msgid "Page Setup" @@ -11481,7 +11481,7 @@ msgstr "&Dividir" #: regedit.rc:74 msgid "&Remove Favorite..." -msgstr "&Remover Favorito" +msgstr "&Remover Favorito..." #: regedit.rc:79 msgid "&About Registry Editor" @@ -12945,7 +12945,7 @@ msgstr "Substituições E&xistentes:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Editar" +msgstr "&Editar..." #: winecfg.rc:196 msgid "Edit Override" @@ -12999,7 +12999,7 @@ msgstr "&Adicionar..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&detectar..." +msgstr "Auto&detectar" #: winecfg.rc:232 msgid "&Path:" @@ -14083,6 +14083,7 @@ msgid "Always on &top" msgstr "Sempre &visível" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" msgstr "&Informações..."

1 0