commit 109ffd0f97e4a17e5369d0c4a8636a6abe46baab
author Hans Leidekker <hans@codeweavers.com> Tue Apr 13 11:15:08 2010 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Apr 14 18:00:39 2010 +0200
tree 8508dfe74377e17633a3331d49941f9501763c16
parent e1eaa4132a09c57ccb7d75666ff3a57eff9b3474

msi: Make the string reference count a short.

This is safe because the reference count is stored in 2 bytes on disk.

(This is commit ff2f894888c0cb465fe08db8e6f22d4848ca5aef reapplied
because of incorrect revert in 88214a72cedb182c2324ba096fa55353c6be3374).

dlls/msi/string.c

diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index 3bdc436..84f4e71 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -44,8 +44,8 @@
 
 typedef struct _msistring
 {
-    UINT persistent_refcount;
-    UINT nonpersistent_refcount;
+    USHORT persistent_refcount;
+    USHORT nonpersistent_refcount;
     LPWSTR str;
 } msistring;
 
@@ -188,7 +188,7 @@
     st->sortcount++;
 }
 
-static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence )
+static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence )
 {
     if (persistence == StringPersistent)
     {
@@ -237,7 +237,7 @@
     return r;
 }
 
-static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence )
+static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence )
 {
     LPWSTR str;
     int sz;
@@ -288,7 +288,7 @@
     return n;
 }
 
-int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence )
+int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence )
 {
     LPWSTR str;