diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..abaa6ca
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "libiconv"]
+	path = libiconv
+	url = https://github.com/ShadowsocksR-Live/libiconv.git
+	branch = master
diff --git a/libiconv b/libiconv
new file mode 160000
index 0000000..4ce9455
--- /dev/null
+++ b/libiconv
@@ -0,0 +1 @@
+Subproject commit 4ce9455f0c5fe9cec3348226adcff0a9aaf9c9d4
diff --git a/win32/zbar.def b/win32/zbar.def
new file mode 100644
index 0000000..f15e78a
--- /dev/null
+++ b/win32/zbar.def
@@ -0,0 +1,133 @@
+EXPORTS
+_zbar_error_spew
+_zbar_error_string
+_zbar_get_error_code
+zbar_decode_width
+zbar_decoder_create
+zbar_decoder_destroy
+zbar_decoder_get_color
+zbar_decoder_get_configs
+zbar_decoder_get_data
+zbar_decoder_get_data_length
+zbar_decoder_get_direction
+zbar_decoder_get_modifiers
+zbar_decoder_get_type
+zbar_decoder_get_userdata
+zbar_decoder_new_scan
+zbar_decoder_reset
+zbar_decoder_set_config
+zbar_decoder_set_handler
+zbar_decoder_set_userdata
+zbar_get_addon_name
+zbar_get_config_name
+zbar_get_modifier_name
+zbar_get_orientation_name
+zbar_get_symbol_name
+zbar_image_convert
+zbar_image_convert_resize
+zbar_image_copy
+zbar_image_create
+zbar_image_destroy
+zbar_image_first_symbol
+zbar_image_free_data
+zbar_image_get_crop
+zbar_image_get_data
+zbar_image_get_data_length
+zbar_image_get_format
+zbar_image_get_height
+zbar_image_get_sequence
+zbar_image_get_size
+zbar_image_get_symbols
+zbar_image_get_userdata
+zbar_image_get_width
+zbar_image_ref
+zbar_image_scanner_create
+zbar_image_scanner_destroy
+zbar_image_scanner_enable_cache
+zbar_image_scanner_get_results
+zbar_image_scanner_recycle_image
+zbar_image_scanner_set_config
+zbar_image_scanner_set_data_handler
+zbar_image_set_crop
+zbar_image_set_data
+zbar_image_set_format
+zbar_image_set_sequence
+zbar_image_set_size
+zbar_image_set_symbols
+zbar_image_set_userdata
+zbar_image_write
+zbar_increase_verbosity
+zbar_negotiate_format
+zbar_parse_config
+zbar_process_image
+zbar_process_one
+zbar_processor_create
+zbar_processor_destroy
+zbar_processor_force_format
+zbar_processor_get_results
+zbar_processor_get_userdata
+zbar_processor_init
+zbar_processor_is_visible
+zbar_processor_request_interface
+zbar_processor_request_iomode
+zbar_processor_request_size
+zbar_processor_set_active
+zbar_processor_set_config
+zbar_processor_set_data_handler
+zbar_processor_set_userdata
+zbar_processor_set_visible
+zbar_processor_user_wait
+zbar_scan_image
+zbar_scan_y
+zbar_scanner_create
+zbar_scanner_destroy
+zbar_scanner_flush
+zbar_scanner_get_color
+zbar_scanner_get_edge
+zbar_scanner_get_state
+zbar_scanner_get_width
+zbar_scanner_new_scan
+zbar_scanner_reset
+zbar_set_verbosity
+zbar_symbol_first_component
+zbar_symbol_get_components
+zbar_symbol_get_configs
+zbar_symbol_get_count
+zbar_symbol_get_data
+zbar_symbol_get_data_length
+zbar_symbol_get_loc_size
+zbar_symbol_get_loc_x
+zbar_symbol_get_loc_y
+zbar_symbol_get_modifiers
+zbar_symbol_get_orientation
+zbar_symbol_get_quality
+zbar_symbol_get_type
+zbar_symbol_next
+zbar_symbol_ref
+zbar_symbol_set_first_symbol
+zbar_symbol_set_first_unfiltered
+zbar_symbol_set_get_size
+zbar_symbol_set_ref
+zbar_symbol_xml
+zbar_version
+zbar_video_create
+zbar_video_destroy
+zbar_video_enable
+zbar_video_get_fd
+zbar_video_get_format
+zbar_video_get_height
+zbar_video_get_width
+zbar_video_init
+zbar_video_next_image
+zbar_video_open
+zbar_video_request_interface
+zbar_video_request_iomode
+zbar_video_request_size
+zbar_window_attach
+zbar_window_create
+zbar_window_destroy
+zbar_window_draw
+zbar_window_get_overlay
+zbar_window_redraw
+zbar_window_resize
+zbar_window_set_overlay
diff --git a/win32/zbar.vcxproj b/win32/zbar.vcxproj
index df6f647..24dd63f 100644
--- a/win32/zbar.vcxproj
+++ b/win32/zbar.vcxproj
@@ -5,17 +5,17 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="MinSizeRel|Win32">
-      <Configuration>MinSizeRel</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="RelWithDebInfo|Win32">
-      <Configuration>RelWithDebInfo</Configuration>
-      <Platform>Win32</Platform>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -29,16 +29,16 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -50,22 +50,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Users\Administrator\Desktop\zbar\build\Release\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zbar.dir\Release\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zbar</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">C:\Users\Administrator\Desktop\zbar\build\MinSizeRel\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">zbar.dir\MinSizeRel\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">zbar</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">.lib</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">C:\Users\Administrator\Desktop\zbar\build\RelWithDebInfo\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">zbar.dir\RelWithDebInfo\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">zbar</TargetName>
-    <TargetExt Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">.lib</TargetExt>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\include;..\zbar;..\zbar\qrcode;..\zbar\decoder;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\zbar;..\zbar\qrcode;..\zbar\decoder;..\libiconv\win32;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ExceptionHandling>
@@ -74,8 +62,8 @@
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;ENABLE_QRCODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;ENABLE_QRCODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;4819;4018;4554;4244;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -92,22 +80,60 @@
     <Lib>
       <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
     </Lib>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libiconv.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>zbar.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\include;..\zbar;..\zbar\qrcode;..\zbar\decoder;..\libiconv\win32;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;ENABLE_QRCODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4996;4819;4018;4554;4244;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Midl>
+      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+      <HeaderFileName>%(Filename).h</HeaderFileName>
+      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+    </Midl>
+    <Lib>
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+    </Lib>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libiconv.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>zbar.def</ModuleDefinitionFile>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <AdditionalIncludeDirectories>..\include;..\zbar;..\zbar\qrcode;..\zbar\decoder;..\libiconv\win32;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;ENABLE_QRCODE;HAVE_LIBPTHREAD=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DebugInformationFormat>
       </DebugInformationFormat>
+      <DisableSpecificWarnings>4996;4819;4018;4554;4244;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -124,56 +150,28 @@
     <Lib>
       <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
     </Lib>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>zbar.def</ModuleDefinitionFile>
+      <AdditionalDependencies>libiconv.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <AdditionalIncludeDirectories>..\include;..\zbar;..\zbar\qrcode;..\zbar\decoder;..\libiconv\win32;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <Optimization>MinSpace</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <Optimization>MaxSpeed</Optimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;ENABLE_QRCODE;HAVE_LIBPTHREAD=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DebugInformationFormat>
       </DebugInformationFormat>
+      <DisableSpecificWarnings>4996;4819;4018;4554;4244;4146;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
-      <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-    </Midl>
-    <Lib>
-      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ENABLE_QRCODE;ZBAR_VERSION_MAJOR=0;ZBAR_VERSION_MINOR=23;ZBAR_VERSION_PATCH=0;HAVE_LIBPTHREAD=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>C:\Users\Administrator\Desktop\zbar\include;C:\Users\Administrator\Desktop\zbar\zbar;C:\Users\Administrator\Desktop\zbar\zbar\qrcode;C:\Users\Administrator\Desktop\zbar\zbar\decoder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Midl>
@@ -187,9 +185,25 @@
     <Lib>
       <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
     </Lib>
+    <Link>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>zbar.def</ModuleDefinitionFile>
+      <AdditionalDependencies>libiconv.lib;Winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\zbar\config.c" />
+    <ClCompile Include="..\zbar\decoder\codabar.c" />
+    <ClCompile Include="..\zbar\decoder\code128.c" />
+    <ClCompile Include="..\zbar\decoder\code39.c" />
+    <ClCompile Include="..\zbar\decoder\code93.c" />
+    <ClCompile Include="..\zbar\decoder\databar.c" />
+    <ClCompile Include="..\zbar\decoder\ean.c" />
+    <ClCompile Include="..\zbar\decoder\i25.c" />
+    <ClCompile Include="..\zbar\decoder\pdf417.c" />
     <ClCompile Include="..\zbar\decoder\qr_finder.c" />
+    <ClCompile Include="..\zbar\decoder\sq_finder.c" />
+    <ClCompile Include="..\zbar\processor\win.c" />
     <ClCompile Include="..\zbar\qrcode\qrdec.c" />
     <ClCompile Include="..\zbar\qrcode\qrdectxt.c" />
     <ClCompile Include="..\zbar\qrcode\rs.c" />
@@ -199,7 +213,11 @@
     <ClCompile Include="..\zbar\qrcode\util.c" />
     <ClCompile Include="..\zbar\processor\posix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\zbar\sqcode.c" />
     <ClCompile Include="..\zbar\symbol.c" />
     <ClCompile Include="..\zbar\image.c" />
     <ClCompile Include="..\zbar\video.c" />
@@ -217,12 +235,25 @@
     </ClCompile>
     <ClCompile Include="..\zbar\processor\null.c">
       <ObjectFileName>$(IntDir)/zbar/processor/null.c.obj</ObjectFileName>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\zbar\window\null.c">
       <ObjectFileName>$(IntDir)/zbar/window/null.c.obj</ObjectFileName>
     </ClCompile>
     <ClInclude Include="..\include\zbar.h" />
+    <ClInclude Include="..\zbar\decoder\codabar.h" />
+    <ClInclude Include="..\zbar\decoder\code128.h" />
+    <ClInclude Include="..\zbar\decoder\code39.h" />
+    <ClInclude Include="..\zbar\decoder\code93.h" />
+    <ClInclude Include="..\zbar\decoder\databar.h" />
+    <ClInclude Include="..\zbar\decoder\ean.h" />
+    <ClInclude Include="..\zbar\decoder\i25.h" />
+    <ClInclude Include="..\zbar\decoder\pdf417.h" />
     <ClInclude Include="..\zbar\decoder\qr_finder.h" />
+    <ClInclude Include="..\zbar\decoder\sq_finder.h" />
     <ClInclude Include="..\zbar\qrcode.h" />
     <ClInclude Include="..\zbar\qrcode\qrdec.h" />
     <ClInclude Include="..\zbar\qrcode\rs.h" />
@@ -231,6 +262,7 @@
     <ClInclude Include="..\zbar\qrcode\binarize.h" />
     <ClInclude Include="..\zbar\qrcode\util.h" />
     <ClInclude Include="..\zbar\error.h" />
+    <ClInclude Include="..\zbar\sqcode.h" />
     <ClInclude Include="..\zbar\symbol.h" />
     <ClInclude Include="..\zbar\image.h" />
     <ClInclude Include="..\zbar\processor.h" />
@@ -244,6 +276,10 @@
     <ClInclude Include="..\zbar\img_scanner.h" />
     <ClInclude Include="..\zbar\decoder.h" />
     <ClInclude Include="..\zbar\processor\posix.h" />
+    <ClInclude Include="config.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="zbar.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/win32/zbar.vcxproj.filters b/win32/zbar.vcxproj.filters
index eeaaf33..b7a589d 100644
--- a/win32/zbar.vcxproj.filters
+++ b/win32/zbar.vcxproj.filters
@@ -73,6 +73,42 @@
     <ClCompile Include="..\zbar\window\null.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\zbar\decoder\i25.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\codabar.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\databar.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\code128.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\code93.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\code39.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\ean.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\processor\win.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\config.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\pdf417.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\decoder\sq_finder.c">
+      <Filter>Source Files\decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\zbar\sqcode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\zbar.h">
@@ -144,9 +180,39 @@
     <ClInclude Include="..\zbar\processor\posix.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\CMakeLists.txt" />
+    <ClInclude Include="..\zbar\decoder\i25.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\codabar.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\databar.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\code128.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\code93.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\code39.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\ean.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\pdf417.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\decoder\sq_finder.h">
+      <Filter>Source Files\decoder</Filter>
+    </ClInclude>
+    <ClInclude Include="..\zbar\sqcode.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
@@ -155,5 +221,13 @@
     <Filter Include="Source Files">
       <UniqueIdentifier>{138F32C6-425A-3C3C-BAB0-E030755D908D}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\decoder">
+      <UniqueIdentifier>{36d2b411-b5eb-4a27-8259-21e17c606f54}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <None Include="zbar.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32/zbar_qrcode.sln b/win32/zbar_qrcode.sln
index 3e58301..c6340e0 100644
--- a/win32/zbar_qrcode.sln
+++ b/win32/zbar_qrcode.sln
@@ -2,23 +2,36 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zbar", "zbar.vcxproj", "{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F8837083-04B2-3D79-96DC-D36A40C5D304} = {F8837083-04B2-3D79-96DC-D36A40C5D304}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\libiconv\win32\libiconv.vcxproj", "{F8837083-04B2-3D79-96DC-D36A40C5D304}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		MinSizeRel|Win32 = MinSizeRel|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
-		RelWithDebInfo|Win32 = RelWithDebInfo|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Debug|Win32.Build.0 = Debug|Win32
-		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
-		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Debug|x64.ActiveCfg = Debug|x64
+		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Debug|x64.Build.0 = Debug|x64
 		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Release|Win32.ActiveCfg = Release|Win32
 		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Release|Win32.Build.0 = Release|Win32
-		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
-		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Release|x64.ActiveCfg = Release|x64
+		{E8072FB6-41C5-3D5C-A66F-329FB8A4D760}.Release|x64.Build.0 = Release|x64
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Debug|Win32.Build.0 = Debug|Win32
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Debug|x64.ActiveCfg = Debug|x64
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Debug|x64.Build.0 = Debug|x64
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|Win32.ActiveCfg = Release|Win32
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|Win32.Build.0 = Release|Win32
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|x64.ActiveCfg = Release|x64
+		{F8837083-04B2-3D79-96DC-D36A40C5D304}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE