August 2013 - Wine-commits - list.winehq.org

Frédéric Delanoy : winedev: Correct windows device name -> unix device name mappings table.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: 1ec9ffb700e6b77366138df7df78e0e298b78976 URL: http://source.winehq.org/git/docs.git/?a=commit;h=1ec9ffb700e6b77366138df7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 21:48:34 2013 +0200 winedev: Correct windows device name -> unix device name mappings table. --- en/winedev-kernel.sgml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index bb277bf..cab6883 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -1794,23 +1794,23 @@ if (res != ERROR_SUCCESS) return res; <entry>Treated as an alias to <filename>LPT1</filename></entry> </row> <row> - <entry><filename><any_path>COM1</filename></entry> - <entry><filename>\Global??\COM1</filename></entry> + <entry><filename><any_path>COM<N></filename></entry> + <entry><filename>\Global??\COM<N></filename></entry> <entry> - <filename>$(WINEPREFIX)/dosdevices/com1</filename> + <filename>$(WINEPREFIX)/dosdevices/com<N></filename> (if the symbol link exists) or the Nth serial line in the system (on Linux, - <filename>/dev/ttyS0</filename>). + <filename>/dev/ttyS<N-1></filename>). </entry> </row> <row> - <entry><filename><any_path>LPT1</filename></entry> - <entry><filename>\Global??\LPT1</filename></entry> + <entry><filename><any_path>LPT<N></filename></entry> + <entry><filename>\Global??\LPT<N></filename></entry> <entry> - <filename>$(WINEPREFIX)/dosdevices/lpt1</filename> + <filename>$(WINEPREFIX)/dosdevices/lpt<N></filename> (if the symbol link exists) or the Nth printer in the system (on Linux, - <filename>/dev/lp0</filename>). + <filename>/dev/lp<N-1></filename>). </entry> </row> <row>

1 0

Frédéric Delanoy : winedev: Update 'kernel' paths .
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: 19d2f08fbeb77a2dcc864fe2ec00ec6094966a83 URL: http://source.winehq.org/git/docs.git/?a=commit;h=19d2f08fbeb77a2dcc864fe2e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 15 21:48:35 2013 +0200 winedev: Update 'kernel' paths. --- en/winedev-coding.sgml | 4 ++-- en/winedev-kernel.sgml | 4 ++-- en/winedev-testing.sgml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index a2d5daf..5cd7290 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -489,8 +489,8 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) </para> <para> - When adding a new language, also make sure the parameters - defined in <filename>./dlls/kernel/nls/*.nls</filename> + When adding a new language, also make sure the parameters + defined in <filename>dlls/kernel32/nls/*.nls</filename> fit your local habits and language. </para> </sect1> diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index cab6883..c787ff6 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -2178,7 +2178,7 @@ if (res != ERROR_SUCCESS) return res; <function>WriteConsole()</function> which is called, hence using the default console's code page. There are some other spots affected, but you can look in - <filename>dlls/kernel</filename> to find them all. All of this is + <filename>dlls/kernel32</filename> to find them all. All of this is implemented in Wine. </para> <para> @@ -2394,7 +2394,7 @@ if (res != ERROR_SUCCESS) return res; <para> When entering a syslevel, the code (in - <filename>dlls/kernel/syslevel.c</filename>) will check that a + <filename>dlls/krnl386.exe16/syslevel.c</filename>) will check that a higher syslevel is not already held and produce an error if so. This is because it's not legal to enter level 2 while holding level 3 - first, you must leave level 3. diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 9f2d785..7581ef6 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -140,7 +140,7 @@ <para> The tests for a specific Wine library are located in a 'tests' subdirectory of the library directory. Each test is contained in a - file (e.g. <filename>dlls/kernel/tests/thread.c</filename>). Each + file (e.g. <filename>dlls/kernel32/tests/thread.c</filename>). Each file itself contains many checks concerning one or more related APIs. </para> <para> @@ -151,7 +151,7 @@ run the tests contained in the <filename>thread.c</filename> file of the kernel library, you would do: <screen> -<prompt>$ </prompt>cd dlls/kernel/tests +<prompt>$ </prompt>cd dlls/kernel32/tests <prompt>$ </prompt>make thread.ok </screen> </para>

1 0

Frédéric Delanoy : Don' t insert emacs file variables in documents.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: 683d9265ff32fdb69af0d98c9623d2cfb63d8630 URL: http://source.winehq.org/git/docs.git/?a=commit;h=683d9265ff32fdb69af0d98c9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 16 02:12:08 2013 +0200 Don't insert emacs file variables in documents. --- en/winedev-architecture.sgml | 8 -------- en/winedev-coding.sgml | 7 ------- en/winedev-ddraw.sgml | 7 ------- en/winedev-debugger.sgml | 7 ------- en/winedev-debugging.sgml | 7 ------- en/winedev-documentation.sgml | 7 ------- en/winedev-kernel.sgml | 7 ------- en/winedev-multimedia.sgml | 7 ------- en/winedev-ole.sgml | 7 ------- en/winedev-opengl.sgml | 7 ------- en/winedev-otherdebug.sgml | 7 ------- en/winedev-testing.sgml | 7 ------- en/winedev-windowing.sgml | 7 ------- en/winelib-bindlls.sgml | 7 ------- en/winelib-intro.sgml | 7 ------- en/winelib-mfc.sgml | 7 ------- en/winelib-porting.sgml | 7 ------- en/winelib-toolkit.sgml | 7 ------- en/wineusr-bugs.sgml | 7 ------- en/wineusr-configuring.sgml | 7 ------- en/wineusr-getting.sgml | 7 ------- en/wineusr-introduction.sgml | 7 ------- en/wineusr-running.sgml | 7 ------- 23 files changed, 0 insertions(+), 162 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 71007be..84082ee 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -933,11 +933,3 @@ </sect2> </sect1> </chapter> - - - diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index 5cd7290..83998bd 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -495,10 +495,3 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H)) </para> </sect1> </chapter> - - diff --git a/en/winedev-ddraw.sgml b/en/winedev-ddraw.sgml index b435b73..816ec4e 100644 --- a/en/winedev-ddraw.sgml +++ b/en/winedev-ddraw.sgml @@ -164,10 +164,3 @@ </para> </sect1> </chapter> - - diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 270ba7c..22b3051 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2634,10 +2634,3 @@ $ gdb wine </sect1> </chapter> - - diff --git a/en/winedev-debugging.sgml b/en/winedev-debugging.sgml index 7da3916..01b270e 100644 --- a/en/winedev-debugging.sgml +++ b/en/winedev-debugging.sgml @@ -464,10 +464,3 @@ TRACE("flags = %s\n", dbgstr_flags(flags)); </sect1> </chapter> - - diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index da2347c..26f4b57 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -1669,10 +1669,3 @@ </sect1> </chapter> - - diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index c787ff6..20222c5 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -2476,10 +2476,3 @@ if (res != ERROR_SUCCESS) return res; </sect1> </chapter> - - diff --git a/en/winedev-multimedia.sgml b/en/winedev-multimedia.sgml index 5d0954b..a38d7a2 100644 --- a/en/winedev-multimedia.sgml +++ b/en/winedev-multimedia.sgml @@ -928,10 +928,3 @@ HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\MediaProperties\PrivatePrope </sect1> </chapter> - - diff --git a/en/winedev-ole.sgml b/en/winedev-ole.sgml index f1b2a27..528c718 100644 --- a/en/winedev-ole.sgml +++ b/en/winedev-ole.sgml @@ -1147,10 +1147,3 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { </sect2> </sect1> </chapter> - - diff --git a/en/winedev-opengl.sgml b/en/winedev-opengl.sgml index c347984..a4bb913 100644 --- a/en/winedev-opengl.sgml +++ b/en/winedev-opengl.sgml @@ -309,10 +309,3 @@ gcc dummy.c -L/usr/local/lib -L/usr/local/lib/wine -lwine -lopengl32 </sect2> </sect1> </chapter> - - diff --git a/en/winedev-otherdebug.sgml b/en/winedev-otherdebug.sgml index ee7cab0..e8dba3c 100644 --- a/en/winedev-otherdebug.sgml +++ b/en/winedev-otherdebug.sgml @@ -342,10 +342,3 @@ less registry.c.gcov </sect1> </chapter> - - diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 7581ef6..9095166 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -615,10 +615,3 @@ ok ( GetLastError() == WIN9X_ERROR || GetLastError() == NT_ERROR, ...); file handling... --> </chapter> - - diff --git a/en/winedev-windowing.sgml b/en/winedev-windowing.sgml index 4175f0d..c977eff 100644 --- a/en/winedev-windowing.sgml +++ b/en/winedev-windowing.sgml @@ -663,10 +663,3 @@ WINEDEBUG=+key,+keyboard wine > key.log 2>&1 </sect2> </sect1> </chapter> - - diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 9978bd5..3ca663c 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -283,10 +283,3 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, </para> </sect1> </chapter> - - diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index c84987c..3d95746 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -418,10 +418,3 @@ </sect2> </sect1> </chapter> - - diff --git a/en/winelib-mfc.sgml b/en/winelib-mfc.sgml index 5a3dcab..c625b47 100644 --- a/en/winelib-mfc.sgml +++ b/en/winelib-mfc.sgml @@ -211,10 +211,3 @@ </sect1> </chapter> - - diff --git a/en/winelib-porting.sgml b/en/winelib-porting.sgml index 0e8e5cd..43f1a7d 100644 --- a/en/winelib-porting.sgml +++ b/en/winelib-porting.sgml @@ -148,10 +148,3 @@ </sect1> </chapter> - - diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index c1ee8ee..040f243 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -748,10 +748,3 @@ ORDINAL extern EXPORTNAME SYMBOLNAME  </sect1> </chapter> - - diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 19ebd4d..7040d23 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -309,10 +309,3 @@ </sect2> </sect1> </chapter> - - diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml index 0db8eed..bb5307a 100644 --- a/en/wineusr-configuring.sgml +++ b/en/wineusr-configuring.sgml @@ -798,10 +798,3 @@ </sect1> </chapter> - - diff --git a/en/wineusr-getting.sgml b/en/wineusr-getting.sgml index c3536a6..ef8a13d 100644 --- a/en/wineusr-getting.sgml +++ b/en/wineusr-getting.sgml @@ -191,10 +191,3 @@ </sect1> </chapter> - - diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml index 070bb00..94051e5 100644 --- a/en/wineusr-introduction.sgml +++ b/en/wineusr-introduction.sgml @@ -399,10 +399,3 @@ </sect2> </sect1> </chapter> - - diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 95416a6..51fcd4b 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -737,10 +737,3 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </sect2> </sect1> </chapter> - -

1 0

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: docs Branch: master Commit: 7fd2fd058900009d1a0eea939d94df22b895eb9b URL: http://source.winehq.org/git/docs.git/?a=commit;h=7fd2fd058900009d1a0eea939… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 16 15:08:03 2013 +0200 wineusr: Assorted formatting & tagging fixes. A couple typos as well. --- en/wineusr-bugs.sgml | 105 +++++++------- en/wineusr-configuring.sgml | 326 +++++++++++++++++++++-------------------- en/wineusr-getting.sgml | 35 +++--- en/wineusr-glossary.sgml | 12 +- en/wineusr-introduction.sgml | 29 ++-- en/wineusr-running.sgml | 267 ++++++++++++++++++----------------- 6 files changed, 395 insertions(+), 379 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=7fd2fd058900009d1a0ee…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMLIGHTARRAY.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: ee6734e848849230df334cb1b0ba8d457e7ad3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6734e848849230df334cb1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:48 2013 +0200 d3drm: Avoid LPDIRECT3DRMLIGHTARRAY. --- dlls/d3drm/frame.c | 12 +++++------- dlls/d3drm/tests/d3drm.c | 14 +++++++------- include/d3drmobj.h | 6 +++--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 88540f0..4b6eae8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -703,14 +703,13 @@ static D3DCOLOR WINAPI IDirect3DRMFrame2Impl_GetColor(IDirect3DRMFrame2* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2* iface, - LPDIRECT3DRMLIGHTARRAY *lights) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetLights(IDirect3DRMFrame2 *iface, IDirect3DRMLightArray **lights) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame2(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, lights); + TRACE("iface %p, lights %p.\n", iface, lights); - return IDirect3DRMFrame3_GetLights(&This->IDirect3DRMFrame3_iface, lights); + return IDirect3DRMFrame3_GetLights(&frame->IDirect3DRMFrame3_iface, lights); } static D3DRMMATERIALMODE WINAPI IDirect3DRMFrame2Impl_GetMaterialMode(IDirect3DRMFrame2* iface) @@ -1721,8 +1720,7 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetColor(IDirect3DRMFrame3* iface) return 0; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3* iface, - LPDIRECT3DRMLIGHTARRAY *lights) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3 *iface, IDirect3DRMLightArray **lights) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); IDirect3DRMLightArrayImpl* obj; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 34b0fd0..7e59050 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -918,7 +918,7 @@ static void test_Frame(void) IDirect3DRMVisualArray *visual_array; IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; - LPDIRECT3DRMLIGHTARRAY pLightArray; + IDirect3DRMLightArray *light_array; D3DCOLOR color; DWORD count; CHAR cname[64] = {0}; @@ -1193,18 +1193,18 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); CHECK_REFCOUNT(light1, 2); - pLightArray = NULL; - hr = IDirect3DRMFrame_GetLights(pFrameP1, &pLightArray); + light_array = NULL; + hr = IDirect3DRMFrame_GetLights(pFrameP1, &light_array); ok(hr == D3DRM_OK, "Cannot get lights (hr = %x)\n", hr); - if (pLightArray) + if (light_array) { - count = IDirect3DRMLightArray_GetSize(pLightArray); + count = IDirect3DRMLightArray_GetSize(light_array); ok(count == 1, "count = %u\n", count); - hr = IDirect3DRMLightArray_GetElement(pLightArray, 0, &light_tmp); + hr = IDirect3DRMLightArray_GetElement(light_array, 0, &light_tmp); ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); ok(light_tmp == light1, "light_tmp = %p\n", light_tmp); IDirect3DRMLight_Release(light_tmp); - IDirect3DRMLightArray_Release(pLightArray); + IDirect3DRMLightArray_Release(light_array); } /* Delete Light */ diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 7bae278..e1c2da9 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1106,7 +1106,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_position) PURE; @@ -1339,7 +1339,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(AddVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_position) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(AddVisual)(THIS_ LPUNKNOWN) PURE; STDMETHOD(GetChildren)(THIS_ struct IDirect3DRMFrameArray **children) PURE; STDMETHOD_(D3DCOLOR, GetColor)(THIS) PURE; - STDMETHOD(GetLights)(THIS_ LPDIRECT3DRMLIGHTARRAY *lights) PURE; + STDMETHOD(GetLights)(THIS_ struct IDirect3DRMLightArray **lights) PURE; STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ IDirect3DRMFrame3 **parent) PURE; STDMETHOD(GetPosition)(THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *return_position) PURE;

1 0

Jacek Caban : urlmon: Improved BindToObject failure when MIME handler is not available.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: f8236c5ac3d1cfa807c12dd1cea9a27f388e32c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8236c5ac3d1cfa807c12dd1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:39:34 2013 +0200 urlmon: Improved BindToObject failure when MIME handler is not available. --- dlls/urlmon/binding.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 3cb49f1..306e9b3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -299,16 +299,18 @@ static void create_object(Binding *binding) return; } - if(!(clsid_str = get_mime_clsid(binding->mime, &clsid))) { - FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); - return; - } + if((clsid_str = get_mime_clsid(binding->mime, &clsid))) + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); - hres = create_mime_object(binding, &clsid, clsid_str); - heap_free(clsid_str); + if(clsid_str) { + hres = create_mime_object(binding, &clsid, clsid_str); + heap_free(clsid_str); + }else { + FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); + hres = REGDB_E_CLASSNOTREG; + } IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_ENDSYNCOPERATION, NULL); binding->clsid = CLSID_NULL;

1 0

Jacek Caban : urlmon: Added more BindToObject tests.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: e61c50f0007a43055d419d4ebedcdce6ba7153aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61c50f0007a43055d419d4eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:41:39 2013 +0200 urlmon: Added more BindToObject tests. --- dlls/urlmon/tests/url.c | 86 +++++++++++++++++++++++++++++++--------------- 1 files changed, 58 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e61c50f0007a43055d419…

1 0

Jacek Caban : urlmon: Added support for ROT in BindToObject.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1c66fdd03b50e8ce8891609ab0d0ea11aae48355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c66fdd03b50e8ce8891609ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:41:51 2013 +0200 urlmon: Added support for ROT in BindToObject. --- dlls/urlmon/umon.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5cb3631..9e46319 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -233,7 +233,22 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl); if(SUCCEEDED(hres)) { - FIXME("use running object table\n"); + hres = IRunningObjectTable_IsRunning(obj_tbl, &This->IMoniker_iface); + if(hres == S_OK) { + IUnknown *unk = NULL; + + TRACE("Found in running object table\n"); + + hres = IRunningObjectTable_GetObject(obj_tbl, &This->IMoniker_iface, &unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + } + + IRunningObjectTable_Release(obj_tbl); + return hres; + } + IRunningObjectTable_Release(obj_tbl); }

1 0

Vincent Povirk : gdiplus: Only clip strings if rectangle width and height are positive.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 814f9cf7e4af9afd91196b75c581de792a239338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814f9cf7e4af9afd91196b75c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 13 16:52:18 2013 -0500 gdiplus: Only clip strings if rectangle width and height are positive. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 76af444..79e4c7c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5000,7 +5000,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && - scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23 && + rect->Width > 0.0 && rect->Height > 0.0) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Vincent Povirk : gdiplus: Add error checking to GdipClonePen.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: dc047ecdaaee5e2b2dae6e665b51dc57764b2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc047ecdaaee5e2b2dae6e665… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 16:34:25 2013 -0500 gdiplus: Add error checking to GdipClonePen. --- dlls/gdiplus/pen.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a022cfb..80ede40 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -87,6 +87,8 @@ static GpPenType bt_to_pt(GpBrushType bt) GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) { + GpStatus stat; + TRACE("(%p, %p)\n", pen, clonepen); if(!pen || !clonepen) @@ -97,9 +99,24 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) **clonepen = *pen; - GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); - GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); - GdipCloneBrush(pen->brush, &(*clonepen)->brush); + (*clonepen)->customstart = NULL; + (*clonepen)->customend = NULL; + (*clonepen)->brush = NULL; + + stat = GdipCloneBrush(pen->brush, &(*clonepen)->brush); + + if (stat == Ok && pen->customstart) + stat = GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); + + if (stat == Ok && pen->customend) + stat = GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); + + if (stat != Ok) + { + GdipDeletePen(*clonepen); + *clonepen = NULL; + return stat; + } TRACE("<-- %p\n", *clonepen);

1 0