November 2010 - Wine-Commits

Jörg Höhle : winmm/tests: Fix test failure in multi-byte locale.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: c138970ea2ce0661ebb80a5e0079e284a19d3176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c138970ea2ce0661ebb80a5e0… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 10 18:45:27 2010 +0100 winmm/tests: Fix test failure in multi-byte locale. --- dlls/winmm/tests/mci.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ec88ad9..cb6df72 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -489,14 +489,17 @@ static void test_openCloseWAVE(HWND hwnd) ok(err==MCIERR_INVALID_DEVICE_NAME || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_SYSINFO nodev installname: %s\n", dbg_mcierr(err)); ok(!strcmp(buf,"K"), "output buffer %s\n", buf); - buf[1] = 'L'; + buf[0] = 0; buf[1] = 'A'; buf[2] = 'j'; buf[3] = 0; parm.info.lpstrReturn = buf; parm.info.dwRetSize = 2; - err = mciSendCommand(1, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&parm); + err = mciSendCommandA(1, MCI_INFO, MCI_INFO_PRODUCT, (DWORD_PTR)&parm); ok(!err, "mciCommand MCI_INFO product: %s\n", dbg_mcierr(err)); - ok(buf[0] && !buf[1], "info product output buffer %s\n", buf); + ok(buf[0] /* && !buf[1] */ && (buf[2] == 'j' || broken(!buf[2])), "info product output buffer %s\n", buf); + /* Producing non-ASCII multi-byte output, native forgets to zero-terminate a too small buffer + * with SendStringA, while SendStringW works correctly (jap. and chin. locale): ignore buf[1] */ + /* Bug in 64 bit Vista/w2k8/w7: mciSendStringW is used! (not in xp nor w2k3) */ - buf[0] = 'K'; + buf[0] = 'K'; buf[1] = 0; parm.info.dwRetSize = sizeof(buf); err = mciSendCommandW(1, MCI_INFO, 0x07000000, (DWORD_PTR)&parm); ok(err==MCIERR_UNRECOGNIZED_KEYWORD || broken(err==MMSYSERR_NOTSUPPORTED/* Win9x */), "mciCommand MCI_INFO other: %s\n", dbg_mcierr(err)); @@ -1123,6 +1126,9 @@ static void test_AutoOpenWAVE(HWND hwnd) test_notification(hwnd, "-prior to auto-open-", 0); err = mciSendString("play tempfile.wav notify", buf, sizeof(buf), hwnd); + if(ok_saved==MCIERR_FILE_NOT_FOUND) todo_wine /* same as above */ + ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); + else ok(err==MCIERR_NOTIFY_ON_AUTO_OPEN,"mci auto-open play notify returned %s\n", dbg_mcierr(err)); if(err) /* FIXME: don't open twice yet, it confuses Wine. */

1 0

Maarten Lankhorst : quartz: Handle state changes in direct sound renderer correctly.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 44a17d27bbc99b1a2a4e0f7d14dad4acc74316b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a17d27bbc99b1a2a4e0f7d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 16:01:36 2010 +0100 quartz: Handle state changes in direct sound renderer correctly. Based on a patch from Vladimir Panteleev --- dlls/quartz/dsoundrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index ca58b98..759ba07 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -620,6 +620,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) { This->pInputPin->end_of_stream = 0; + ResetEvent(This->state_change); } hr = IDirectSoundBuffer_Stop(This->dsbuffer); @@ -627,7 +628,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) This->filter.state = State_Paused; ResetEvent(This->blocked); - ResetEvent(This->state_change); } LeaveCriticalSection(&This->filter.csFilter); @@ -856,6 +856,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) } } MediaSeekingPassThru_EOS(me->seekthru_unk); + SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec); return hr;

1 0

Maarten Lankhorst : quartz: Make window behavior of video renderer act more like windows.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 5c3cddf351dd48d175aa5866526579a83574bd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3cddf351dd48d175aa58665… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:29 2010 +0100 quartz: Make window behavior of video renderer act more like windows. --- dlls/quartz/videorenderer.c | 78 ++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e1cef40..112289a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -259,6 +259,42 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) return TRUE; } +static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { + if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) + { + DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); + DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); + + if (!This->WindowPos.right) + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } + if (!This->WindowPos.bottom) + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } + + AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + SetWindowPos(This->hWnd, NULL, + This->WindowPos.left, + This->WindowPos.top, + This->WindowPos.right - This->WindowPos.left, + This->WindowPos.bottom - This->WindowPos.top, + SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); + + GetClientRect(This->hWnd, &This->DestRect); + } + else if (!This->init) + This->DestRect = This->WindowPos; + This->init = TRUE; + if (This->AutoShow) + ShowWindow(This->hWnd, SW_SHOW); +} + static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { AM_MEDIA_TYPE amt; @@ -298,41 +334,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - if (!This->init) - { - if (!This->WindowPos.right || !This->WindowPos.top) - { - DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); - DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); - - if (!This->WindowPos.right) - { - This->WindowPos.left = This->SourceRect.left; - This->WindowPos.right = This->SourceRect.right; - } - if (!This->WindowPos.bottom) - { - This->WindowPos.top = This->SourceRect.top; - This->WindowPos.bottom = This->SourceRect.bottom; - } - - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); - - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); - SetWindowPos(This->hWnd, NULL, - This->WindowPos.left, - This->WindowPos.top, - This->WindowPos.right - This->WindowPos.left, - This->WindowPos.bottom - This->WindowPos.top, - SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); - - GetClientRect(This->hWnd, &This->DestRect); - } - else - This->DestRect = This->WindowPos; - This->init = TRUE; - } - hDC = GetDC(This->hWnd); if (!hDC) { @@ -349,8 +350,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->hWnd, hDC); - if (This->AutoShow) - ShowWindow(This->hWnd, SW_SHOW); return S_OK; } @@ -768,6 +767,9 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) SetEvent(This->hEvent); SetEvent(This->blocked); MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + if (This->AutoShow) + /* Black it out */ + RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); } LeaveCriticalSection(&This->filter.csFilter); @@ -787,6 +789,7 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) { This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); + VideoRenderer_AutoShowWindow(This); } This->filter.state = State_Paused; @@ -824,6 +827,7 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta { This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); + VideoRenderer_AutoShowWindow(This); } SetEvent(This->blocked);

1 0

Henri Verbeet : wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 78abb8ae07190714546ecc770680e54fcee20d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78abb8ae07190714546ecc770… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:19 2010 +0100 wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD. The call to surface_add_dirty_rect() would have taken care of evicting the other locations anyway, but we really shouldn't be touching the location flags directly. --- dlls/wined3d/surface.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a18f067..394ae6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1655,11 +1655,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface, TRACE("Warning: trying to lock unlockable surf@%p\n", This); } - if (Flags & WINED3DLOCK_DISCARD) { - /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ - TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); - surface_prepare_system_memory(This); /* Makes sure memory is allocated */ - This->Flags |= SFLAG_INSYSMEM; + if (Flags & WINED3DLOCK_DISCARD) + { + TRACE("WINED3DLOCK_DISCARD flag passed, marking SYSMEM as up to date.\n"); + surface_prepare_system_memory(This); + surface_modify_location(This, SFLAG_INSYSMEM, TRUE); goto lock_end; }

1 0

Henri Verbeet : wined3d: Remove some useless code.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 3bbe658ef1b2a992ad44cd9503ad65889a1c6896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbe658ef1b2a992ad44cd950… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:20 2010 +0100 wined3d: Remove some useless code. --- dlls/wined3d/surface.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 394ae6d..dbac947 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1663,12 +1663,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface, goto lock_end; } - if (This->Flags & SFLAG_INSYSMEM) { - TRACE("Local copy is up to date, not downloading data\n"); - surface_prepare_system_memory(This); /* Makes sure memory is allocated */ - goto lock_end; - } - /* surface_load_location() does not check if the rectangle specifies * the full surface. Most callers don't need that, so do it here. */ if (pRect && !pRect->top && !pRect->left

1 0

Vincent Povirk : mscoree: Implement config file parsing.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 4ce33c69607e8f35e7ffc9c72d37d8362bf1efeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ce33c69607e8f35e7ffc9c72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 4 17:37:00 2010 -0500 mscoree: Implement config file parsing. --- dlls/mscoree/Makefile.in | 3 +- dlls/mscoree/assembly.c | 1 + dlls/mscoree/config.c | 469 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/corruntimehost.c | 2 +- dlls/mscoree/metahost.c | 44 ++++- dlls/mscoree/mscoree_main.c | 4 + dlls/mscoree/mscoree_private.h | 15 ++ 7 files changed, 533 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ce33c69607e8f35e7ffc…

1 0

Vincent Povirk : include: Add definitions for IMetaDataDispenserEx.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 6ad97b7c08bece95fd134bc9ccd12873b8ef5c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad97b7c08bece95fd134bc9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 12:34:28 2010 -0500 include: Add definitions for IMetaDataDispenserEx. --- include/cor.idl | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/cor.idl b/include/cor.idl index 4c5e639..8d8154b 100644 --- a/include/cor.idl +++ b/include/cor.idl @@ -16,11 +16,89 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "propidl.idl"; + cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ /* FIXME: #include "corerror.h" */ /* FIXME: #include "corhdr.h" */ +cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenser, 0xe5cb7a31,0x7512,0x11d2,0x89,0xce,0x00,0x80,0xc7,0x92,0xe5,0xd8);") +cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenserRuntime, 0x1ec2de53,0x75cc,0x11d2,0x97,0x75,0x00,0xa0,0xc9,0xb4,0xd5,0x0c);") + +[ + object, + local, + uuid(809c652e-7396-11d2-9771-00a0c9b4d50c) +] +interface IMetaDataDispenser : IUnknown +{ + HRESULT DefineScope( + [in] REFCLSID rclsid, + [in] DWORD dwCreateFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT OpenScope( + [in] LPCWSTR szScope, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT OpenScopeOnMemory( + [in] const void *pData, + [in] ULONG cbData, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); +} + +[ + object, + local, + uuid(31bcfce2-dafb-11d2-9f81-00c04f79a0a3) +] +interface IMetaDataDispenserEx : IMetaDataDispenser +{ + HRESULT SetOption( + [in] REFGUID optionid, + [in] const VARIANT *value); + + HRESULT GetOption( + [in] REFGUID optionid, + [out] VARIANT *pvalue); + + HRESULT OpenScopeOnITypeInfo( + [in] ITypeInfo *pITI, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT GetCORSystemDirectory( + [out, size_is(cchBuffer)] LPWSTR szBuffer, + [in] DWORD cchBuffer, + [out] DWORD *pchBuffer); + + HRESULT FindAssembly( + [in] LPCWSTR szAppBase, + [in] LPCWSTR szPrivateBin, + [in] LPCWSTR szGlobalBin, + [in] LPCWSTR szAssemblyName, + [out, size_is(cchName)] LPWSTR szName, + [in] ULONG cchName, + [out] ULONG *pcName); + + HRESULT FindAssemblyModule( + [in] LPCWSTR szAppBase, + [in] LPCWSTR szPrivateBin, + [in] LPCWSTR szGlobalBin, + [in] LPCWSTR szAssemblyName, + [in] LPCWSTR szModuleName, + [out, size_is(cchName)] LPWSTR szName, + [in] ULONG cchName, + [out] ULONG *pcName); +} + cpp_quote("BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);") cpp_quote("__int32 WINAPI _CorExeMain(void);") cpp_quote("__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);")

1 0

Maarten Lankhorst : quartz: Start DirectSound renderer as soon as possible.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 64b14c0ecdd13530a92ff636c451523a99253a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b14c0ecdd13530a92ff636c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:28 2010 +0100 quartz: Start DirectSound renderer as soon as possible. Makes directsound switch to silent playback even when no buffers are playing, fixes glitching on starting playback from a stopped buffer. --- dlls/quartz/dsoundrender.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d8dd45b..ca58b98 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -457,6 +457,19 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) ERR("Cannot create Direct Sound object (%x)\n", hr); else hr = IDirectSound_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY); + if (SUCCEEDED(hr)) { + IDirectSoundBuffer *buf; + DSBUFFERDESC buf_desc; + memset(&buf_desc,0,sizeof(DSBUFFERDESC)); + buf_desc.dwSize = sizeof(DSBUFFERDESC); + buf_desc.dwFlags = DSBCAPS_PRIMARYBUFFER; + hr = IDirectSound_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); + if (SUCCEEDED(hr)) { + IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); + IUnknown_Release(buf); + } + hr = S_OK; + } } if (SUCCEEDED(hr))

1 0

Maarten Lankhorst : winegstreamer: Move up gst_segment_init to prevent a theoretical race condition.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: cf085af1268e85f499d071d3963e83b84beec64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf085af1268e85f499d071d39… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:27 2010 +0100 winegstreamer: Move up gst_segment_init to prevent a theoretical race condition. --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1f98a7d..4c9fd74 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -396,9 +396,9 @@ static gboolean event_sink(GstPad *pad, GstEvent *event) { IPin_BeginFlush(pin->pin.pin.pConnectedTo); return 1; case GST_EVENT_FLUSH_STOP: + gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.pConnectedTo) IPin_EndFlush(pin->pin.pin.pConnectedTo); - gst_segment_init(pin->segment, GST_FORMAT_TIME); return 1; default: FIXME("%p stub %s\n", event, gst_event_type_get_name(event->type)); @@ -746,12 +746,12 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS pin->isaud = isaud; pin->isvid = isvid; + gst_segment_init(pin->segment, GST_FORMAT_TIME); ret = gst_pad_link(pad, mypad); gst_pad_activate_push(mypad, 1); FIXME("Linking: %i\n", ret); if (ret >= 0) { pin->their_src = pad; - gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src); } } @@ -772,9 +772,9 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImp for (x = 0; x < This->cStreams; ++x) { GSTOutPin *pin = This->ppPins[x]; if (!pin->their_src) { + gst_segment_init(pin->segment, GST_FORMAT_TIME); if (gst_pad_link(pad, pin->my_sink) >= 0) { pin->their_src = pad; - gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src); TRACE("Relinked\n"); LeaveCriticalSection(&This->filter.csFilter);

1 0

Vincent Povirk : include: Rename cor.h to cor.idl.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 498752dd109340004dfa83945e889bd0a900707e URL: http://source.winehq.org/git/wine.git/?a=commit;h=498752dd109340004dfa83945… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 11:54:13 2010 -0500 include: Rename cor.h to cor.idl. --- .gitignore | 1 + include/Makefile.in | 2 +- include/{cor.h => cor.idl} | 29 ++++++++--------------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index b57ea54..a340baf 100644 --- a/.gitignore +++ b/.gitignore @@ -159,6 +159,7 @@ include/comcat.h include/commoncontrols.h include/config.h include/control.h +include/cor.h include/ctfutb.h include/ctxtcall.h include/d3d10.h diff --git a/include/Makefile.in b/include/Makefile.in index 1f434c7..3f4f9de 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -17,6 +17,7 @@ PUBLIC_IDL_H_SRCS = \ comcat.idl \ commoncontrols.idl \ control.idl \ + cor.idl \ ctfutb.idl \ ctxtcall.idl \ d3d10.idl \ @@ -142,7 +143,6 @@ SRCDIR_INCLUDES = \ commctrl.rh \ commdlg.h \ compobj.h \ - cor.h \ corerror.h \ corhdr.h \ cpl.h \ diff --git a/include/cor.h b/include/cor.idl similarity index 63% rename from include/cor.h rename to include/cor.idl index cdf89dd..4c5e639 100644 --- a/include/cor.h +++ b/include/cor.idl @@ -16,28 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_COR_H -#define __WINE_COR_H - -#include "ole2.h" +cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ /* FIXME: #include "corerror.h" */ /* FIXME: #include "corhdr.h" */ -#ifdef __cplusplus -extern "C" { -#endif - -BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID); -__int32 WINAPI _CorExeMain(void); -__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR); -VOID WINAPI _CorImageUnloading(PVOID); -HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR); -HRESULT WINAPI CoInitializeCor(DWORD); -void WINAPI CoUninitializeCor(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_COR_H */ +cpp_quote("BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);") +cpp_quote("__int32 WINAPI _CorExeMain(void);") +cpp_quote("__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);") +cpp_quote("VOID WINAPI _CorImageUnloading(PVOID);") +cpp_quote("HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR);") +cpp_quote("HRESULT WINAPI CoInitializeCor(DWORD);") +cpp_quote("void WINAPI CoUninitializeCor(void);")

1 0