wine/dlls/wined3d device.c

[Alexandre Julliard]

ChangeSet ID:	21468
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/28 05:03:05

Modified files:
	dlls/wined3d   : device.c 

Log message:
	Oliver Stieber <oliver_stieber at yahoo.co.uk>
	Stop reporting not having swapchain 0 as an error and add an internal
	variable instead of modifying a parameter.

Patch: http://cvs.winehq.org/patch.py?id=21468

Old revision  New revision  Changes     Path
 1.100         1.101         +5 -4       wine/dlls/wined3d/device.c

Index: wine/dlls/wined3d/device.c
diff -u -p wine/dlls/wined3d/device.c:1.100 wine/dlls/wined3d/device.c:1.101
--- wine/dlls/wined3d/device.c:1.100	28 Nov 2005 11: 3: 5 -0000
+++ wine/dlls/wined3d/device.c	28 Nov 2005 11: 3: 5 -0000
@@ -1560,21 +1560,22 @@ UINT     WINAPI  IWineD3DDeviceImpl_GetN
 HRESULT  WINAPI  IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, UINT iSwapChain, IWineD3DSwapChain **pSwapChain) {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
     SwapChainList *swapchain;
+    int i = iSwapChain;
     HRESULT hr = D3DERR_INVALIDCALL;
     swapchain = This->swapchains;
     TRACE("(%p) : swapchain %d\n", This, iSwapChain);
 
 
     TRACE("(%p) Finding swapchain %d\n", This, iSwapChain);
-    while (iSwapChain > 0 && swapchain != NULL) {
+    while (i > 0 && swapchain != NULL) {
         swapchain = swapchain->next;
-        iSwapChain--;
+        --i;
     }
 
-    if (iSwapChain > 0 || swapchain == NULL) {
+    if (i > 0) {
         FIXME("(%p) Unable to find swapchain %d\n", This, iSwapChain);
         *pSwapChain = NULL;
-    } else {
+    } else if (swapchain != NULL) {
         /** TODO: move off to a linkesList implementation **/
         *pSwapChain = swapchain->swapchain;
         IWineD3DSwapChain_AddRef(*pSwapChain);