[ros-diffs] [gvg] 20120: Re-import imm32 from Wine

[gvg at svn.reactos.com]

Re-import imm32 from Wine
Added: trunk/reactos/lib/imm32/
Deleted: trunk/reactos/lib/imm32/Makefile.in
Deleted: trunk/reactos/lib/imm32/imm.spec
Added: trunk/reactos/lib/imm32/imm32.xml
Modified: trunk/reactos/w32api/include/imm.h
  _____  

Copied: trunk/reactos/lib/imm32 (from rev 20119,
vendor/wine/dlls/imm32/current)
Property changes on: trunk/reactos/lib/imm32
___________________________________________________________________
Name: svn:ignore
   + GNUmakefile
  _____  

Deleted: trunk/reactos/lib/imm32/Makefile.in
--- vendor/wine/dlls/imm32/current/Makefile.in	2005-12-12 20:57:16 UTC
(rev 20119)
+++ trunk/reactos/lib/imm32/Makefile.in	2005-12-12 20:59:55 UTC (rev
20120)
@@ -1,16 +0,0 @@

-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = imm32.dll
-IMPORTLIB = libimm32.$(IMPLIBEXT)
-IMPORTS   = user32 gdi32 kernel32
-
-C_SRCS = \
-	imm.c
-
-SPEC_SRCS16 = imm.spec
-
- at MAKE_DLL_RULES@
-
-### Dependencies:
  _____  

Deleted: trunk/reactos/lib/imm32/imm.spec
--- vendor/wine/dlls/imm32/current/imm.spec	2005-12-12 20:57:16 UTC
(rev 20119)
+++ trunk/reactos/lib/imm32/imm.spec	2005-12-12 20:59:55 UTC (rev
20120)
@@ -1,54 +0,0 @@

-4   stub IMMGETDEFAULTIMEWND
-7   stub IMMGETDESCRIPTIONA
-8   stub IMMGETIMEFILENAMEA
-9   stub IMMGETPROPERTY
-11  stub IMMINSTALLIMEA
-#15  stub ___EXPORTEDSTUB
-17  stub IMMISIME
-25  stub IMMGETHOTKEY
-26  stub IMMSETHOTKEY
-27  stub IMMSIMULATEHOTKEY
-35  stub IMMCREATECONTEXT
-36  stub IMMDESTROYCONTEXT
-37  stub IMMGETCONTEXT
-38  stub IMMRELEASECONTEXT
-39  stub IMMASSOCIATECONTEXT
-41  stub IMMASSOCIATECONTEXTEX
-43  stub IMMGETCOMPOSITIONSTRINGA
-44  stub IMMSETCOMPOSITIONSTRINGA
-45  stub IMMGETCANDIDATELISTCOUNTA
-46  stub IMMGETCANDIDATELISTA
-47  stub IMMGETGUIDELINEA
-51  stub IMMGETCONVERSIONSTATUS
-52  stub IMMSETCONVERSIONSTATUS
-53  stub IMMGETOPENSTATUS
-54  stub IMMSETOPENSTATUS
-55  stub IMMGETCOMPOSITIONFONTA
-56  stub IMMSETCOMPOSITIONFONTA
-61  stub IMMCONFIGUREIMEA
-63  stub IMMESCAPEA
-64  stub IMMGETCONVERSIONLISTA
-65  stub IMMNOTIFYIME
-71  stub IMMISUIMESSAGEA
-72  stub IMMGENERATEMESSAGE
-73  stub IMMGETVIRTUALKEY
-87  stub IMMGETSTATUSWINDOWPOS
-88  stub IMMSETSTATUSWINDOWPOS
-89  stub IMMGETCOMPOSITIONWINDOW
-90  stub IMMSETCOMPOSITIONWINDOW
-91  stub IMMGETCANDIDATEWINDOW
-92  stub IMMSETCANDIDATEWINDOW
-95  stub IMMUNINSTALLIMEA
-110 stub IMMLOCKIMC
-111 stub IMMUNLOCKIMC
-112 stub IMMGETIMCLOCKCOUNT
-116 stub IMMCREATEIMCC
-117 stub IMMDESTROYIMCC
-118 stub IMMLOCKIMCC
-119 stub IMMUNLOCKIMCC
-120 stub IMMGETIMCCLOCKCOUNT
-121 stub IMMRESIZEIMCC
-122 stub IMMGETIMCCSIZE
-#160 stub FT_IMMFTHKTHKCONNECTIONDATA
-#161 stub IMM32THKCONNECTIONDATASL
-180 stub IMMSYNCCONVERSION
  _____  

Added: trunk/reactos/lib/imm32/imm32.xml
--- vendor/wine/dlls/imm32/current/imm32.xml	2005-12-12 20:57:16 UTC
(rev 20119)
+++ trunk/reactos/lib/imm32/imm32.xml	2005-12-12 20:59:55 UTC (rev
20120)
@@ -0,0 +1,13 @@

+<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}"
installbase="system32" installname="imm32.dll">
+	<importlibrary definition="imm32.spec.def" />
+	<include base="imm32">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<file>imm.c</file>
+	<file>imm32.spec</file>
+</module>
Property changes on: trunk/reactos/lib/imm32/imm32.xml
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/w32api/include/imm.h
--- trunk/reactos/w32api/include/imm.h	2005-12-12 20:57:16 UTC (rev
20119)
+++ trunk/reactos/w32api/include/imm.h	2005-12-12 20:59:55 UTC (rev
20120)
@@ -241,8 +241,8 @@

 #define VK_PROCESSKEY 0x0E5
 #endif
 #define STYLE_DESCRIPTION_SIZE 32
-typedef DWORD HIMC;
-typedef DWORD HIMCC;
+typedef HANDLE HIMC;
+typedef HANDLE HIMCC;
 typedef HKL *LPHKL;
 typedef struct tagCOMPOSITIONFORM {
 	DWORD dwStyle;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051212/fbd5c24e/attachment.html