Re: wine-patch OleIconToCursor function

[Marcus Meissner]

On Sat, Dec 30, 2006 at 04:49:27AM +0100, Bernard Ladenthin wrote:
> Hello,
> in the attachment is a small patch for the OleIconToCursor function.
> The function works with this. I hope i can help with this and get a  
> response mail that this mail have received. I haven't any experiences  
> with git so it's a simply patch.
>
> I have tested it with the "Lexware Buchhalter 2005".
> You can download it from http://server.ladenthin.net/bh2005.zip to see  
> that it works. Start with wine the "LxStart.exe" and turn over the  
> Text and Icon with the mouse, the icon is now the cursor.
>
> Best regards from Germany,
> Bernard Ramon Ladenthin

In general you do no need to edit Changelog yourself. Just add a note
above the patch.

Otherwise it looks fine to my eyes (and perhaps Alexandres too), thanks!

Ciao, Marcus
> diff --git a/ChangeLog b/ChangeLog
> index 3b536b5..9723401 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,8 @@
> [phone]  Bernard Ramon Ladenthin
> -
> -
> - dlls/oleaut32/oleaut.c, dlls/oleaut32/stubs.c:
> - oleaut32: Implement the function OleIconToCursor and remove the stub.
> -
>
> 2006-12-22  Dmitry Timoshkov
> - dlls/user32/tests/msg.c, dlls/winex11.drv/winpos.c:
>
> diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
> index d6a08a9..65a4174 100644
> --- a/dlls/oleaut32/oleaut.c
> +++ b/dlls/oleaut32/oleaut.c
> @@ -837,3 +837,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll,
>
> return TRUE;
>  }
> -
>
> +/***********************************************************************
> -
> -
>          OleIconToCursor (OLEAUT32.415)
> - */
>
> +HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hIcon)
> +{
> - FIXME("(%p,%p), (olepro32.dll), partially implemented.\n",hinstExe,hIcon);
> - if (hIcon)
> -
>  return CopyCursor(hIcon);
> - else
> -
>  return NULL;
> -
> - /* FIXME
> -
> make a extended conversation from HICON to HCURSOR
> - */
>
> +}
> diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c
> index ac2d494..d87e76e 100644
> --- a/dlls/oleaut32/stubs.c
> +++ b/dlls/oleaut32/stubs.c
> @@ -33,15 +33,6 @@
>  WINE_DEFAULT_DEBUG_CHANNEL(ole);
>
> /***********************************************************************
> -
> - OleIconToCursor (OLEAUT32.415)
> - */
>
> -HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon)
> -{
> - FIXME("(%p,%p), not implemented (olepro32.dll)\n",hinstExe,hicon);
> - return S_OK;
>
> -}
> -
>
> -/***********************************************************************
> - OleCreatePropertyFrameIndirect (OLEAUT32.416)
>
> */
>  HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams)
>

wine-patch OleIconToCursor function

[Frank Richter]

On 30.12.2006 18:54, Marcus Meissner wrote:
> > +/***********************************************************************
> > -
> > -
> >          OleIconToCursor (OLEAUT32.415)
> > - */
> >
> > +HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hIcon)
> > +{
> > - FIXME("(%p,%p), (olepro32.dll), partially implemented.\n",hinstExe,hIcon);
> > - if (hIcon)
> > -
> >  return CopyCursor(hIcon);
> > - else
> > -
> >  return NULL;
> > -
> > - /* FIXME
> > -
> > make a extended conversation from HICON to HCURSOR
> > - */
> >
> > +}

According to http://msdn2.microsoft.com/en-us/library/ms694362.aspx,
this function just does a simple CopyCursor() on Win32. And since there
doesn't seem to be a need for further changes to that function, the
FIXME trace as well as comment could both be removed.

-f.r.