Jacek Caban : mshtml: Fixed status text cache implementation.
Alexandre Julliard
julliard at winehq.org
Mon Apr 2 13:14:51 CDT 2012
Module: wine
Branch: master
Commit: f9c875dd3e00da2e2e6e7d3da0d22b62eff96dfd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c875dd3e00da2e2e6e7d3da0d22b62eff96dfd
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Apr 2 16:33:50 2012 +0200
mshtml: Fixed status text cache implementation.
---
dlls/mshtml/main.c | 29 ++++++++++++++---------------
dlls/mshtml/resource.h | 7 ++++---
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 165bf03..8468f5c 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -49,7 +49,7 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES;
static HINSTANCE shdoclc = NULL;
static HDC display_dc;
-static LPWSTR status_strings[NUM_STATUS_STRINGS];
+static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1];
static void thread_detach(void)
{
@@ -68,7 +68,7 @@ static void thread_detach(void)
static void free_strings(void)
{
int i;
- for(i = 0; i < NUM_STATUS_STRINGS; i++)
+ for(i = 0; i < sizeof(status_strings)/sizeof(*status_strings); i++)
heap_free(status_strings[i]);
}
@@ -89,30 +89,29 @@ static void process_detach(void)
void set_statustext(HTMLDocumentObj* doc, INT id, LPCWSTR arg)
{
- int index = id - IDS_STATUS_DONE;
- LPWSTR p = status_strings[index];
+ int index = id - IDS_STATUS_FIRST;
+ WCHAR *p = status_strings[index];
+ DWORD len;
if(!doc->frame)
return;
- if(!p)
- {
- DWORD len = 255;
+ if(!p) {
+ len = 255;
p = heap_alloc(len * sizeof(WCHAR));
- len = LoadStringW(hInst, id, p, len);
- len++;
+ len = LoadStringW(hInst, id, p, len) + 1;
p = heap_realloc(p, len * sizeof(WCHAR));
- if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL))
- {
+ if(InterlockedCompareExchangePointer((void**)&status_strings[index], p, NULL)) {
heap_free(p);
p = status_strings[index];
}
}
- if(arg)
- {
- DWORD len = lstrlenW(p) + lstrlenW(arg) - 1;
- LPWSTR buf = heap_alloc(len * sizeof(WCHAR));
+ if(arg) {
+ WCHAR *buf;
+
+ len = lstrlenW(p) + lstrlenW(arg) - 1;
+ buf = heap_alloc(len * sizeof(WCHAR));
snprintfW(buf, len, p, arg);
diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h
index a798760..836d667 100644
--- a/dlls/mshtml/resource.h
+++ b/dlls/mshtml/resource.h
@@ -23,9 +23,10 @@
#define IDS_HTMLDISABLED 7500
#define IDS_HTMLDOCUMENT 7501
-#define NUM_STATUS_STRINGS 2
-#define IDS_STATUS_DOWNLOADINGFROM 7550
-#define IDS_STATUS_DONE 7551
+#define IDS_STATUS_FIRST 7550
+#define IDS_STATUS_DOWNLOADINGFROM IDS_STATUS_FIRST
+#define IDS_STATUS_DONE (IDS_STATUS_FIRST+1)
+#define IDS_STATUS_LAST IDS_STATUS_DONE
#define ID_PROMPT_DIALOG 7700
#define ID_PROMPT_PROMPT 7701
More information about the wine-cvs
mailing list