Compiles and runs and works and everything!

git-svn-id: http://zigserv/svn/Projects/trunk/wcdx@268 41632dc1-7a16-0410-8441-a1f66f767317

Author: Bekenn

include/iwcdx.idl

@@ -1,7 +1,15 @@
 import "unknwn.idl";
 import "wtypes.idl";
 
+cpp_quote("#ifdef WCDX_EXPORTS")
+cpp_quote("#define WCDXAPI __declspec(dllexport)")
+cpp_quote("#else")
+cpp_quote("#define WCDXAPI __declspec(dllimport)")
+cpp_quote("#endif")
+
 interface IWcdx;
+
+cpp_quote("WCDXAPI")
 IWcdx* CreateWcdx(HWND window);
 
 [

src/wcdx.cpp

@@ -7,7 +7,7 @@
 
 using namespace std;
 
-IWcdx* CreateWcdx(HWND window)
+WCDXAPI IWcdx* CreateWcdx(HWND window)
 {
 	try
 	{
@@ -19,7 +19,7 @@ IWcdx* CreateWcdx(HWND window)
 	}
 }
 
-Wcdx::Wcdx(HWND window) : d3d(::Direct3DCreate9(D3D_SDK_VERSION)), dirty(false)
+Wcdx::Wcdx(HWND window) : ref_count(1), d3d(::Direct3DCreate9(D3D_SDK_VERSION)), dirty(false)
 {
 	D3DPRESENT_PARAMETERS params =
 	{
@@ -42,17 +42,39 @@ Wcdx::Wcdx(HWND window) : d3d(::Direct3DCreate9(D3D_SDK_VERSION)), dirty(false)
 
 HRESULT STDMETHODCALLTYPE Wcdx::QueryInterface(REFIID riid, void** ppvObject)
 {
+	if (ppvObject == nullptr)
+		return E_POINTER;
+
+	if (IsEqualIID(riid, IID_IUnknown))
+	{
+		*reinterpret_cast<IUnknown**>(ppvObject) = this;
+		++ref_count;
+		return S_OK;
+	}
+	if (IsEqualIID(riid, IID_IWcdx))
+	{
+		*reinterpret_cast<IWcdx**>(ppvObject) = this;
+		++ref_count;
+		return S_OK;
+	}
+
 	return E_NOINTERFACE;
 }
 
 ULONG STDMETHODCALLTYPE Wcdx::AddRef()
 {
-	return 0;
+	return ++ref_count;
 }
 
 ULONG STDMETHODCALLTYPE Wcdx::Release()
 {
-	return 0;
+	if (--ref_count == 0)
+	{
+		delete this;
+		return 0;
+	}
+
+	return ref_count;
 }
 
 HRESULT STDMETHODCALLTYPE Wcdx::SetPalette(const PALETTEENTRY entries[256])

src/wcdx.h

@@ -8,14 +8,7 @@
 #include <d3d9.h>
 
 
-#ifdef WCDX_EXPORTS
-#define WCDXAPI __declspec(dllexport)
-#else
-#define WCDXAPI __declspec(dllimport)
-#endif
-
-
-class WCDXAPI Wcdx : public IWcdx
+class Wcdx : public IWcdx
 {
 public:
 	Wcdx(HWND window);
@@ -36,6 +29,8 @@ class WCDXAPI Wcdx : public IWcdx
     HRESULT STDMETHODCALLTYPE Present() override;
 
 private:
+	ULONG ref_count;
+
 	// Suppress warnings about IDirect3D9Ptr not being exported -- they're not
 	// directly usable by clients, so it doesn't matter.
 #pragma warning(push)

test/src/main.cpp

@@ -3,8 +3,10 @@
 
 #include <iwcdx.h>
 
+#include <d3d9.h>
 #include <DxErr.h>
 #include <Shlwapi.h>
+#include <comdef.h>
 
 #include <algorithm>
 #include <memory>
@@ -27,7 +29,7 @@ enum
 
 struct WindowData
 {
-	Wcdx& wcdx;
+	IWcdx* wcdx;
 	vector<unique_ptr<Bitmap>> images;
 	size_t imageIndex;
 };
@@ -76,7 +78,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpComma
 			L"Wcdx Test", WS_OVERLAPPEDWINDOW & ~(WS_THICKFRAME | WS_MAXIMIZEBOX),
 			CW_USEDEFAULT, CW_USEDEFAULT, 1024, 768,
 			nullptr, nullptr, hInstance, nullptr);
-		Wcdx wcdx(window);
+		IWcdx* wcdx = CreateWcdx(window);
 		WindowData windowData = { wcdx };
 		::SetWindowLongPtr(window, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(&windowData));
 
@@ -132,15 +134,15 @@ void ShowImage(HWND window, Bitmap& image)
 	image.GetPalette(&palette, paletteData.size());
 
 	assert(palette.Count == 256);
-	windowData.wcdx.SetPalette(reinterpret_cast<PALETTEENTRY*>(palette.Entries));
+	windowData.wcdx->SetPalette(reinterpret_cast<PALETTEENTRY*>(palette.Entries));
 
 	Rect imageRect(0, 0, image.GetWidth(), image.GetHeight());
 	BitmapData bits;
 	image.LockBits(&imageRect, 0, image.GetPixelFormat(), &bits);
 	at_scope_exit([&]{ image.UnlockBits(&bits); });
 
 	RECT updateRect = { 0, 0, image.GetWidth(), image.GetHeight() };
-	windowData.wcdx.UpdateFrame(bits.Scan0, updateRect, bits.Stride);
+	windowData.wcdx->UpdateFrame(updateRect.left, updateRect.top, updateRect.right - updateRect.left, updateRect.bottom - updateRect.top, bits.Stride, reinterpret_cast<byte*>(bits.Scan0));
 }
 
 bool OnCreate(HWND window, const CREATESTRUCT& create)
@@ -152,6 +154,8 @@ bool OnCreate(HWND window, const CREATESTRUCT& create)
 
 void OnDestroy(HWND window)
 {
+	WindowData& windowData = *reinterpret_cast<WindowData*>(::GetWindowLongPtr(window, GWLP_USERDATA));
+	windowData.wcdx->Release();
 	::CoUninitialize();
 	::PostQuitMessage(EXIT_SUCCESS);
 }
@@ -178,7 +182,7 @@ void OnRender(HWND window)
 		return;
 
 	WindowData& windowData = *reinterpret_cast<WindowData*>(::GetWindowLongPtr(window, GWLP_USERDATA));
-	windowData.wcdx.Present();
+	windowData.wcdx->Present();
 
 //	::PostMessage(window, WM_APP_RENDER, 0, 0);
 }

test/test.vcxproj

@@ -57,7 +57,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>wcdx.lib;DxErr.lib;Shlwapi.lib;Gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>DxErr.lib;Shlwapi.lib;Gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);$(DXSDK_DIR)Lib\$(TargetedSDKArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,7 +77,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>wcdx.lib;DxErr.lib;Shlwapi.lib;Gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>DxErr.lib;Shlwapi.lib;Gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir);$(DXSDK_DIR)Lib\$(TargetedSDKArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -107,6 +107,11 @@
     <Image Include="res\images\wc_008.png" />
     <Image Include="res\images\wc_009.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\wcdx.vcxproj">
+      <Project>{9ec19d93-a821-411f-abfb-c60b657d5839}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>