Author: winesync
Date: Thu Jul 6 15:22:04 2006
New Revision: 22887
URL:
http://svn.reactos.org/svn/reactos?rev=22887&view=rev
Log:
Autosyncing with Wine HEAD
Modified:
trunk/reactos/dll/win32/imm32/imm.c
Modified: trunk/reactos/dll/win32/imm32/imm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/imm32/imm.c (original)
+++ trunk/reactos/dll/win32/imm32/imm.c Thu Jul 6 15:22:04 2006
@@ -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 @@
{
InputContextData *data = (InputContextData*)hIMC;
- WARN("(%p, %p): semi-stub\n",hWnd,hIMC);
-
- if (!data)
- return FALSE;
+ WARN("(%p, %p): semi-stub\n", hWnd, hIMC);
+
+ if (!hIMC)
+ return NULL;
/*
* WINE SPECIFIC! MAY CONFLICT
@@ -227,7 +227,7 @@
* If already associated just return
*/
if (data->hwnd == hWnd)
- return (HIMC)data;
+ return hIMC;
if (IsWindow(data->hwnd))
{
@@ -251,7 +251,7 @@
* 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;
}
/***********************************************************************