January 2011 - Wine-commits

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in AsyncBindCtx.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 346e766d5364c566a62f0830fa412cb9c4f73f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=346e766d5364c566a62f0830f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:41:11 2011 +0100 urlmon: Use an iface instead of a vtbl pointer in AsyncBindCtx. --- dlls/urlmon/bindctx.c | 51 ++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index f04b3e4..1af7fa7 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -616,32 +616,33 @@ HRESULT WINAPI RevokeBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc } typedef struct { - const IBindCtxVtbl *lpBindCtxVtbl; + IBindCtx IBindCtx_iface; LONG ref; IBindCtx *bindctx; } AsyncBindCtx; -#define BINDCTX(x) ((IBindCtx*) &(x)->lpBindCtxVtbl) - -#define BINDCTX_THIS(iface) DEFINE_THIS(AsyncBindCtx, BindCtx, iface) +static inline AsyncBindCtx *impl_from_IBindCtx(IBindCtx *iface) +{ + return CONTAINING_RECORD(iface, AsyncBindCtx, IBindCtx_iface); +} static HRESULT WINAPI AsyncBindCtx_QueryInterface(IBindCtx *iface, REFIID riid, void **ppv) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); *ppv = NULL; if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = BINDCTX(This); + *ppv = &This->IBindCtx_iface; }else if(IsEqualGUID(riid, &IID_IBindCtx)) { TRACE("(%p)->(IID_IBindCtx %p)\n", This, ppv); - *ppv = BINDCTX(This); + *ppv = &This->IBindCtx_iface; }else if(IsEqualGUID(riid, &IID_IAsyncBindCtx)) { TRACE("(%p)->(IID_IAsyncBindCtx %p)\n", This, ppv); - *ppv = BINDCTX(This); + *ppv = &This->IBindCtx_iface; } if(*ppv) { @@ -655,7 +656,7 @@ static HRESULT WINAPI AsyncBindCtx_QueryInterface(IBindCtx *iface, REFIID riid, static ULONG WINAPI AsyncBindCtx_AddRef(IBindCtx *iface) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -665,7 +666,7 @@ static ULONG WINAPI AsyncBindCtx_AddRef(IBindCtx *iface) static ULONG WINAPI AsyncBindCtx_Release(IBindCtx *iface) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -680,7 +681,7 @@ static ULONG WINAPI AsyncBindCtx_Release(IBindCtx *iface) static HRESULT WINAPI AsyncBindCtx_RegisterObjectBound(IBindCtx *iface, IUnknown *punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, punk); @@ -689,7 +690,7 @@ static HRESULT WINAPI AsyncBindCtx_RegisterObjectBound(IBindCtx *iface, IUnknown static HRESULT WINAPI AsyncBindCtx_RevokeObjectBound(IBindCtx *iface, IUnknown *punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p %p)\n", This, punk); @@ -698,7 +699,7 @@ static HRESULT WINAPI AsyncBindCtx_RevokeObjectBound(IBindCtx *iface, IUnknown * static HRESULT WINAPI AsyncBindCtx_ReleaseBoundObjects(IBindCtx *iface) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)\n", This); @@ -707,7 +708,7 @@ static HRESULT WINAPI AsyncBindCtx_ReleaseBoundObjects(IBindCtx *iface) static HRESULT WINAPI AsyncBindCtx_SetBindOptions(IBindCtx *iface, BIND_OPTS *pbindopts) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pbindopts); @@ -716,7 +717,7 @@ static HRESULT WINAPI AsyncBindCtx_SetBindOptions(IBindCtx *iface, BIND_OPTS *pb static HRESULT WINAPI AsyncBindCtx_GetBindOptions(IBindCtx *iface, BIND_OPTS *pbindopts) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pbindopts); @@ -725,7 +726,7 @@ static HRESULT WINAPI AsyncBindCtx_GetBindOptions(IBindCtx *iface, BIND_OPTS *pb static HRESULT WINAPI AsyncBindCtx_GetRunningObjectTable(IBindCtx *iface, IRunningObjectTable **pprot) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pprot); @@ -734,7 +735,7 @@ static HRESULT WINAPI AsyncBindCtx_GetRunningObjectTable(IBindCtx *iface, IRunni static HRESULT WINAPI AsyncBindCtx_RegisterObjectParam(IBindCtx *iface, LPOLESTR pszkey, IUnknown *punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_w(pszkey), punk); @@ -743,7 +744,7 @@ static HRESULT WINAPI AsyncBindCtx_RegisterObjectParam(IBindCtx *iface, LPOLESTR static HRESULT WINAPI AsyncBindCtx_GetObjectParam(IBindCtx* iface, LPOLESTR pszkey, IUnknown **punk) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_w(pszkey), punk); @@ -752,7 +753,7 @@ static HRESULT WINAPI AsyncBindCtx_GetObjectParam(IBindCtx* iface, LPOLESTR pszk static HRESULT WINAPI AsyncBindCtx_RevokeObjectParam(IBindCtx *iface, LPOLESTR pszkey) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pszkey)); @@ -761,15 +762,13 @@ static HRESULT WINAPI AsyncBindCtx_RevokeObjectParam(IBindCtx *iface, LPOLESTR p static HRESULT WINAPI AsyncBindCtx_EnumObjectParam(IBindCtx *iface, IEnumString **pszkey) { - AsyncBindCtx *This = BINDCTX_THIS(iface); + AsyncBindCtx *This = impl_from_IBindCtx(iface); TRACE("(%p)->(%p)\n", This, pszkey); return IBindCtx_EnumObjectParam(This->bindctx, pszkey); } -#undef BINDCTX_THIS - static const IBindCtxVtbl AsyncBindCtxVtbl = { AsyncBindCtx_QueryInterface, @@ -876,16 +875,16 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, ret = heap_alloc(sizeof(AsyncBindCtx)); - ret->lpBindCtxVtbl = &AsyncBindCtxVtbl; + ret->IBindCtx_iface.lpVtbl = &AsyncBindCtxVtbl; ret->ref = 1; ret->bindctx = bindctx; - hres = init_bindctx(BINDCTX(ret), options, callback, format); + hres = init_bindctx(&ret->IBindCtx_iface, options, callback, format); if(FAILED(hres)) { - IBindCtx_Release(BINDCTX(ret)); + IBindCtx_Release(&ret->IBindCtx_iface); return hres; } - *pbind = BINDCTX(ret); + *pbind = &ret->IBindCtx_iface; return S_OK; }

1 0

Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in BmpEncoder.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: d341bea6735f3ebb09e2cd2719093ade956403d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d341bea6735f3ebb09e2cd271… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 11 00:43:15 2011 +0100 windowscodecs: Use an iface instead of a vtbl pointer in BmpEncoder. --- dlls/windowscodecs/bmpencode.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 410c646..69148af 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -412,16 +412,21 @@ static const IWICBitmapFrameEncodeVtbl BmpFrameEncode_Vtbl = { }; typedef struct BmpEncoder { - const IWICBitmapEncoderVtbl *lpVtbl; + IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; IStream *stream; BmpFrameEncode *frame; } BmpEncoder; +static inline BmpEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) +{ + return CONTAINING_RECORD(iface, BmpEncoder, IWICBitmapEncoder_iface); +} + static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -443,7 +448,7 @@ static HRESULT WINAPI BmpEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -453,7 +458,7 @@ static ULONG WINAPI BmpEncoder_AddRef(IWICBitmapEncoder *iface) static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -471,7 +476,7 @@ static ULONG WINAPI BmpEncoder_Release(IWICBitmapEncoder *iface) static HRESULT WINAPI BmpEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); @@ -523,7 +528,7 @@ static HRESULT WINAPI BmpEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); BmpFrameEncode *encode; HRESULT hr; @@ -565,7 +570,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI BmpEncoder_Commit(IWICBitmapEncoder *iface) { - BmpEncoder *This = (BmpEncoder*)iface; + BmpEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p)\n", iface); if (!This->frame || !This->frame->committed) return WINCODEC_ERR_WRONGSTATE; @@ -610,13 +615,13 @@ HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpEncoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BmpEncoder_Vtbl; + This->IWICBitmapEncoder_iface.lpVtbl = &BmpEncoder_Vtbl; This->ref = 1; This->stream = NULL; This->frame = NULL; - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

1 0

Andrew Eikum : mmdevapi: Prevent deadlock when releasing a stream that' s still playing.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: bd6f6bc2dd7ba366dddb186cebbc1b1f4fcb1015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f6bc2dd7ba366dddb186ce… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 10 14:10:50 2011 -0600 mmdevapi: Prevent deadlock when releasing a stream that's still playing. --- dlls/mmdevapi/audio.c | 3 ++ dlls/mmdevapi/tests/render.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index 6217cba..56e6187 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -313,7 +313,10 @@ HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) static void AudioClient_Destroy(ACImpl *This) { if (This->timer_id) + { DeleteTimerQueueTimer(NULL, This->timer_id, INVALID_HANDLE_VALUE); + This->timer_id = 0; + } if (This->render) AudioRenderClient_Destroy(This->render); if (This->capture) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 22e8c9b..f7d7eb1 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -334,6 +334,52 @@ static void test_references(void) ok(ref == 0, "AudioClock_Release gave wrong refcount: %u\n", ref); } +static void test_event(void) +{ + HANDLE event; + HRESULT hr; + IAudioClient *ac; + WAVEFORMATEX *pwfx; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 5000000, + 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed\n"); + + hr = IAudioClient_Start(ac); + ok(hr == AUDCLNT_E_EVENTHANDLE_NOT_SET, "Start failed: %08x\n", hr); + + hr = IAudioClient_SetEventHandle(ac, event); + ok(hr == S_OK, "SetEventHandle failed: %08x\n", hr); + + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioClient_Stop(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + /* test releasing a playing stream */ + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + IAudioClient_Release(ac); + + CloseHandle(event); +} + START_TEST(render) { HRESULT hr; @@ -360,6 +406,7 @@ START_TEST(render) test_audioclient(); test_references(); + test_event(); IMMDevice_Release(dev);

1 0

Jacek Caban : mshtml: Get rid of win9x test failures workarounds.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 226c44097b26dcb547d533cb1690f60182d1728e URL: http://source.winehq.org/git/wine.git/?a=commit;h=226c44097b26dcb547d533cb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 10 23:07:46 2011 +0100 mshtml: Get rid of win9x test failures workarounds. --- dlls/mshtml/tests/htmldoc.c | 47 ++++++++++++------------------------------ 1 files changed, 14 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ed322ba..75be8ab 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -165,7 +165,7 @@ static BOOL expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex, ipsw; static BOOL set_clientsite, container_locked, navigated_load; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; -static BOOL editmode = FALSE, show_failed; +static BOOL editmode = FALSE; static BOOL inplace_deactivated, open_call; static int stream_read, protocol_read; static enum load_state_t { @@ -2044,14 +2044,6 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum expect_status_text = (load_state == LD_COMPLETE ? (LPCOLESTR)0xdeadbeef : NULL); hres = IOleDocumentView_Show(view, TRUE); - if(FAILED(hres)) { - win_skip("Show failed\n"); - if(activeobj) - IOleInPlaceActiveObject_Release(activeobj); - IOleDocument_Release(document); - show_failed = TRUE; - return S_OK; - } ok(hres == S_OK, "Show failed: %08x\n", hres); CHECK_CALLED(CanInPlaceActivate); @@ -4769,10 +4761,6 @@ static void test_HTMLDocument_hlink(void) test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, &Moniker); test_Navigate(doc); - if(show_failed) { - IUnknown_Release(doc); - return; - } test_download(DWL_CSS|DWL_TRYCSS); @@ -4874,11 +4862,6 @@ static void test_HTMLDocument_http(void) test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, http_mon); test_Navigate(doc); - if(show_failed) { - IUnknown_Release(doc); - return; - } - test_download(DWL_HTTP); test_cookies(doc); test_IsDirty(doc, S_FALSE); @@ -5405,21 +5388,19 @@ START_TEST(htmldoc) register_protocol(); test_HTMLDocument_hlink(); - if(!show_failed) { - test_HTMLDocument(FALSE); - test_HTMLDocument(TRUE); - test_HTMLDocument_StreamLoad(); - test_HTMLDocument_StreamInitNew(); - test_editing_mode(FALSE); - test_editing_mode(TRUE); - test_HTMLDocument_http(); - test_UIActivate(FALSE, FALSE, FALSE); - test_UIActivate(FALSE, TRUE, FALSE); - test_UIActivate(FALSE, TRUE, TRUE); - test_UIActivate(TRUE, FALSE, FALSE); - test_UIActivate(TRUE, TRUE, FALSE); - test_UIActivate(TRUE, TRUE, TRUE); - } + test_HTMLDocument(FALSE); + test_HTMLDocument(TRUE); + test_HTMLDocument_StreamLoad(); + test_HTMLDocument_StreamInitNew(); + test_editing_mode(FALSE); + test_editing_mode(TRUE); + test_HTMLDocument_http(); + test_UIActivate(FALSE, FALSE, FALSE); + test_UIActivate(FALSE, TRUE, FALSE); + test_UIActivate(FALSE, TRUE, TRUE); + test_UIActivate(TRUE, FALSE, FALSE); + test_UIActivate(TRUE, TRUE, FALSE); + test_UIActivate(TRUE, TRUE, TRUE); test_HTMLDoc_ISupportErrorInfo(); test_IPersistHistory();

1 0

Vincent Povirk : windowscodecs: Ignore the alpha channel of ICO files if it 's empty.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: d747652102d6e1e5662a0f49da7ffdbce3a3f460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d747652102d6e1e5662a0f49d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 10 14:36:19 2011 -0600 windowscodecs: Ignore the alpha channel of ICO files if it's empty. --- dlls/windowscodecs/icoformat.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index e6a590f..1e939d7 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -277,6 +277,30 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) IWICBitmapFrameDecode_Release(framedecode); } + if (SUCCEEDED(hr) && has_alpha) + { + /* If the alpha channel is fully transparent, we should ignore it. */ + int nonzero_alpha = 0; + int i; + + for (i=0; i<(result->height*result->width); i++) + { + if (result->bits[i*4+3] != 0) + { + nonzero_alpha = 1; + break; + } + } + + if (!nonzero_alpha) + { + for (i=0; i<(result->height*result->width); i++) + result->bits[i*4+3] = 0xff; + + has_alpha = FALSE; + } + } + if (SUCCEEDED(hr) && !has_alpha) { /* set alpha data based on the AND mask */

1 0

Vincent Povirk : windowscodecs: Add a utility function for swapping 8-bit BGR/RGB data.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: d9fb1a4b92ddf186bd17cb89cc1cd7ed3f9c2951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fb1a4b92ddf186bd17cb89c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 10 15:23:17 2011 -0600 windowscodecs: Add a utility function for swapping 8-bit BGR/RGB data. --- dlls/windowscodecs/jpegformat.c | 17 ++++------------- dlls/windowscodecs/main.c | 19 +++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 15 +++------------ dlls/windowscodecs/wincodecs_private.h | 2 ++ 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index e7a22c9..789a60b 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -577,7 +577,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, UINT first_scanline = This->cinfo.output_scanline; UINT max_rows; JSAMPROW out_rows[4]; - UINT i, j; + UINT i; JDIMENSION ret; max_rows = min(This->cinfo.output_height-first_scanline, 4); @@ -596,18 +596,9 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, if (bpp == 24) { /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ - for (i=first_scanline; i<This->cinfo.output_scanline; i++) - { - BYTE *pixel = This->image_data + stride * i; - for (j=0; j<This->cinfo.output_width; j++) - { - BYTE red=pixel[0]; - BYTE blue=pixel[2]; - pixel[0]=blue; - pixel[2]=red; - pixel+=3; - } - } + reverse_bgr8(3, This->image_data + stride * first_scanline, + This->cinfo.output_width, This->cinfo.output_scanline - first_scanline, + stride); } if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 823fec2..a6588fd 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -112,3 +112,22 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, return E_FAIL; } } + +void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) +{ + UINT x, y; + BYTE *pixel, temp; + + for (y=0; y<height; y++) + { + pixel = bits + stride * y; + + for (x=0; x<width; x++) + { + temp = pixel[2]; + pixel[2] = pixel[0]; + pixel[0] = temp; + pixel += bytesperpixel; + } + } +} diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 9dfd4ba..5c8aae9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -800,19 +800,10 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT { if (This->decode_info.bps == 8) { - UINT i, total_pixels, sample_count; - BYTE *pixel, temp; + UINT sample_count = This->decode_info.samples; - total_pixels = This->decode_info.tile_width * This->decode_info.tile_height; - pixel = This->cached_tile; - sample_count = This->decode_info.samples; - for (i=0; i<total_pixels; i++) - { - temp = pixel[2]; - pixel[2] = pixel[0]; - pixel[0] = temp; - pixel += sample_count; - } + reverse_bgr8(sample_count, This->cached_tile, This->decode_info.tile_width, + This->decode_info.tile_height, This->decode_info.tile_width * sample_count); } } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index e50d130..3c416b0 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -51,6 +51,8 @@ extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, UINT dststride, UINT dstbuffersize, BYTE *dstbuffer); +extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride); + extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2); extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo);

1 0

Vincent Povirk : windowscodecs: Support 8-bit RGB (as opposed to BGR) bitfields bitmaps.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: b00c2979cf1ef1e7780db7856641e4493586c1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b00c2979cf1ef1e7780db7856… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 10 15:24:08 2011 -0600 windowscodecs: Support 8-bit RGB (as opposed to BGR) bitfields bitmaps. --- dlls/windowscodecs/bmpdecode.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 5131f47..04e300d 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -399,6 +399,27 @@ fail: return hr; } +static HRESULT BmpFrameDecode_ReadRGB8(BmpDecoder* This) +{ + HRESULT hr; + UINT width, height; + + hr = IWICBitmapFrameDecode_GetSize((IWICBitmapFrameDecode*)&This->lpFrameVtbl, &width, &height); + + if (SUCCEEDED(hr)) + { + hr = BmpFrameDecode_ReadUncompressed(This); + } + + if (SUCCEEDED(hr)) + { + reverse_bgr8(This->bitsperpixel/8, This->imagedatastart, + width, height, This->stride); + } + + return hr; +} + static HRESULT ReadByte(IStream *stream, BYTE *buffer, ULONG buffer_size, ULONG *cursor, ULONG *bytesread, BYTE *result) { @@ -705,6 +726,7 @@ static const struct bitfields_format bitfields_formats[] = { {16,0xf800,0x7e0,0x1f,0,&GUID_WICPixelFormat16bppBGR565,BmpFrameDecode_ReadUncompressed}, {32,0xff0000,0xff00,0xff,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadUncompressed}, {32,0xff0000,0xff00,0xff,0xff000000,&GUID_WICPixelFormat32bppBGRA,BmpFrameDecode_ReadUncompressed}, + {32,0xff,0xff00,0xff0000,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadRGB8}, {0} };

1 0

Vincent Povirk : windowscodecs: Avoid an iface -> impl conversion from a non-method.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: a16df86db360d2704d156a1aca881679308e43ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16df86db360d2704d156a1ac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 10 15:36:14 2011 -0600 windowscodecs: Avoid an iface -> impl conversion from a non-method. --- dlls/windowscodecs/bmpdecode.c | 49 ++++++++++++++++++++----------- dlls/windowscodecs/icoformat.c | 6 ++- dlls/windowscodecs/wincodecs_private.h | 7 +++- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 04e300d..bd0ace1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -59,10 +59,9 @@ typedef struct { DWORD bc2AppData; } BITMAPCOREHEADER2; -struct BmpDecoder; -typedef HRESULT (*ReadDataFunc)(struct BmpDecoder* This); +typedef HRESULT (*ReadDataFunc)(BmpDecoder* This); -typedef struct BmpDecoder { +struct BmpDecoder { const IWICBitmapDecoderVtbl *lpVtbl; const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; LONG ref; @@ -80,7 +79,7 @@ typedef struct BmpDecoder { CRITICAL_SECTION lock; /* must be held when initialized/imagedata is set or stream is accessed */ int packed; /* If TRUE, don't look for a file header and assume a packed DIB. */ int icoframe; /* If TRUE, this is a frame of a .ico file. */ -} BmpDecoder; +}; static inline BmpDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) { @@ -1142,16 +1141,9 @@ static const IWICBitmapDecoderVtbl BmpDecoder_Vtbl = { BmpDecoder_GetFrame }; -static HRESULT BmpDecoder_Construct(int packed, int icoframe, IUnknown *pUnkOuter, REFIID iid, void** ppv) +static HRESULT BmpDecoder_Create(int packed, int icoframe, BmpDecoder **ppDecoder) { BmpDecoder *This; - HRESULT ret; - - TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); - - *ppv = NULL; - - if (pUnkOuter) return CLASS_E_NOAGGREGATION; This = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpDecoder)); if (!This) return E_OUTOFMEMORY; @@ -1167,6 +1159,25 @@ static HRESULT BmpDecoder_Construct(int packed, int icoframe, IUnknown *pUnkOute This->packed = packed; This->icoframe = icoframe; + *ppDecoder = This; + + return S_OK; +} + +static HRESULT BmpDecoder_Construct(int packed, int icoframe, IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + BmpDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + ret = BmpDecoder_Create(packed, icoframe, &This); + if (FAILED(ret)) return ret; + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This); @@ -1183,17 +1194,19 @@ HRESULT DibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return BmpDecoder_Construct(TRUE, FALSE, pUnkOuter, iid, ppv); } -HRESULT IcoDibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +HRESULT IcoDibDecoder_CreateInstance(BmpDecoder **ppDecoder) { - return BmpDecoder_Construct(TRUE, TRUE, pUnkOuter, iid, ppv); + return BmpDecoder_Create(TRUE, TRUE, ppDecoder); } -/* Return the offset where the mask of an icon might be, or 0 for failure. */ -void BmpDecoder_FindIconMask(IWICBitmapDecoder *decoder, ULONG *mask_offset, int *topdown) +void BmpDecoder_GetWICDecoder(BmpDecoder *This, IWICBitmapDecoder **ppDecoder) { - BmpDecoder *This = (BmpDecoder*)decoder; + *ppDecoder = (IWICBitmapDecoder*)This; +} - assert(This->lpVtbl == &BmpDecoder_Vtbl); +/* Return the offset where the mask of an icon might be, or 0 for failure. */ +void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown) +{ assert(This->stream != NULL); if (This->read_data_func == BmpFrameDecode_ReadUncompressed) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 1e939d7..de6ebe6 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -220,6 +220,7 @@ static inline void pixel_set_trans(DWORD* pixel, BOOL transparent) static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) { HRESULT hr; + BmpDecoder *bmp_decoder; IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; @@ -227,9 +228,10 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) int has_alpha=FALSE; /* if TRUE, alpha data might be in the image data */ WICRect rc; - hr = IcoDibDecoder_CreateInstance(NULL, &IID_IWICBitmapDecoder, (void**)&decoder); + hr = IcoDibDecoder_CreateInstance(&bmp_decoder); if (SUCCEEDED(hr)) { + BmpDecoder_GetWICDecoder(bmp_decoder, &decoder); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnLoad); if (SUCCEEDED(hr)) @@ -317,7 +319,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) LARGE_INTEGER seek; int topdown; - BmpDecoder_FindIconMask(decoder, &offset, &topdown); + BmpDecoder_FindIconMask(bmp_decoder, &offset, &topdown); if (offset) { diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 3c416b0..fc2d17c 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -40,7 +40,6 @@ extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); -extern HRESULT IcoDibDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator); @@ -58,6 +57,10 @@ extern HRESULT CreatePropertyBag2(IPropertyBag2 **ppPropertyBag2); extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo); extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown); -void BmpDecoder_FindIconMask(IWICBitmapDecoder *decoder, ULONG *mask_offset, int *topdown); +typedef struct BmpDecoder BmpDecoder; + +extern HRESULT IcoDibDecoder_CreateInstance(BmpDecoder **ppDecoder); +extern void BmpDecoder_GetWICDecoder(BmpDecoder *This, IWICBitmapDecoder **ppDecoder); +extern void BmpDecoder_FindIconMask(BmpDecoder *This, ULONG *mask_offset, int *topdown); #endif /* WINCODECS_PRIVATE_H */

1 0

Alexandre Julliard : winhlp32: Convert menu and string table resources to po files.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 433e240cf6ab07b0db947f6dbd7619fdf84d401e URL: http://source.winehq.org/git/wine.git/?a=commit;h=433e240cf6ab07b0db947f6db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 20:30:14 2011 +0100 winhlp32: Convert menu and string table resources to po files. --- configure | 3 +- configure.ac | 3 +- po/LINGUAS | 1 + po/ar.po | 146 +- po/bg.po | 161 +- po/cs.po | 158 +- po/da.po | 182 ++- po/de.po | 184 +- po/el.po | 142 +- po/en.po | 154 +- po/en_US.po | 140 +- po/eo.po | 160 +- po/es.po | 171 +- po/fa.po | 146 +- po/fi.po | 187 ++- po/fr.po | 170 +- po/he.po | 168 +- po/hi.po | 143 +- po/hu.po | 171 +- po/it.po | 176 ++- po/ja.po | 152 +- po/ko.po | 154 +- po/lt.po | 147 +- po/ml.po | 143 +- po/nb_NO.po | 147 +- po/nl.po | 140 +- po/or.po | 143 +- po/pa.po | 143 +- po/pl.po | 184 ++- po/pt_BR.po | 155 +- po/pt_PT.po | 169 +- po/rm.po | 4490 ++++++++++++++++++++++++++++++ po/ro.po | 147 +- po/ru.po | 168 +- po/sk.po | 171 +- po/sl.po | 154 +- po/sr_RS(a)cyrillic.po | 150 +- po/sr_RS(a)latin.po | 201 ++- po/sv.po | 173 +- po/te.po | 143 +- po/th.po | 151 +- po/tr.po | 164 +- po/uk.po | 155 +- po/wa.po | 155 +- po/wine.pot | 140 +- po/zh_CN.po | 154 +- po/zh_TW.po | 157 +- programs/winhlp32/Bg.rc | 85 - programs/winhlp32/Cs.rc | 90 - programs/winhlp32/Da.rc | 85 - programs/winhlp32/De.rc | 87 - programs/winhlp32/En.rc | 157 -- programs/winhlp32/Eo.rc | 88 - programs/winhlp32/Es.rc | 63 - programs/winhlp32/Fi.rc | 88 - programs/winhlp32/Fr.rc | 86 - programs/winhlp32/He.rc | 84 - programs/winhlp32/Hu.rc | 88 - programs/winhlp32/It.rc | 86 - programs/winhlp32/Ja.rc | 86 - programs/winhlp32/Ko.rc | 88 - programs/winhlp32/Lt.rc | 86 - programs/winhlp32/Makefile.in | 13 +- programs/winhlp32/Nl.rc | 86 - programs/winhlp32/No.rc | 86 - programs/winhlp32/Pl.rc | 87 - programs/winhlp32/Pt.rc | 184 -- programs/winhlp32/Rm.rc | 92 - programs/winhlp32/Ro.rc | 86 - programs/winhlp32/Ru.rc | 86 - programs/winhlp32/Si.rc | 86 - programs/winhlp32/Sk.rc | 83 - programs/winhlp32/Sr.rc | 84 - programs/winhlp32/Sv.rc | 86 - programs/winhlp32/Tr.rc | 85 - programs/winhlp32/Uk.rc | 86 - programs/winhlp32/Zh.rc | 151 - programs/winhlp32/rsrc.rc | 25 - programs/winhlp32/{Wa.rc => winhlp32.rc} | 84 +- 79 files changed, 10591 insertions(+), 3562 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=433e240cf6ab07b0db947…

1 0

Alexandre Julliard : winefile: Convert menu and string table resources to po files.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: 08b919f8d98375b556560615026882bdddf1fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b919f8d98375b5565606150… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 10 23:37:15 2011 +0100 winefile: Convert menu and string table resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 366 +++++++++++++++++++++++++++++++++++-- po/bg.po | 375 ++++++++++++++++++++++++++++++++++++-- po/cs.po | 399 +++++++++++++++++++++++++++++++++++++--- po/da.po | 392 ++++++++++++++++++++++++++++++++++++--- po/de.po | 367 ++++++++++++++++++++++++++++++++++-- po/el.po | 361 ++++++++++++++++++++++++++++++++++-- po/en.po | 388 +++++++++++++++++++++++++++++++++++++-- po/en_US.po | 355 ++++++++++++++++++++++++++++++++++-- po/eo.po | 384 ++++++++++++++++++++++++++++++++++++-- po/es.po | 393 +++++++++++++++++++++++++++++++++++++--- po/fa.po | 366 +++++++++++++++++++++++++++++++++++-- po/fi.po | 385 +++++++++++++++++++++++++++++++++++++-- po/fr.po | 369 +++++++++++++++++++++++++++++++++++-- po/he.po | 376 +++++++++++++++++++++++++++++++++++-- po/hi.po | 360 ++++++++++++++++++++++++++++++++++-- po/hu.po | 410 ++++++++++++++++++++++++++++++++++++++--- po/it.po | 381 ++++++++++++++++++++++++++++++++++++-- po/ja.po | 365 ++++++++++++++++++++++++++++++++++-- po/ko.po | 395 +++++++++++++++++++++++++++++++++++++-- po/lt.po | 374 +++++++++++++++++++++++++++++++++++-- po/ml.po | 360 ++++++++++++++++++++++++++++++++++-- po/nb_NO.po | 372 +++++++++++++++++++++++++++++++++++-- po/nl.po | 381 ++++++++++++++++++++++++++++++++++++-- po/or.po | 360 ++++++++++++++++++++++++++++++++++-- po/pa.po | 360 ++++++++++++++++++++++++++++++++++-- po/pl.po | 384 ++++++++++++++++++++++++++++++++++++--- po/pt_BR.po | 381 ++++++++++++++++++++++++++++++++++++-- po/pt_PT.po | 379 ++++++++++++++++++++++++++++++++++++-- po/rm.po | 367 +++++++++++++++++++++++++++++++++++-- po/ro.po | 365 +++++++++++++++++++++++++++++++++++-- po/ru.po | 379 ++++++++++++++++++++++++++++++++++++-- po/sk.po | 368 +++++++++++++++++++++++++++++++++++-- po/sl.po | 395 +++++++++++++++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 376 ++++++++++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 386 +++++++++++++++++++++++++++++++++++++-- po/sv.po | 386 ++++++++++++++++++++++++++++++++++++-- po/te.po | 360 ++++++++++++++++++++++++++++++++++-- po/th.po | 369 +++++++++++++++++++++++++++++++++++-- po/tr.po | 383 ++++++++++++++++++++++++++++++++++++--- po/uk.po | 393 +++++++++++++++++++++++++++++++++++++-- po/wa.po | 375 ++++++++++++++++++++++++++++++++++++-- po/wine.pot | 355 ++++++++++++++++++++++++++++++++++-- po/zh_CN.po | 388 +++++++++++++++++++++++++++++++++++++-- po/zh_TW.po | 388 +++++++++++++++++++++++++++++++++++++-- programs/winefile/Cs.rc | 155 ---------------- programs/winefile/Da.rc | 156 ---------------- programs/winefile/De.rc | 152 --------------- programs/winefile/En.rc | 166 ++--------------- programs/winefile/Es.rc | 156 ---------------- programs/winefile/Fr.rc | 157 ---------------- programs/winefile/He.rc | 156 ---------------- programs/winefile/Hu.rc | 148 --------------- programs/winefile/It.rc | 169 ----------------- programs/winefile/Ja.rc | 169 ----------------- programs/winefile/Ko.rc | 156 ---------------- programs/winefile/Lt.rc | 169 ----------------- programs/winefile/Makefile.in | 6 +- programs/winefile/Nl.rc | 156 ---------------- programs/winefile/No.rc | 156 ---------------- programs/winefile/Pl.rc | 155 ---------------- programs/winefile/Pt.rc | 321 -------------------------------- programs/winefile/Ro.rc | 155 ---------------- programs/winefile/Ru.rc | 156 ---------------- programs/winefile/Si.rc | 156 ---------------- programs/winefile/Sv.rc | 156 ---------------- programs/winefile/Tr.rc | 156 ---------------- programs/winefile/Uk.rc | 156 ---------------- programs/winefile/Zh.rc | 272 --------------------------- programs/winefile/rsrc.rc | 51 ----- programs/winefile/winefile.rc | 185 ++++++++++++++++++ 72 files changed, 15987 insertions(+), 4734 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08b919f8d98375b556560…

1 0