mirror of
https://github.com/reactos/reactos.git
synced 2024-07-04 19:54:58 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=22887
This commit is contained in:
parent
532c10cebd
commit
51e37a94c6
|
@ -16,7 +16,7 @@
|
|||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#include <stdarg.h>
|
||||
|
@ -209,10 +209,10 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
|
|||
{
|
||||
InputContextData *data = (InputContextData*)hIMC;
|
||||
|
||||
WARN("(%p, %p): semi-stub\n",hWnd,hIMC);
|
||||
WARN("(%p, %p): semi-stub\n", hWnd, hIMC);
|
||||
|
||||
if (!data)
|
||||
return FALSE;
|
||||
if (!hIMC)
|
||||
return NULL;
|
||||
|
||||
/*
|
||||
* WINE SPECIFIC! MAY CONFLICT
|
||||
|
@ -227,7 +227,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
|
|||
* If already associated just return
|
||||
*/
|
||||
if (data->hwnd == hWnd)
|
||||
return (HIMC)data;
|
||||
return hIMC;
|
||||
|
||||
if (IsWindow(data->hwnd))
|
||||
{
|
||||
|
@ -251,7 +251,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
|
|||
* TODO: We need to keep track of the old context associated
|
||||
* with a window and return it for now we will return NULL;
|
||||
*/
|
||||
return (HIMC)NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
Loading…
Reference in a new issue