[PATCH 1/3] Adjust field names and some defines to match current documentation
Nikolay Sivov
nsivov at codeweavers.com
Mon May 2 07:34:11 CDT 2011
---
dlls/comctl32/comctl32undoc.c | 82 ++++++++++++++++++++--------------------
dlls/comctl32/tests/mru.c | 40 ++++++++++----------
2 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index ff94051..8e22cf0 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -168,23 +168,23 @@ DWORD WINAPI GetSize (LPVOID lpMem)
*|typedef INT (CALLBACK *MRUStringCmpFn)(LPCTSTR lhs, LPCTSTR rhs);
*|typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length);
*|
- *|typedef struct tagCREATEMRULIST
+ *|typedef struct tagMRUINFO
*|{
*| DWORD cbSize;
- *| DWORD nMaxItems;
- *| DWORD dwFlags;
+ *| UINT uMax;
+ *| UINT fFlags;
*| HKEY hKey;
*| LPTSTR lpszSubKey;
*| PROC lpfnCompare;
- *|} CREATEMRULIST, *LPCREATEMRULIST;
+ *|} MRUINFO, *LPMRUINFO;
*
* MEMBERS
- * cbSize [I] The size of the CREATEMRULIST structure. This must be set
- * to sizeof(CREATEMRULIST) by the caller.
- * nMaxItems [I] The maximum number of items allowed in the list. Because
+ * cbSize [I] The size of the MRUINFO structure. This must be set
+ * to sizeof(MRUINFO) by the caller.
+ * uMax [I] The maximum number of items allowed in the list. Because
* of the limited number of identifiers, this should be set to
* a value from 1 to 30 by the caller.
- * dwFlags [I] If bit 0 is set, the list will be used to store binary
+ * fFlags [I] If bit 0 is set, the list will be used to store binary
* data, otherwise it is assumed to store strings. If bit 1
* is set, every change made to the list will be reflected in
* the registry immediately, otherwise changes will only be
@@ -210,11 +210,11 @@ typedef INT (CALLBACK *MRUStringCmpFnA)(LPCSTR lhs, LPCSTR rhs);
typedef INT (CALLBACK *MRUStringCmpFnW)(LPCWSTR lhs, LPCWSTR rhs);
typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length);
-typedef struct tagCREATEMRULISTA
+typedef struct tagMRUINFOA
{
DWORD cbSize;
- DWORD nMaxItems;
- DWORD dwFlags;
+ UINT uMax;
+ UINT fFlags;
HKEY hKey;
LPSTR lpszSubKey;
union
@@ -222,13 +222,13 @@ typedef struct tagCREATEMRULISTA
MRUStringCmpFnA string_cmpfn;
MRUBinaryCmpFn binary_cmpfn;
} u;
-} CREATEMRULISTA, *LPCREATEMRULISTA;
+} MRUINFOA, *LPMRUINFOA;
-typedef struct tagCREATEMRULISTW
+typedef struct tagMRUINFOW
{
DWORD cbSize;
- DWORD nMaxItems;
- DWORD dwFlags;
+ UINT uMax;
+ UINT fFlags;
HKEY hKey;
LPWSTR lpszSubKey;
union
@@ -236,12 +236,12 @@ typedef struct tagCREATEMRULISTW
MRUStringCmpFnW string_cmpfn;
MRUBinaryCmpFn binary_cmpfn;
} u;
-} CREATEMRULISTW, *LPCREATEMRULISTW;
+} MRUINFOW, *LPMRUINFOW;
-/* dwFlags */
-#define MRUF_STRING_LIST 0 /* list will contain strings */
-#define MRUF_BINARY_LIST 1 /* list will contain binary data */
-#define MRUF_DELAYED_SAVE 2 /* only save list order to reg. is FreeMRUList */
+/* MRUINFO.fFlags */
+#define MRU_STRING 0 /* list will contain strings */
+#define MRU_BINARY 1 /* list will contain binary data */
+#define MRU_CACHEWRITE 2 /* only save list order to reg. is FreeMRUList */
/* If list is a string list lpfnCompare has the following prototype
* int CALLBACK MRUCompareString(LPCSTR s1, LPCSTR s2)
@@ -263,7 +263,7 @@ typedef struct tagWINEMRUITEM
typedef struct tagWINEMRULIST
{
- CREATEMRULISTW extview; /* original create information */
+ MRUINFOW extview; /* original create information */
BOOL isUnicode; /* is compare fn Unicode */
DWORD wineFlags; /* internal flags */
DWORD cursize; /* current size of realMRU */
@@ -325,7 +325,7 @@ static void MRU_SaveChanged ( LPWINEMRULIST mp )
witem->itemFlag &= ~WMRUIF_CHANGED;
realname[0] = 'a' + i;
err = RegSetValueExW(newkey, realname, 0,
- (mp->extview.dwFlags & MRUF_BINARY_LIST) ?
+ (mp->extview.fFlags & MRU_BINARY) ?
REG_BINARY : REG_SZ,
&witem->datastart, witem->size);
if (err) {
@@ -363,7 +363,7 @@ void WINAPI FreeMRUList (HANDLE hMRUList)
MRU_SaveChanged( mp );
}
- for(i=0; i<mp->extview.nMaxItems; i++)
+ for(i=0; i<mp->extview.uMax; i++)
Free(mp->array[i]);
Free(mp->realMRU);
@@ -400,7 +400,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData,
if (!mp || !mp->extview.u.string_cmpfn)
return -1;
- if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) {
+ if(!(mp->extview.fFlags & MRU_BINARY) && !mp->isUnicode) {
DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1,
NULL, 0, NULL, NULL);
dataA = Alloc(len);
@@ -408,7 +408,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData,
}
for(i=0; i<mp->cursize; i++) {
- if (mp->extview.dwFlags & MRUF_BINARY_LIST) {
+ if (mp->extview.fFlags & MRU_BINARY) {
if (!mp->extview.u.binary_cmpfn(lpData, &mp->array[i]->datastart, cbData))
break;
}
@@ -480,7 +480,7 @@ INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
}
else {
/* either add a new entry or replace oldest */
- if (mp->cursize < mp->extview.nMaxItems) {
+ if (mp->cursize < mp->extview.uMax) {
/* Add in a new item */
replace = mp->cursize;
mp->cursize++;
@@ -509,7 +509,7 @@ INT WINAPI AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
TRACE("(%p, %p, %d) adding data, /%c/ now most current\n",
hList, lpData, cbData, replace+'a');
- if (!(mp->extview.dwFlags & MRUF_DELAYED_SAVE)) {
+ if (!(mp->extview.fFlags & MRU_CACHEWRITE)) {
/* save changed stuff right now */
MRU_SaveChanged( mp );
}
@@ -663,12 +663,12 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
/* get space to save indices that will turn into names
* but in order of most to least recently used
*/
- mp->realMRU = Alloc((mp->extview.nMaxItems + 2) * sizeof(WCHAR));
+ mp->realMRU = Alloc((mp->extview.uMax + 2) * sizeof(WCHAR));
/* get space to save pointers to actual data in order of
* 'a' to 'z' (0 to n).
*/
- mp->array = Alloc(mp->extview.nMaxItems * sizeof(LPVOID));
+ mp->array = Alloc(mp->extview.uMax * sizeof(LPVOID));
/* open the sub key */
if ((err = RegCreateKeyExW( mp->extview.hKey, mp->extview.lpszSubKey,
@@ -681,7 +681,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
&dwdisp))) {
/* error - what to do ??? */
ERR("(%u %u %x %p %s %p): Could not open key, error=%d\n",
- mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags,
+ mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey),
mp->extview.u.string_cmpfn, err);
return 0;
@@ -689,7 +689,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
/* get values from key 'MRUList' */
if (newkey) {
- datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR);
+ datasize = (mp->extview.uMax + 1) * sizeof(WCHAR);
if((err=RegQueryValueExW( newkey, strMRUList, 0, &type,
(LPBYTE)mp->realMRU, &datasize))) {
/* not present - set size to 1 (will become 0 later) */
@@ -726,7 +726,7 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
mp->cursize = 0;
TRACE("(%u %u %x %p %s %p): Current Size = %d\n",
- mp->extview.cbSize, mp->extview.nMaxItems, mp->extview.dwFlags,
+ mp->extview.cbSize, mp->extview.uMax, mp->extview.fFlags,
mp->extview.hKey, debugstr_w(mp->extview.lpszSubKey),
mp->extview.u.string_cmpfn, mp->cursize);
return mp;
@@ -737,19 +737,19 @@ static HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
*
* See CreateMRUListLazyA.
*/
-HANDLE WINAPI CreateMRUListLazyW (const CREATEMRULISTW *lpcml, DWORD dwParam2,
+HANDLE WINAPI CreateMRUListLazyW (const MRUINFOW *lpcml, DWORD dwParam2,
DWORD dwParam3, DWORD dwParam4)
{
LPWINEMRULIST mp;
/* Native does not check for a NULL lpcml */
- if (lpcml->cbSize != sizeof(CREATEMRULISTW) || !lpcml->hKey ||
+ if (lpcml->cbSize != sizeof(MRUINFOW) || !lpcml->hKey ||
IsBadStringPtrW(lpcml->lpszSubKey, -1))
return NULL;
mp = Alloc(sizeof(WINEMRULIST));
- memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW));
+ memcpy(&mp->extview, lpcml, sizeof(MRUINFOW));
mp->extview.lpszSubKey = Alloc((strlenW(lpcml->lpszSubKey) + 1) * sizeof(WCHAR));
strcpyW(mp->extview.lpszSubKey, lpcml->lpszSubKey);
mp->isUnicode = TRUE;
@@ -771,7 +771,7 @@ HANDLE WINAPI CreateMRUListLazyW (const CREATEMRULISTW *lpcml, DWORD dwParam2,
* RETURNS
* Handle to MRU list.
*/
-HANDLE WINAPI CreateMRUListLazyA (const CREATEMRULISTA *lpcml, DWORD dwParam2,
+HANDLE WINAPI CreateMRUListLazyA (const MRUINFOA *lpcml, DWORD dwParam2,
DWORD dwParam3, DWORD dwParam4)
{
LPWINEMRULIST mp;
@@ -779,12 +779,12 @@ HANDLE WINAPI CreateMRUListLazyA (const CREATEMRULISTA *lpcml, DWORD dwParam2,
/* Native does not check for a NULL lpcml */
- if (lpcml->cbSize != sizeof(CREATEMRULISTA) || !lpcml->hKey ||
+ if (lpcml->cbSize != sizeof(MRUINFOA) || !lpcml->hKey ||
IsBadStringPtrA(lpcml->lpszSubKey, -1))
return 0;
mp = Alloc(sizeof(WINEMRULIST));
- memcpy(&mp->extview, lpcml, sizeof(CREATEMRULISTW));
+ memcpy(&mp->extview, lpcml, sizeof(MRUINFOA));
len = MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1, NULL, 0);
mp->extview.lpszSubKey = Alloc(len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpcml->lpszSubKey, -1,
@@ -798,7 +798,7 @@ HANDLE WINAPI CreateMRUListLazyA (const CREATEMRULISTA *lpcml, DWORD dwParam2,
*
* See CreateMRUListA.
*/
-HANDLE WINAPI CreateMRUListW (const CREATEMRULISTW *lpcml)
+HANDLE WINAPI CreateMRUListW (const MRUINFOW *lpcml)
{
return CreateMRUListLazyW(lpcml, 0, 0, 0);
}
@@ -814,7 +814,7 @@ HANDLE WINAPI CreateMRUListW (const CREATEMRULISTW *lpcml)
* RETURNS
* Handle to MRU list.
*/
-HANDLE WINAPI CreateMRUListA (const CREATEMRULISTA *lpcml)
+HANDLE WINAPI CreateMRUListA (const MRUINFOA *lpcml)
{
return CreateMRUListLazyA (lpcml, 0, 0, 0);
}
@@ -879,7 +879,7 @@ INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer,
desired -= 'a';
TRACE("nItemPos=%d, desired=%d\n", nItemPos, desired);
witem = mp->array[desired];
- if(mp->extview.dwFlags & MRUF_BINARY_LIST) {
+ if(mp->extview.fFlags & MRU_BINARY) {
datasize = min( witem->size, nBufferSize );
memcpy( lpBuffer, &witem->datastart, datasize);
} else {
diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c
index 24fcff5..11f696f 100644
--- a/dlls/comctl32/tests/mru.c
+++ b/dlls/comctl32/tests/mru.c
@@ -37,26 +37,26 @@
#define REG_TEST_SUBKEYA "MRUTest"
#define REG_TEST_FULLKEY REG_TEST_KEYA "\\" REG_TEST_SUBKEYA
-/* Undocumented MRU structures & functions */
-typedef struct tagCREATEMRULISTA
+/* Undocumented MRU functions */
+typedef struct tagMRUINFOA
{
DWORD cbSize;
- DWORD nMaxItems;
- DWORD dwFlags;
+ UINT uMax;
+ UINT fFlags;
HKEY hKey;
LPCSTR lpszSubKey;
PROC lpfnCompare;
-} CREATEMRULISTA, *LPCREATEMRULISTA;
+} MRUINFOA;
-#define MRUF_STRING_LIST 0
-#define MRUF_BINARY_LIST 1
-#define MRUF_DELAYED_SAVE 2
+#define MRU_STRING 0 /* this one's invented */
+#define MRU_BINARY 1
+#define MRU_CACHEWRITE 2
#define LIST_SIZE 3 /* Max entries for each mru */
-static CREATEMRULISTA mruA =
+static MRUINFOA mruA =
{
- sizeof(CREATEMRULISTA),
+ sizeof(MRUINFOA),
LIST_SIZE,
0,
NULL,
@@ -65,12 +65,12 @@ static CREATEMRULISTA mruA =
};
static HMODULE hComctl32;
-static HANDLE (WINAPI *pCreateMRUListA)(LPCREATEMRULISTA);
+static HANDLE (WINAPI *pCreateMRUListA)(MRUINFOA*);
static void (WINAPI *pFreeMRUList)(HANDLE);
static INT (WINAPI *pAddMRUStringA)(HANDLE,LPCSTR);
static INT (WINAPI *pEnumMRUList)(HANDLE,INT,LPVOID,DWORD);
static INT (WINAPI *pEnumMRUListW)(HANDLE,INT,LPVOID,DWORD);
-static HANDLE (WINAPI *pCreateMRUListLazyA)(LPCREATEMRULISTA, DWORD, DWORD, DWORD);
+static HANDLE (WINAPI *pCreateMRUListLazyA)(MRUINFOA*, DWORD, DWORD, DWORD);
static INT (WINAPI *pFindMRUData)(HANDLE, LPCVOID, DWORD, LPINT);
static INT (WINAPI *pAddMRUData)(HANDLE, LPCVOID, DWORD);
/*
@@ -226,9 +226,9 @@ static INT CALLBACK cmp_mru_strA(LPCVOID data1, LPCVOID data2)
return lstrcmpiA(data1, data2);
}
-static HANDLE create_mruA(HKEY hKey, DWORD flags, PROC cmp)
+static HANDLE create_mruA(HKEY hKey, UINT flags, PROC cmp)
{
- mruA.dwFlags = flags;
+ mruA.fFlags = flags;
mruA.lpfnCompare = cmp;
mruA.hKey = hKey;
@@ -257,7 +257,7 @@ static void test_MRUListA(void)
/* Create (size too small) */
mruA.cbSize = sizeof(mruA) - 2;
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRU_STRING, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(too small) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
@@ -265,21 +265,21 @@ static void test_MRUListA(void)
/* Create (size too big) */
mruA.cbSize = sizeof(mruA) + 2;
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRU_STRING, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(too big) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
mruA.cbSize = sizeof(mruA);
/* Create (NULL hKey) */
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRU_STRING, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(NULL key) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
/* Create (NULL name) */
mruA.lpszSubKey = NULL;
- hMRU = create_mruA(NULL, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
+ hMRU = create_mruA(NULL, MRU_STRING, (PROC)cmp_mru_strA);
ok (!hMRU && !GetLastError(),
"CreateMRUListA(NULL name) expected NULL,0 got %p,%d\n",
hMRU, GetLastError());
@@ -290,7 +290,7 @@ static void test_MRUListA(void)
"Couldn't create test key \"%s\"\n", REG_TEST_KEYA);
if (!hKey)
return;
- hMRU = create_mruA(hKey, MRUF_STRING_LIST, (PROC)cmp_mru_strA);
+ hMRU = create_mruA(hKey, MRU_STRING, (PROC)cmp_mru_strA);
ok(hMRU && !GetLastError(),
"CreateMRUListA(string) expected non-NULL,0 got %p,%d\n",
hMRU, GetLastError());
@@ -428,7 +428,7 @@ static void test_CreateMRUListLazyA(void)
{
HANDLE hMRU;
HKEY hKey;
- CREATEMRULISTA listA = { 0 };
+ MRUINFOA listA = { 0 };
if (!pCreateMRUListLazyA || !pFreeMRUList)
{
--
1.5.6.5
--------------050208030103070609060900--
More information about the wine-patches
mailing list