February 2007 - Wine-commits

Jacek Caban : hhctrl.ocx: Use wrappers of memory allocation functions.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 07ba45775cc071b325208922d234cb0bdb09db9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ba45775cc071b325208922d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 22:49:13 2007 +0100 hhctrl.ocx: Use wrappers of memory allocation functions. --- dlls/hhctrl.ocx/chm.c | 6 ++-- dlls/hhctrl.ocx/help.c | 44 +++++++++++++++++++++--------------------- dlls/hhctrl.ocx/hhctrl.c | 8 +++--- dlls/hhctrl.ocx/hhctrl.h | 24 +++++++++++++++++++++- dlls/hhctrl.ocx/webbrowser.c | 7 ++--- 5 files changed, 55 insertions(+), 34 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 3e105b0..2fad67c 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -36,7 +36,7 @@ static LPWSTR CHM_ReadString(CHMInfo *pChmInfo, DWORD dwOffset) static const WCHAR stringsW[] = {'#','S','T','R','I','N','G','S',0}; dwSize = CB_READ_BLOCK; - szString = HeapAlloc(GetProcessHeap(), 0, dwSize); + szString = hhctrl_alloc(dwSize); if (FAILED(IStorage_OpenStream(pStorage, stringsW, NULL, STGM_READ, 0, &pStream))) return NULL; @@ -59,13 +59,13 @@ static LPWSTR CHM_ReadString(CHMInfo *pChmInfo, DWORD dwOffset) if (!szString[iPos]) { stringW = strdupAtoW(szString); - HeapFree(GetProcessHeap(), 0, szString); + hhctrl_free(szString); return stringW; } } dwSize *= 2; - szString = HeapReAlloc(GetProcessHeap(), 0, szString, dwSize); + szString = hhctrl_realloc(szString, dwSize); szString += cbRead; } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 39d750b..cfb4b90 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -66,7 +66,7 @@ static LPWSTR HH_LoadString(DWORD dwID) iSize = LoadStringW(hhctrl_hinstance, dwID, NULL, 0); iSize += 2; /* some strings (tab text) needs double-null termination */ - string = HeapAlloc(GetProcessHeap(), 0, iSize * sizeof(WCHAR)); + string = hhctrl_alloc(iSize * sizeof(WCHAR)); LoadStringW(hhctrl_hinstance, dwID, string, iSize); return string; @@ -457,7 +457,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) szBuf[dwLen + 2] = 0; /* Double-null terminate */ buttons[dwIndex].iString = (DWORD)SendMessageW(hToolbar, TB_ADDSTRINGW, 0, (LPARAM)szBuf); - HeapFree(GetProcessHeap(), 0, szBuf); + hhctrl_free(szBuf); } SendMessageW(hToolbar, TB_ADDBUTTONSW, dwNumButtons, (LPARAM)&buttons); @@ -504,7 +504,7 @@ static void NP_CreateTab(HINSTANCE hInstance, HWND hwndTabCtrl, DWORD dwStrID, D tie.pszText = tabText; SendMessageW( hwndTabCtrl, TCM_INSERTITEMW, dwIndex, (LPARAM)&tie ); - HeapFree(GetProcessHeap(), 0, tabText); + hhctrl_free(tabText); } static BOOL HH_AddNavigationPane(HHInfo *pHHInfo) @@ -782,11 +782,11 @@ static BOOL HH_CreateViewer(HHInfo *pHHInfo) static HHInfo *HH_OpenHH(HINSTANCE hInstance, LPWSTR szCmdLine) { - HHInfo *pHHInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HHInfo)); + HHInfo *pHHInfo = hhctrl_alloc_zero(sizeof(HHInfo)); - pHHInfo->pHHWinType = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HH_WINTYPEW)); - pHHInfo->pCHMInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(CHMInfo)); - pHHInfo->pWBInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(WBInfo)); + pHHInfo->pHHWinType = hhctrl_alloc_zero(sizeof(HH_WINTYPEW)); + pHHInfo->pCHMInfo = hhctrl_alloc(sizeof(CHMInfo)); + pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo)); pHHInfo->hInstance = hInstance; pHHInfo->szCmdLine = szCmdLine; @@ -801,31 +801,31 @@ static void HH_Close(HHInfo *pHHInfo) /* Free allocated strings */ if (pHHInfo->pHHWinType) { - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszType); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszCaption); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszToc); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszIndex); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszFile); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszHome); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszJump1); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszJump2); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszUrlJump1); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszUrlJump2); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszType); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszCaption); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszToc); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszIndex); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszFile); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszHome); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszJump1); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszJump2); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszUrlJump1); + hhctrl_free((LPWSTR)pHHInfo->pHHWinType->pszUrlJump2); } - HeapFree(GetProcessHeap(), 0, pHHInfo->pHHWinType); - HeapFree(GetProcessHeap(), 0, pHHInfo->szCmdLine); + hhctrl_free(pHHInfo->pHHWinType); + hhctrl_free(pHHInfo->szCmdLine); if (pHHInfo->pCHMInfo) { CHM_CloseCHM(pHHInfo->pCHMInfo); - HeapFree(GetProcessHeap(), 0, pHHInfo->pCHMInfo); + hhctrl_free(pHHInfo->pCHMInfo); } if (pHHInfo->pWBInfo) { WB_UnEmbedBrowser(pHHInfo->pWBInfo); - HeapFree(GetProcessHeap(), 0, pHHInfo->pWBInfo); + hhctrl_free(pHHInfo->pWBInfo); } } @@ -865,7 +865,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) } HH_Close(pHHInfo); - HeapFree(GetProcessHeap(), 0, pHHInfo); + hhctrl_free(pHHInfo); OleUninitialize(); return 0; diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 445438d..18e769f 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -97,7 +97,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) { DWORD len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); - file = HeapAlloc( GetProcessHeap(), 0, len ); + file = hhctrl_alloc(len); WideCharToMultiByte( CP_ACP, 0, filename, -1, file, len, NULL, NULL ); } @@ -113,7 +113,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD data) default: FIXME("HH case %s not handled.\n", command_to_string( command )); } - HeapFree(GetProcessHeap(), 0, file); + hhctrl_free(file); return 0; } @@ -126,12 +126,12 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD data) { DWORD len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 ); - wfile = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR)); + wfile = hhctrl_alloc(len*sizeof(WCHAR)); MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len ); } result = HtmlHelpW( caller, wfile, command, data ); - HeapFree( GetProcessHeap(), 0, wfile ); + hhctrl_free(wfile); return result; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 367564b..4257687 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -70,6 +70,28 @@ BOOL CHM_OpenCHM(CHMInfo *pCHMInfo, LPCWSTR szFile); BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); void CHM_CloseCHM(CHMInfo *pCHMInfo); +/* memory allocation functions */ + +static inline void *hhctrl_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *hhctrl_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void *hhctrl_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline BOOL hhctrl_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + static inline LPWSTR strdupAtoW(LPCSTR str) { LPWSTR ret; @@ -79,7 +101,7 @@ static inline LPWSTR strdupAtoW(LPCSTR str) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + ret = hhctrl_alloc(len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index 4babc64..bf3b65b 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE Site_Release(IOleClientSite *iface) if (refCount) return refCount; - HeapFree(GetProcessHeap(), 0, This); + hhctrl_free(This); return 0; } @@ -579,8 +579,7 @@ BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent) /* clear out struct to keep from accessing invalid ptrs */ ZeroMemory(pWBInfo, sizeof(WBInfo)); - iOleClientSiteImpl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IOleClientSiteImpl)); + iOleClientSiteImpl = hhctrl_alloc_zero(sizeof(IOleClientSiteImpl)); if (!iOleClientSiteImpl) return FALSE; @@ -631,7 +630,7 @@ BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent) error: WB_UnEmbedBrowser(pWBInfo); - HeapFree(GetProcessHeap(), 0, iOleClientSiteImpl); + hhctrl_free(iOleClientSiteImpl); return FALSE; }

1 0

Jacek Caban : hhctrl.ocx: Rewrite reading strings from #STRINGS section.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: e717dcc8fab3ba5e4a268371df34070018708274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e717dcc8fab3ba5e4a268371d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 22:51:36 2007 +0100 hhctrl.ocx: Rewrite reading strings from #STRINGS section. --- dlls/hhctrl.ocx/chm.c | 123 +++++++++++++++++++++++++++------------------- dlls/hhctrl.ocx/hhctrl.h | 9 +++ 2 files changed, 82 insertions(+), 50 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 2fad67c..9fc98c6 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -2,6 +2,7 @@ * CHM Utility API * * Copyright 2005 James Hawkins + * Copyright 2007 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,57 +21,55 @@ #include "hhctrl.h" -/* Reads a string from the #STRINGS section in the CHM file */ -static LPWSTR CHM_ReadString(CHMInfo *pChmInfo, DWORD dwOffset) -{ - LARGE_INTEGER liOffset; - IStorage *pStorage = pChmInfo->pStorage; - IStream *pStream; - DWORD cbRead; - ULONG iPos; - DWORD dwSize; - LPSTR szString; - LPWSTR stringW; - - const int CB_READ_BLOCK = 64; - static const WCHAR stringsW[] = {'#','S','T','R','I','N','G','S',0}; +#include "wine/debug.h" - dwSize = CB_READ_BLOCK; - szString = hhctrl_alloc(dwSize); +WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); - if (FAILED(IStorage_OpenStream(pStorage, stringsW, NULL, STGM_READ, 0, &pStream))) - return NULL; +#define BLOCK_BITS 12 +#define BLOCK_SIZE (1 << BLOCK_BITS) +#define BLOCK_MASK (BLOCK_SIZE-1) - liOffset.QuadPart = dwOffset; - - if (FAILED(IStream_Seek(pStream, liOffset, STREAM_SEEK_SET, NULL))) - { - IStream_Release(pStream); +/* Reads a string from the #STRINGS section in the CHM file */ +static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) +{ + if(!chm->strings_stream) return NULL; + + if(chm->strings_size <= (offset >> BLOCK_BITS)) { + if(chm->strings) + chm->strings = hhctrl_realloc_zero(chm->strings, + chm->strings_size = ((offset >> BLOCK_BITS)+1)*sizeof(char*)); + else + chm->strings = hhctrl_alloc_zero( + chm->strings_size = ((offset >> BLOCK_BITS)+1)*sizeof(char*)); + } - while (SUCCEEDED(IStream_Read(pStream, szString, CB_READ_BLOCK, &cbRead))) - { - if (!cbRead) - return NULL; + if(!chm->strings[offset >> BLOCK_BITS]) { + LARGE_INTEGER pos; + DWORD read; + HRESULT hres; - for (iPos = 0; iPos < cbRead; iPos++) - { - if (!szString[iPos]) - { - stringW = strdupAtoW(szString); - hhctrl_free(szString); - return stringW; - } + pos.QuadPart = offset & ~BLOCK_MASK; + hres = IStream_Seek(chm->strings_stream, pos, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) { + WARN("Seek failed: %08x\n", hres); + return NULL; } - dwSize *= 2; - szString = hhctrl_realloc(szString, dwSize); - szString += cbRead; + chm->strings[offset >> BLOCK_BITS] = hhctrl_alloc(BLOCK_SIZE); + + hres = IStream_Read(chm->strings_stream, chm->strings[offset >> BLOCK_BITS], + BLOCK_SIZE, &read); + if(FAILED(hres)) { + WARN("Read failed: %08x\n", hres); + hhctrl_free(chm->strings[offset >> BLOCK_BITS]); + chm->strings[offset >> BLOCK_BITS] = NULL; + return NULL; + } } - /* didn't find a string */ - return NULL; + return chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); } /* Loads the HH_WINTYPE data from the CHM file @@ -103,16 +102,16 @@ BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) if (FAILED(hr)) goto done; /* convert the #STRINGS offsets to actual strings */ - pHHWinType->pszType = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszType); - pHHWinType->pszCaption = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszCaption); - pHHWinType->pszToc = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszToc); - pHHWinType->pszIndex = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszIndex); - pHHWinType->pszFile = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszFile); - pHHWinType->pszHome = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszHome); - pHHWinType->pszJump1 = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszJump1); - pHHWinType->pszJump2 = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszJump2); - pHHWinType->pszUrlJump1 = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszUrlJump1); - pHHWinType->pszUrlJump2 = CHM_ReadString(pChmInfo, (DWORD)pHHWinType->pszUrlJump2); + pHHWinType->pszType = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszType)); + pHHWinType->pszCaption = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszCaption)); + pHHWinType->pszToc = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszToc)); + pHHWinType->pszIndex = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszIndex)); + pHHWinType->pszFile = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszFile)); + pHHWinType->pszHome = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszHome)); + pHHWinType->pszJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump1)); + pHHWinType->pszJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump2)); + pHHWinType->pszUrlJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump1)); + pHHWinType->pszUrlJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump2)); /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case @@ -130,6 +129,10 @@ done: /* Opens the CHM file for reading */ BOOL CHM_OpenCHM(CHMInfo *pChmInfo, LPCWSTR szFile) { + HRESULT hres; + + static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; + pChmInfo->szFile = szFile; if (FAILED(CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, @@ -141,6 +144,16 @@ BOOL CHM_OpenCHM(CHMInfo *pChmInfo, LPCWSTR szFile) NULL, 0, &pChmInfo->pStorage))) return FALSE; + hres = IStorage_OpenStream(pChmInfo->pStorage, wszSTRINGS, NULL, STGM_READ, 0, + &pChmInfo->strings_stream); + if(FAILED(hres)) { + WARN("Could not open #STRINGS stream: %08x\n", hres); + return FALSE; + } + + pChmInfo->strings = NULL; + pChmInfo->strings_size = 0; + return TRUE; } @@ -148,4 +161,14 @@ void CHM_CloseCHM(CHMInfo *pCHMInfo) { IITStorage_Release(pCHMInfo->pITStorage); IStorage_Release(pCHMInfo->pStorage); + IStream_Release(pCHMInfo->strings_stream); + + if(pCHMInfo->strings_size) { + int i; + + for(i=0; i<pCHMInfo->strings_size; i++) + hhctrl_free(pCHMInfo->strings[i]); + } + + hhctrl_free(pCHMInfo->strings); } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 4257687..355fc02 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -50,6 +50,10 @@ typedef struct CHMInfo IITStorage *pITStorage; IStorage *pStorage; LPCWSTR szFile; + + IStream *strings_stream; + char **strings; + DWORD strings_size; } CHMInfo; @@ -87,6 +91,11 @@ static inline void *hhctrl_realloc(void *mem, size_t len) return HeapReAlloc(GetProcessHeap(), 0, mem, len); } +static inline void *hhctrl_realloc_zero(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); +} + static inline BOOL hhctrl_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0

Jacek Caban : hhctrl.ocx: Merge chm.h and webbrowser.h to hhctrl.h.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 6e72b2614acea08aad579f38d796d36fa7028638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e72b2614acea08aad579f38d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 22:45:16 2007 +0100 hhctrl.ocx: Merge chm.h and webbrowser.h to hhctrl.h. --- dlls/hhctrl.ocx/chm.c | 15 +-------- dlls/hhctrl.ocx/chm.h | 37 --------------------- dlls/hhctrl.ocx/help.c | 13 +------- dlls/hhctrl.ocx/hhctrl.c | 11 ++---- dlls/hhctrl.ocx/{webbrowser.h => hhctrl.h} | 49 +++++++++++++++++++++------- dlls/hhctrl.ocx/webbrowser.c | 12 +------ 6 files changed, 43 insertions(+), 94 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 2c2f8e7..c59fd71 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "ole2.h" -#include "htmlhelp.h" - -#include "initguid.h" -#include "chm.h" +#include "hhctrl.h" static LPWSTR CHM_ANSIToUnicode(LPCSTR ansi) { diff --git a/dlls/hhctrl.ocx/chm.h b/dlls/hhctrl.ocx/chm.h deleted file mode 100644 index 72f7e81..0000000 --- a/dlls/hhctrl.ocx/chm.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * CHM Utility API - * - * Copyright 2005 James Hawkins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef CHM_H -#define CHM_H - -#include "wine/itss.h" - -typedef struct CHMInfo -{ - IITStorage *pITStorage; - IStorage *pStorage; - LPCWSTR szFile; -} CHMInfo; - -BOOL CHM_OpenCHM(CHMInfo *pCHMInfo, LPCWSTR szFile); -BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); -void CHM_CloseCHM(CHMInfo *pCHMInfo); - -#endif diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 15b023d..beb6285 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -18,27 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "hhctrl.h" -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" #include "wingdi.h" -#include "winuser.h" -#include "winnls.h" #include "commctrl.h" -#include "htmlhelp.h" -#include "ole2.h" -#include "exdisp.h" #include "wininet.h" #include "wine/unicode.h" #include "wine/debug.h" #include "resource.h" -#include "chm.h" -#include "webbrowser.h" WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index be9f597..2881da0 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -18,15 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "winuser.h" #include "wine/debug.h" -#include "htmlhelp.h" + +#define INIT_GUID +#include "hhctrl.h" WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); diff --git a/dlls/hhctrl.ocx/webbrowser.h b/dlls/hhctrl.ocx/hhctrl.h similarity index 63% rename from dlls/hhctrl.ocx/webbrowser.h rename to dlls/hhctrl.ocx/hhctrl.h index c17274f..17e5ac8 100644 --- a/dlls/hhctrl.ocx/webbrowser.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -1,6 +1,4 @@ /* - * WebBrowser Include - * * Copyright 2005 James Hawkins * * This library is free software; you can redistribute it and/or @@ -18,19 +16,42 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_WEBBROWSER_H -#define __WINE_WEBBROWSER_H +#ifndef HHCTRL_H +#define HHCTRL_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" +#include "htmlhelp.h" +#include "ole2.h" #include "exdisp.h" -#include "mshtml.h" #include "mshtmhst.h" -#define WB_GOBACK 0 -#define WB_GOFORWARD 1 -#define WB_GOHOME 2 -#define WB_SEARCH 3 -#define WB_REFRESH 4 -#define WB_STOP 5 +#ifdef INIT_GUID +#include "initguid.h" +#endif + +#include "wine/itss.h" + +#define WB_GOBACK 0 +#define WB_GOFORWARD 1 +#define WB_GOHOME 2 +#define WB_SEARCH 3 +#define WB_REFRESH 4 +#define WB_STOP 5 + +typedef struct CHMInfo +{ + IITStorage *pITStorage; + IStorage *pStorage; + LPCWSTR szFile; +} CHMInfo; + typedef struct WBInfo { @@ -45,4 +66,8 @@ void WB_UnEmbedBrowser(WBInfo *pWBInfo); void WB_ResizeBrowser(WBInfo *pWBInfo, DWORD dwWidth, DWORD dwHeight); void WB_DoPageAction(WBInfo *pWBInfo, DWORD dwAction); -#endif /* __WINE_WEBBROWSER_H */ +BOOL CHM_OpenCHM(CHMInfo *pCHMInfo, LPCWSTR szFile); +BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); +void CHM_CloseCHM(CHMInfo *pCHMInfo); + +#endif diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index 20572de..4babc64 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" -#include "ole2.h" - -#include "webbrowser.h" +#include "hhctrl.h" #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))

1 0

Jacek Caban : hhctrl.ocx: Declare strdupAtoW in hhctrl. h and use it instead of duplicated *ANSIToUnicode.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 9a20d35cc8952a120ae146fbe35c23d0bc0580eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a20d35cc8952a120ae146fbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 22:47:21 2007 +0100 hhctrl.ocx: Declare strdupAtoW in hhctrl.h and use it instead of duplicated *ANSIToUnicode. --- dlls/hhctrl.ocx/chm.c | 14 +------------- dlls/hhctrl.ocx/help.c | 14 +------------- dlls/hhctrl.ocx/hhctrl.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index c59fd71..3e105b0 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -20,18 +20,6 @@ #include "hhctrl.h" -static LPWSTR CHM_ANSIToUnicode(LPCSTR ansi) -{ - LPWSTR unicode; - int count; - - count = MultiByteToWideChar(CP_ACP, 0, ansi, -1, NULL, 0); - unicode = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ansi, -1, unicode, count); - - return unicode; -} - /* Reads a string from the #STRINGS section in the CHM file */ static LPWSTR CHM_ReadString(CHMInfo *pChmInfo, DWORD dwOffset) { @@ -70,7 +58,7 @@ static LPWSTR CHM_ReadString(CHMInfo *pChmInfo, DWORD dwOffset) { if (!szString[iPos]) { - stringW = CHM_ANSIToUnicode(szString); + stringW = strdupAtoW(szString); HeapFree(GetProcessHeap(), 0, szString); return stringW; } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index beb6285..39d750b 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -57,18 +57,6 @@ typedef struct tagHHInfo extern HINSTANCE hhctrl_hinstance; -static LPWSTR HH_ANSIToUnicode(LPCSTR ansi) -{ - LPWSTR unicode; - int count; - - count = MultiByteToWideChar(CP_ACP, 0, ansi, -1, NULL, 0); - unicode = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ansi, -1, unicode, count); - - return unicode; -} - /* Loads a string from the resource file */ static LPWSTR HH_LoadString(DWORD dwID) { @@ -861,7 +849,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) if (FAILED(OleInitialize(NULL))) return -1; - pHHInfo = HH_OpenHH(hInstance, HH_ANSIToUnicode(szCmdLine)); + pHHInfo = HH_OpenHH(hInstance, strdupAtoW(szCmdLine)); if (!pHHInfo || !HH_OpenCHM(pHHInfo) || !HH_CreateViewer(pHHInfo)) { OleUninitialize(); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 17e5ac8..367564b 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -70,4 +70,19 @@ BOOL CHM_OpenCHM(CHMInfo *pCHMInfo, LPCWSTR szFile); BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); void CHM_CloseCHM(CHMInfo *pCHMInfo); +static inline LPWSTR strdupAtoW(LPCSTR str) +{ + LPWSTR ret; + DWORD len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #endif

1 0

Jan Zerebecki : comctl32: Add DebugInfo to critical section.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: fa86532354a49f9fb43c357d7f11911b95fb8102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa86532354a49f9fb43c357d7… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Feb 23 09:26:17 2007 +0100 comctl32: Add DebugInfo to critical section. --- dlls/comctl32/animate.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 6949213..5089549 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -803,6 +803,7 @@ static BOOL ANIMATE_Create(HWND hWnd, LPCREATESTRUCTW lpcs) TRACE("Animate style=0x%08x, parent=%p\n", infoPtr->dwStyle, infoPtr->hwndNotify); InitializeCriticalSection(&infoPtr->cs); + infoPtr->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ANIMATE_INFO*->cs"); return TRUE; } @@ -816,6 +817,7 @@ static LRESULT ANIMATE_Destroy(ANIMATE_INFO *infoPtr) /* free animate info data */ SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); + infoPtr->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&infoPtr->cs); Free(infoPtr);

1 0

Detlef Riekenberg : serialui: Fix return type for drvGetDefaultCommConfig.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 59e816d82ca6aa90fcd442a61db6c384fe6ba5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e816d82ca6aa90fcd442a61… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 22 21:15:23 2007 +0100 serialui: Fix return type for drvGetDefaultCommConfig. --- dlls/serialui/confdlg.c | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index f9f306b..4be0317 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -49,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); static HMODULE SERIALUI_hModule; +static const WCHAR comW[] = {'c','o','m',0 }; + /*********************************************************************** * DllMain [Internal] Initializes the internal 'SERIALUI.DLL'. * @@ -535,7 +537,7 @@ BOOL WINAPI drvSetDefaultCommConfigA( * FIXME: uses the wrong registry key... should use a digit, not * the comm port name. */ -BOOL WINAPI drvGetDefaultCommConfigW( +DWORD WINAPI drvGetDefaultCommConfigW( LPCWSTR lpszDevice, LPCOMMCONFIG lpCommConfig, LPDWORD lpdwSize) { HKEY hKeyReg, hKeyPort; @@ -543,16 +545,25 @@ BOOL WINAPI drvGetDefaultCommConfigW( DWORD r,dwSize,dwType; static const WCHAR fmt[] = {'%','s','\\','%','s',0 }; - TRACE("%p %p %p\n",lpszDevice,lpCommConfig,lpdwSize); + TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); - if(!lpCommConfig) - return FALSE; + if ((!lpszDevice) || (!lpCommConfig) || (!lpdwSize)) { + return ERROR_INVALID_PARAMETER; + } - if(!lpdwSize) - return FALSE; + if (*lpdwSize < sizeof (COMMCONFIG)) { + *lpdwSize = sizeof (COMMCONFIG); + return ERROR_INSUFFICIENT_BUFFER; + } - if(*lpdwSize < sizeof (COMMCONFIG)) - return FALSE; + /* only "com1" - "com9" is allowed */ + r = sizeof(comW) / sizeof(WCHAR); /* len of "com\0" */ + lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ + r--; + if( lstrcmpW(szKeyName, comW) || + (lpszDevice[r] < '1') || (lpszDevice[r] > '9') || lpszDevice[r+1]) { + return ERROR_BADKEY; + } *lpdwSize = sizeof (COMMCONFIG); memset(lpCommConfig, 0 , sizeof (COMMCONFIG)); @@ -560,8 +571,7 @@ BOOL WINAPI drvGetDefaultCommConfigW( lpCommConfig->wVersion = 1; r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); - if(r != ERROR_SUCCESS) - return FALSE; + if(r != ERROR_SUCCESS) return r; snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); @@ -571,12 +581,13 @@ BOOL WINAPI drvGetDefaultCommConfigW( dwType = 0; r = RegQueryValueExW( hKeyPort, lpszDCB, NULL, &dwType, (LPBYTE)&lpCommConfig->dcb, &dwSize); - if ((r==ERROR_SUCCESS) && (dwType != REG_BINARY)) - r = 1; - if ((r==ERROR_SUCCESS) && (dwSize != sizeof(DCB))) - r = 1; RegCloseKey(hKeyPort); + if ((r!=ERROR_SUCCESS) || (dwType != REG_BINARY) || (dwSize != sizeof(DCB))) { + RegCloseKey(hKeyReg); + return ERROR_INVALID_PARAMETER; + } + } else { @@ -589,22 +600,22 @@ BOOL WINAPI drvGetDefaultCommConfigW( lpCommConfig->dcb.ByteSize = 8; lpCommConfig->dcb.Parity = NOPARITY; lpCommConfig->dcb.StopBits = ONESTOPBIT; - return TRUE; + return ERROR_SUCCESS; } RegCloseKey(hKeyReg); - return (r==ERROR_SUCCESS); + return r; } /*********************************************************************** * drvGetDefaultCommConfigA (SERIALUI.@) */ -BOOL WINAPI drvGetDefaultCommConfigA( +DWORD WINAPI drvGetDefaultCommConfigA( LPCSTR lpszDevice, LPCOMMCONFIG lpCommConfig, LPDWORD lpdwSize) { LPWSTR strW = SERIALUI_strdup( lpszDevice ); - BOOL r = drvGetDefaultCommConfigW( strW, lpCommConfig, lpdwSize ); + DWORD r = drvGetDefaultCommConfigW( strW, lpCommConfig, lpdwSize ); SERIALUI_strfree( strW ); return r; }

1 0

Detlef Riekenberg : serialui/tests: Add initial tests.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 8650c570a39c8a9202fe32f787680d05d9789d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8650c570a39c8a9202fe32f78… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 22 21:15:29 2007 +0100 serialui/tests: Add initial tests. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/serialui/tests/Makefile.in | 13 ++ dlls/serialui/tests/confdlg.c | 271 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 298 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8650c570a39c8a9202fe3…

1 0

Jan Zerebecki : cmd: Remove redundant const.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 2dd35ac53b86f8273eef51ab4b210e544a8aa02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd35ac53b86f8273eef51ab4… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Feb 23 09:25:00 2007 +0100 cmd: Remove redundant const. --- programs/cmd/batch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 2044e28..1a9d9e1 100755 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -437,7 +437,7 @@ void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext) void WCMD_HandleTildaModifiers(char **start, char *forVariable) { #define NUMMODIFIERS 11 - const char const validmodifiers[NUMMODIFIERS] = { + const char validmodifiers[NUMMODIFIERS] = { '~', 'f', 'd', 'p', 'n', 'x', 's', 'a', 't', 'z', '$' };

1 0

Jan Zerebecki : winex11.drv: Set the refresh rate for NoRes to 60 instead of 0.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 85d9b0249f799f44f83cd0c277eaaf822b8c2196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d9b0249f799f44f83cd0c27… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Feb 23 09:26:33 2007 +0100 winex11.drv: Set the refresh rate for NoRes to 60 instead of 0. --- dlls/winex11.drv/settings.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 1965e05..fd4671a 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -156,7 +156,7 @@ void X11DRV_Settings_Init(void) X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode, 1, 0); - X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 0); + X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); } /***********************************************************************

1 0

Jan Zerebecki : wined3d: Make CreateFakeGLContext thread safe.
by Alexandre Julliard 23 Feb '07

23 Feb '07

Module: wine Branch: master Commit: 706bc26a69e122deeaa22b4677df60a8eaac1b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706bc26a69e122deeaa22b467… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Fri Feb 23 09:24:45 2007 +0100 wined3d: Make CreateFakeGLContext thread safe. --- dlls/wined3d/directx.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 841e16f..653c183 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -78,11 +78,24 @@ static BOOL wined3d_fake_gl_context_foreign; static BOOL wined3d_fake_gl_context_available = FALSE; static Display* wined3d_fake_gl_context_display = NULL; +static CRITICAL_SECTION wined3d_fake_gl_context_cs; +static CRITICAL_SECTION_DEBUG wined3d_fake_gl_context_cs_debug = +{ + 0, 0, &wined3d_fake_gl_context_cs, + { &wined3d_fake_gl_context_cs_debug.ProcessLocksList, + &wined3d_fake_gl_context_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": wined3d_fake_gl_context_cs") } +}; +static CRITICAL_SECTION wined3d_fake_gl_context_cs = { &wined3d_fake_gl_context_cs_debug, -1, 0, 0, 0, 0 }; + static void WineD3D_ReleaseFakeGLContext(void) { GLXContext glCtx; + EnterCriticalSection(&wined3d_fake_gl_context_cs); + if(!wined3d_fake_gl_context_available) { TRACE_(d3d_caps)("context not available\n"); + LeaveCriticalSection(&wined3d_fake_gl_context_cs); return; } @@ -95,17 +108,21 @@ static void WineD3D_ReleaseFakeGLContext(void) { glXMakeCurrent(wined3d_fake_gl_context_display, None, NULL); glXDestroyContext(wined3d_fake_gl_context_display, glCtx); } - LEAVE_GL(); wined3d_fake_gl_context_available = FALSE; } assert(wined3d_fake_gl_context_ref >= 0); + LeaveCriticalSection(&wined3d_fake_gl_context_cs); + LEAVE_GL(); } static BOOL WineD3D_CreateFakeGLContext(void) { XVisualInfo* visInfo; GLXContext glCtx; + ENTER_GL(); + EnterCriticalSection(&wined3d_fake_gl_context_cs); + TRACE_(d3d_caps)("getting context...\n"); if(wined3d_fake_gl_context_ref > 0) goto ret; assert(0 == wined3d_fake_gl_context_ref); @@ -119,8 +136,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { ReleaseDC(0, device_context); } - ENTER_GL(); - visInfo = NULL; glCtx = glXGetCurrentContext(); @@ -170,10 +185,12 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE_(d3d_caps)("incrementing ref from %i\n", wined3d_fake_gl_context_ref); wined3d_fake_gl_context_ref++; wined3d_fake_gl_context_available = TRUE; + LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE; fail: if(visInfo) XFree(visInfo); if(glCtx) glXDestroyContext(wined3d_fake_gl_context_display, glCtx); + LeaveCriticalSection(&wined3d_fake_gl_context_cs); LEAVE_GL(); return FALSE; }

1 0