March 2012 - Wine-commits - list.winehq.org

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 0c54f79c9e994b142cd93e02a653a743e396b9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c54f79c9e994b142cd93e02a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 30 16:05:22 2012 +0300 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 355a705..242b9e6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3446,10 +3446,8 @@ msgid "Expected ')'" msgstr "Odotettiin merkkiä ')'" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Virheellinen parametri.\n" +msgstr "Virheellinen merkki" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 5c4619d8a78df7fea92333cd83e05c8ce2b49b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4619d8a78df7fea92333cd8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 30 16:05:23 2012 +0300 po: Update Swedish translation. --- po/sv.po | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/po/sv.po b/po/sv.po index 74249e4..c74d60d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2185,10 +2185,8 @@ msgstr "" "återkallade eller betrodda certifikat:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Standard för kryptografisk meddelandesyntax/PKCS #7-meddelande (.p7b)" +msgstr "Standard för kryptografisk meddelandesyntax/PKCS #7-meddelande (*.p7b)" #: cryptui.rc:298 msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" @@ -2333,22 +2331,17 @@ msgid "Select the format you want to use:" msgstr "Välj formatet du vill använda:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-kodad X.509 (.cer)" +msgstr "&DER-kodad X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-kodad X.509 (.cer):" +msgstr "Ba&se64-kodad X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "Standard för &kryptografisk meddelandesyntax/PKCS #7 (.p7b)" +msgstr "" +"Standard för &kryptografisk meddelandesyntax/PKCS #7-meddelande (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -3448,10 +3441,8 @@ msgid "Expected ')'" msgstr "')' förväntades" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Ogiltig parameter.\n" +msgstr "Ogiltigt tecken" #: jscript.rc:38 msgid "Unterminated string constant" @@ -12620,9 +12611,8 @@ msgid "Select an executable file" msgstr "Välj en körbar fil" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Upptäck aut&omatiskt" +msgstr "Upptäck automatiskt" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Huw Davies : winspool: Add a helper to duplicate a devmode.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 2f78666a010a25f77f614affb875289581dbb877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f78666a010a25f77f614affb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 14:39:40 2012 +0100 winspool: Add a helper to duplicate a devmode. --- dlls/winspool.drv/info.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9bb8915..7fbede2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -338,6 +338,16 @@ static LPSTR strdupWtoA( LPCWSTR str ) return ret; } +static DEVMODEW *dup_devmode( const DEVMODEW *dm ) +{ + DEVMODEW *ret; + + if (!dm) return NULL; + ret = HeapAlloc( GetProcessHeap(), 0, dm->dmSize + dm->dmDriverExtra ); + if (ret) memcpy( ret, dm, dm->dmSize + dm->dmDriverExtra ); + return ret; +} + /****************************************************************** * verify, that the filename is a local file * @@ -2888,7 +2898,6 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, { BOOL ret = FALSE; job_t *job; - DWORD size; TRACE("(%p, %d, %d, %p, %d)\n", hPrinter, JobId, Level, pJob, Command); FIXME("Ignoring everything other than document title\n"); @@ -2915,14 +2924,7 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, HeapFree(GetProcessHeap(), 0, job->document_title); job->document_title = strdupW(info2->pDocument); HeapFree(GetProcessHeap(), 0, job->devmode); - if (info2->pDevMode) - { - size = info2->pDevMode->dmSize + info2->pDevMode->dmDriverExtra; - job->devmode = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(job->devmode, info2->pDevMode, size); - } - else - job->devmode = NULL; + job->devmode = dup_devmode( info2->pDevMode ); break; } case 3:

1 0

Huw Davies : winspool: Add a helper to free a printer entry.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 736fdbdec5fa17f117082b3d4e8d44179f2b2d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736fdbdec5fa17f117082b3d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 14:39:41 2012 +0100 winspool: Add a helper to free a printer entry. --- dlls/winspool.drv/info.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7fbede2..24e5a97 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -773,6 +773,14 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) return name; } +static void free_printer_entry( opened_printer_t *printer ) +{ + /* the queue is shared, so don't free that here */ + HeapFree( GetProcessHeap(), 0, printer->printername ); + HeapFree( GetProcessHeap(), 0, printer->name ); + HeapFree( GetProcessHeap(), 0, printer ); +} + /****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table @@ -883,11 +891,8 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { - /* Something failed: Free all resources */ - HeapFree(GetProcessHeap(), 0, printer->printername); - HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); - HeapFree(GetProcessHeap(), 0, printer); + free_printer_entry( printer ); } return (HANDLE)handle; @@ -2722,9 +2727,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) HeapFree(GetProcessHeap(), 0, printer->queue); } - HeapFree(GetProcessHeap(), 0, printer->printername); - HeapFree(GetProcessHeap(), 0, printer->name); - HeapFree(GetProcessHeap(), 0, printer); + free_printer_entry( printer ); printer_handles[i - 1] = NULL; ret = TRUE; }

1 0

Henri Verbeet : ddraw: Get rid of a couple of redundant else-statements.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: f3d1d4790c139e72b5440602fcf5eb2c7d8cec53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d1d4790c139e72b5440602f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:34 2012 +0200 ddraw: Get rid of a couple of redundant else-statements. --- dlls/ddraw/surface.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cca17ab..bf36825 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -150,44 +150,50 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, TRACE("(%p) returning IDirectDrawSurface7 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface4)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface4)) { IDirectDrawSurface4_AddRef(&This->IDirectDrawSurface4_iface); *obj = &This->IDirectDrawSurface4_iface; TRACE("(%p) returning IDirectDrawSurface4 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface3)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface3)) { IDirectDrawSurface3_AddRef(&This->IDirectDrawSurface3_iface); *obj = &This->IDirectDrawSurface3_iface; TRACE("(%p) returning IDirectDrawSurface3 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface2)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface2)) { IDirectDrawSurface2_AddRef(&This->IDirectDrawSurface2_iface); *obj = &This->IDirectDrawSurface2_iface; TRACE("(%p) returning IDirectDrawSurface2 interface at %p\n", This, *obj); return S_OK; } - else if (IsEqualGUID(riid, &IID_IDirectDrawSurface)) + + if (IsEqualGUID(riid, &IID_IDirectDrawSurface)) { IDirectDrawSurface_AddRef(&This->IDirectDrawSurface_iface); *obj = &This->IDirectDrawSurface_iface; TRACE("(%p) returning IDirectDrawSurface interface at %p\n", This, *obj); return S_OK; } - else if( IsEqualGUID(riid, &IID_IDirectDrawGammaControl) ) + + if (IsEqualGUID(riid, &IID_IDirectDrawGammaControl)) { IDirectDrawGammaControl_AddRef(&This->IDirectDrawGammaControl_iface); *obj = &This->IDirectDrawGammaControl_iface; TRACE("(%p) returning IDirectDrawGammaControl interface at %p\n", This, *obj); return S_OK; } - else if( IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) || - IsEqualGUID(riid, &IID_IDirect3DHALDevice)|| - IsEqualGUID(riid, &IID_IDirect3DRGBDevice) ) + + if (IsEqualGUID(riid, &IID_D3DDEVICE_WineD3D) + || IsEqualGUID(riid, &IID_IDirect3DHALDevice) + || IsEqualGUID(riid, &IID_IDirect3DRGBDevice)) { IDirect3DDevice7 *d3d; IDirect3DDeviceImpl *device_impl; @@ -208,8 +214,9 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, WARN("Unable to create a IDirect3DDevice instance, returning E_NOINTERFACE\n"); return E_NOINTERFACE; } - else if (IsEqualGUID( &IID_IDirect3DTexture, riid ) || - IsEqualGUID( &IID_IDirect3DTexture2, riid )) + + if (IsEqualGUID( &IID_IDirect3DTexture2, riid) + || IsEqualGUID(&IID_IDirect3DTexture, riid)) { if (IsEqualGUID( &IID_IDirect3DTexture, riid )) {

1 0

Henri Verbeet : ddraw: Replace a ERR in ddraw_surface7_QueryInterface() with a WARN.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: a6230756121384ead6fca1308a42ae2fcd66ac99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6230756121384ead6fca1308… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:35 2012 +0200 ddraw: Replace a ERR in ddraw_surface7_QueryInterface() with a WARN. --- dlls/ddraw/surface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bf36825..2178064 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -232,7 +232,8 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } - ERR("No interface\n"); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + return E_NOINTERFACE; }

1 0

Henri Verbeet : ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface .
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: f7719a89adb83e91662cc6840f23afc23081c947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7719a89adb83e91662cc6840… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:36 2012 +0200 ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2178064..202eb4d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -142,8 +142,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, if(!riid) return DDERR_INVALIDPARAMS; - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirectDrawSurface7) ) + if (IsEqualGUID(riid, &IID_IDirectDrawSurface7)) { IDirectDrawSurface7_AddRef(iface); *obj = iface; @@ -175,7 +174,8 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, return S_OK; } - if (IsEqualGUID(riid, &IID_IDirectDrawSurface)) + if (IsEqualGUID(riid, &IID_IDirectDrawSurface) + || IsEqualGUID(riid, &IID_IUnknown)) { IDirectDrawSurface_AddRef(&This->IDirectDrawSurface_iface); *obj = &This->IDirectDrawSurface_iface;

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DSwapChain9Impl_QueryInterface ().
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: b76f0aeee0476f14f7cd77941047776a6e4701ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76f0aeee0476f14f7cd77941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:37 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DSwapChain9Impl_QueryInterface(). --- dlls/d3d9/swapchain.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index b9bff96..7a13848 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -28,18 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); /* IDirect3DSwapChain IUnknown parts follow: */ static HRESULT WINAPI IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) { + if (IsEqualGUID(riid, &IID_IDirect3DSwapChain9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DSwapChain9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface ().
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: fa3838e9deb0495a667f9306b84c1fdeca7ab24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3838e9deb0495a667f9306b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 01:08:38 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface(). --- dlls/d3d9/surface.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index eb78a01..e453ed8 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -34,19 +34,19 @@ static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurfac static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(IDirect3DSurface9 *iface, REFIID riid, void **ppobj) { - IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DSurface9)) { + if (IsEqualGUID(riid, &IID_IDirect3DSurface9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DSurface9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Aric Stewart : quartz: Update null renderer to use the BaseRenderer from strmbase.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 3b85b13e27b4f5bb7a6d179619b231301dfcbcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b85b13e27b4f5bb7a6d17961… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 29 19:21:54 2012 -0500 quartz: Update null renderer to use the BaseRenderer from strmbase. --- dlls/quartz/nullrenderer.c | 297 ++++++-------------------------------------- 1 files changed, 36 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b85b13e27b4f5bb7a6d1…

1 0