Huw Davies : ole32: Start allocating regular cache entries with id of 2.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 705ccd748812566bd5bc33ff75705bde5ef62236
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=705ccd748812566bd5bc33ff75...

Author: Huw Davies 
Date:   Tue Jun  6 11:46:49 2017 +0100

ole32: Start allocating regular cache entries with id of 2.

Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/ole32/datacache.c  | 2 +-
 dlls/ole32/tests/ole2.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index d921603..c9ab200 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -2622,7 +2622,7 @@ static DataCache* DataCache_Construct(
   newObject->sinkInterface = 0;
   newObject->presentationStorage = NULL;
   list_init(&newObject->cache_list);
-  newObject->last_cache_id = 1;
+  newObject->last_cache_id = 2;
   newObject->dirty = FALSE;
   newObject->running_object = NULL;

diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c
index 37e89da..6c6bea8 100644
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -2140,6 +2140,7 @@ static void test_data_cache_bitmap(void)

hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
     ok( hr == S_OK, "got %08x\n", hr );
+    ok( conn == 2, "got %d\n", conn );
     expect[0].dwConnection = conn;
     expect[1].dwConnection = conn;

@@ -2158,6 +2159,7 @@ static void test_data_cache_bitmap(void)

hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
     ok( hr == S_OK, "got %08x\n", hr );
+    ok( conn == 3, "got %d\n", conn );
     expect[2].dwConnection = conn;

check_enum_cache( cache, expect,  3);
@@ -2168,6 +2170,7 @@ static void test_data_cache_bitmap(void)

hr = IOleCache2_Cache( cache, &fmt, 0, &conn );
     ok( hr == S_OK, "got %08x\n", hr );
+    ok( conn == 4, "got %d\n", conn );
     expect[3].dwConnection = conn;

check_enum_cache( cache, expect, 4 );