Alexandre Julliard : sti: Generate the class registration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 30de0fa6977cce5dfc07fdf7a853c76998cdad07
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=30de0fa6977cce5dfc07fdf7a8...

Author: Alexandre Julliard 
Date:   Fri Dec  3 20:27:25 2010 +0100

sti: Generate the class registration.

---

dlls/sti/Makefile.in |    2 --
 dlls/sti/rsrc.rc     |   20 --------------------
 dlls/sti/sti.rgs     |   13 -------------
 dlls/sti/sti_wia.idl |    6 ++++++
 4 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index 2f5e828..9149cf4 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -7,8 +7,6 @@ C_SRCS = \
    sti.c \
    sti_main.c

-RC_SRCS = rsrc.rc
-
 IDL_P_SRCS = \
    sti_wia.idl

diff --git a/dlls/sti/rsrc.rc b/dlls/sti/rsrc.rc
deleted file mode 100644
index 9e14da7..0000000
--- a/dlls/sti/rsrc.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2010 Damjan Jovanovic
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* @makedep: sti.rgs */
-1 WINE_REGISTRY sti.rgs
diff --git a/dlls/sti/sti.rgs b/dlls/sti/sti.rgs
deleted file mode 100644
index 8a13c88..0000000
--- a/dlls/sti/sti.rgs
+++ /dev/null
@@ -1,13 +0,0 @@
-HKCR
-{
-    NoRemove CLSID
-    {
-        ForceRemove '{B323F8E0-2E68-11D0-90EA-00AA0060F86C}' = s 'StillImage'
-        {
-            InprocServer32 = s '%MODULE%'
-            {
-                val ThreadingModel = s 'Both'
-            }
-        }
-    }
-}
diff --git a/dlls/sti/sti_wia.idl b/dlls/sti/sti_wia.idl
index aaac943..798438e 100644
--- a/dlls/sti/sti_wia.idl
+++ b/dlls/sti/sti_wia.idl
@@ -17,3 +17,9 @@
  */

#include "wia_lh.idl"
+
+[
+    threading(both),
+    uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c)
+]
+coclass StillImage { interface IStillImageW; }