February 2007 - Wine-commits

Jacek Caban : hhctrl.ocx: Merge WBInfo to HHInfo.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 24c13b9f8d4eb44825ec9a5a3381b959e4da8252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c13b9f8d4eb44825ec9a5a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:47:13 2007 +0100 hhctrl.ocx: Merge WBInfo to HHInfo. --- dlls/hhctrl.ocx/help.c | 42 ++++++++++----------------------- dlls/hhctrl.ocx/hhctrl.h | 28 +++++++++++++---------- dlls/hhctrl.ocx/webbrowser.c | 51 ++++++++++++++++++----------------------- 3 files changed, 51 insertions(+), 70 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index d1c60a9..8196e4e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -43,16 +43,6 @@ static void Help_OnSize(HWND hWnd); static const WCHAR szEmpty[] = {0}; -typedef struct tagHHInfo -{ - HH_WINTYPEW WinType; - CHMInfo *pCHMInfo; - WBInfo *pWBInfo; - HWND hwndTabCtrl; - HWND hwndSizeBar; - HFONT hFont; -} HHInfo; - /* Loads a string from the resource file */ static LPWSTR HH_LoadString(DWORD dwID) { @@ -68,7 +58,7 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } -static BOOL NavigateToChm(WBInfo *pWBInfo, LPCWSTR file, LPCWSTR index) +static BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) { WCHAR buf[INTERNET_MAX_URL_LENGTH]; WCHAR full_path[MAX_PATH]; @@ -77,7 +67,7 @@ static BOOL NavigateToChm(WBInfo *pWBInfo, LPCWSTR file, LPCWSTR index) static const WCHAR url_format[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0}; - if (!pWBInfo->pWebBrowser2) + if (!info->web_browser) return FALSE; if(!GetFullPathNameW(file, sizeof(full_path), full_path, NULL)) { @@ -90,7 +80,7 @@ static BOOL NavigateToChm(WBInfo *pWBInfo, LPCWSTR file, LPCWSTR index) V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(buf); - IWebBrowser2_Navigate2(pWBInfo->pWebBrowser2, &url, 0, 0, 0, 0); + IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0); VariantClear(&url); return TRUE; @@ -316,24 +306,24 @@ static void HH_RegisterChildWndClass(HHInfo *pHHInfo) static void TB_OnClick(HWND hWnd, DWORD dwID) { - HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); switch (dwID) { case IDTB_STOP: - WB_DoPageAction(pHHInfo->pWBInfo, WB_STOP); + DoPageAction(info, WB_STOP); break; case IDTB_REFRESH: - WB_DoPageAction(pHHInfo->pWBInfo, WB_REFRESH); + DoPageAction(info, WB_REFRESH); break; case IDTB_BACK: - WB_DoPageAction(pHHInfo->pWBInfo, WB_GOBACK); + DoPageAction(info, WB_GOBACK); break; case IDTB_HOME: - NavigateToChm(pHHInfo->pWBInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszHome); + NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszHome); break; case IDTB_FORWARD: - WB_DoPageAction(pHHInfo->pWBInfo, WB_GOFORWARD); + DoPageAction(info, WB_GOFORWARD); break; case IDTB_EXPAND: case IDTB_CONTRACT: @@ -580,7 +570,7 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) if (!hWnd) return FALSE; - if (!WB_EmbedBrowser(pHHInfo->pWBInfo, hWnd)) + if (!InitWebBrowser(pHHInfo, hWnd)) return FALSE; /* store the pointer to the HH info struct */ @@ -623,7 +613,7 @@ static void Help_OnSize(HWND hWnd) /* Resize browser window taking the frame size into account */ dwSize = GetSystemMetrics(SM_CXFRAME); - WB_ResizeBrowser(pHHInfo->pWBInfo, rc.right - dwSize, rc.bottom - dwSize); + ResizeWebBrowser(pHHInfo, rc.right - dwSize, rc.bottom - dwSize); } static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -795,11 +785,7 @@ static void HH_Close(HHInfo *info) if (info->pCHMInfo) CloseCHM(info->pCHMInfo); - if (info->pWBInfo) - { - WB_UnEmbedBrowser(info->pWBInfo); - hhctrl_free(info->pWBInfo); - } + ReleaseWebBrowser(info); } static HHInfo *HH_OpenHH(LPWSTR filename) @@ -812,8 +798,6 @@ static HHInfo *HH_OpenHH(LPWSTR filename) return NULL; } - pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo)); - if (!CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, &pHHInfo->WinType)) { HH_Close(pHHInfo); return NULL; @@ -838,7 +822,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) return -1; } - NavigateToChm(pHHInfo->pWBInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszFile); + NavigateToChm(pHHInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszFile); while (GetMessageW(&msg, 0, 0, 0)) { diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 36cad0d..2c0b71d 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -57,18 +57,22 @@ typedef struct CHMInfo } CHMInfo; -typedef struct WBInfo -{ - IOleClientSite *pOleClientSite; - IWebBrowser2 *pWebBrowser2; - IOleObject *pBrowserObject; - HWND hwndParent; -} WBInfo; - -BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent); -void WB_UnEmbedBrowser(WBInfo *pWBInfo); -void WB_ResizeBrowser(WBInfo *pWBInfo, DWORD dwWidth, DWORD dwHeight); -void WB_DoPageAction(WBInfo *pWBInfo, DWORD dwAction); +typedef struct { + IOleClientSite *client_site; + IWebBrowser2 *web_browser; + IOleObject *wb_object; + + HH_WINTYPEW WinType; + CHMInfo *pCHMInfo; + HWND hwndTabCtrl; + HWND hwndSizeBar; + HFONT hFont; +} HHInfo; + +BOOL InitWebBrowser(HHInfo*,HWND); +void ReleaseWebBrowser(HHInfo*); +void ResizeWebBrowser(HHInfo*,DWORD,DWORD); +void DoPageAction(HHInfo*,DWORD); CHMInfo *OpenCHM(LPCWSTR szFile); BOOL CHM_LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index bf3b65b..dbbb41a 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -567,7 +567,7 @@ static const IStorageVtbl MyIStorageTable = static IStorage MyIStorage = { &MyIStorageTable }; -BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent) +BOOL InitWebBrowser(HHInfo *info, HWND hwndParent) { IOleClientSiteImpl *iOleClientSiteImpl; IOleInPlaceObject *inplace; @@ -576,9 +576,6 @@ BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent) HRESULT hr; RECT rc; - /* clear out struct to keep from accessing invalid ptrs */ - ZeroMemory(pWBInfo, sizeof(WBInfo)); - iOleClientSiteImpl = hhctrl_alloc_zero(sizeof(IOleClientSiteImpl)); if (!iOleClientSiteImpl) return FALSE; @@ -594,8 +591,8 @@ BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent) (IOleClientSite *)iOleClientSiteImpl, &MyIStorage, (void **)&browserObject); - pWBInfo->pOleClientSite = (IOleClientSite *)iOleClientSiteImpl; - pWBInfo->pBrowserObject = browserObject; + info->client_site = (IOleClientSite *)iOleClientSiteImpl; + info->wb_object = browserObject; if (FAILED(hr)) goto error; @@ -622,55 +619,51 @@ BOOL WB_EmbedBrowser(WBInfo *pWBInfo, HWND hwndParent) (void **)&webBrowser2); if (SUCCEEDED(hr)) { - pWBInfo->pWebBrowser2 = webBrowser2; - pWBInfo->hwndParent = hwndParent; - + info->web_browser = webBrowser2; return TRUE; } error: - WB_UnEmbedBrowser(pWBInfo); + ReleaseWebBrowser(info); hhctrl_free(iOleClientSiteImpl); return FALSE; } -void WB_UnEmbedBrowser(WBInfo *pWBInfo) +void ReleaseWebBrowser(HHInfo *info) { - if (pWBInfo->pBrowserObject) + if (info->wb_object) { - IOleObject_Close(pWBInfo->pBrowserObject, OLECLOSE_NOSAVE); - IOleObject_Release(pWBInfo->pBrowserObject); - pWBInfo->pBrowserObject = NULL; + IOleObject_Close(info->wb_object, OLECLOSE_NOSAVE); + IOleObject_Release(info->wb_object); + info->wb_object = NULL; } - if (pWBInfo->pWebBrowser2) + if (info->web_browser) { - IWebBrowser2_Release(pWBInfo->pWebBrowser2); - pWBInfo->pWebBrowser2 = NULL; + IWebBrowser2_Release(info->web_browser); + info->web_browser = NULL; } - if (pWBInfo->pOleClientSite) + if (info->client_site) { - IOleClientSite_Release(pWBInfo->pOleClientSite); - pWBInfo->pOleClientSite = NULL; + IOleClientSite_Release(info->client_site); + info->client_site = NULL; } } -void WB_ResizeBrowser(WBInfo *pWBInfo, DWORD dwWidth, DWORD dwHeight) +void ResizeWebBrowser(HHInfo *info, DWORD dwWidth, DWORD dwHeight) { - IWebBrowser2 *pWebBrowser2 = pWBInfo->pWebBrowser2; - - if (!pWebBrowser2) + if (!info->web_browser) return; - IWebBrowser2_put_Width(pWebBrowser2, dwWidth); - IWebBrowser2_put_Height(pWebBrowser2, dwHeight); + IWebBrowser2_put_Width(info->web_browser, dwWidth); + IWebBrowser2_put_Height(info->web_browser, dwHeight); } -void WB_DoPageAction(WBInfo *pWBInfo, DWORD dwAction) +void DoPageAction(HHInfo *info, DWORD dwAction) { - IWebBrowser2 *pWebBrowser2 = pWBInfo->pWebBrowser2; + IWebBrowser2 *pWebBrowser2 = info->web_browser; if (!pWebBrowser2) return;

1 0

Jacek Caban : hhctrl.ocx: Fixed releasing web browser object.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: bf34ca2d035e475d0822e772c50fefa882a27361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf34ca2d035e475d0822e772c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:48:07 2007 +0100 hhctrl.ocx: Fixed releasing web browser object. --- dlls/hhctrl.ocx/webbrowser.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index dbbb41a..e0238b3 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -580,7 +580,7 @@ BOOL InitWebBrowser(HHInfo *info, HWND hwndParent) if (!iOleClientSiteImpl) return FALSE; - iOleClientSiteImpl->ref = 0; + iOleClientSiteImpl->ref = 1; iOleClientSiteImpl->lpVtbl = &MyIOleClientSiteTable; iOleClientSiteImpl->lpvtblOleInPlaceSite = &MyIOleInPlaceSiteTable; iOleClientSiteImpl->lpvtblOleInPlaceFrame = &MyIOleInPlaceFrameTable; @@ -632,12 +632,7 @@ error: void ReleaseWebBrowser(HHInfo *info) { - if (info->wb_object) - { - IOleObject_Close(info->wb_object, OLECLOSE_NOSAVE); - IOleObject_Release(info->wb_object); - info->wb_object = NULL; - } + HRESULT hres; if (info->web_browser) { @@ -650,6 +645,21 @@ void ReleaseWebBrowser(HHInfo *info) IOleClientSite_Release(info->client_site); info->client_site = NULL; } + + if(info->wb_object) { + IOleInPlaceSite *inplace; + + hres = IOleObject_QueryInterface(info->wb_object, &IID_IOleInPlaceSite, (void**)&inplace); + if(SUCCEEDED(hres)) { + IOleInPlaceSite_OnInPlaceDeactivate(inplace); + IOleInPlaceSite_Release(inplace); + } + + IOleObject_SetClientSite(info->wb_object, NULL); + + IOleObject_Release(info->wb_object); + info->wb_object = NULL; + } } void ResizeWebBrowser(HHInfo *info, DWORD dwWidth, DWORD dwHeight)

1 0

Jacek Caban : hhctrl.ocx: Move hhctrl_hinstance to hhctrl.h.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: ac2886b516b102687d9e2dab1eb8404317e02d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2886b516b102687d9e2dab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:45:34 2007 +0100 hhctrl.ocx: Move hhctrl_hinstance to hhctrl.h. --- dlls/hhctrl.ocx/help.c | 2 -- dlls/hhctrl.ocx/hhctrl.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index e018c14..7ce5706 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -53,8 +53,6 @@ typedef struct tagHHInfo HFONT hFont; } HHInfo; -extern HINSTANCE hhctrl_hinstance; - /* Loads a string from the resource file */ static LPWSTR HH_LoadString(DWORD dwID) { diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 23803b1..36cad0d 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -116,4 +116,6 @@ static inline LPWSTR strdupAtoW(LPCSTR str) return ret; } +extern HINSTANCE hhctrl_hinstance; + #endif

1 0

Jacek Caban : hhctrl.ocx: Store whole HH_WINTYPEW struct in HHInfo, not its pointer.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 5a01e1020d9fcd0e9cfaf80bb5d1faf608658d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a01e1020d9fcd0e9cfaf80bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 28 03:46:15 2007 +0100 hhctrl.ocx: Store whole HH_WINTYPEW struct in HHInfo, not its pointer. --- dlls/hhctrl.ocx/help.c | 144 +++++++++++++++++++++++------------------------- 1 files changed, 69 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a01e1020d9fcd0e9cfaf…

1 0

Andrew Talbot : winspool.drv: Eliminate some W-to-A cross calls.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 54d578ba2143bc82e161bfbcffb6a75fbae5591b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d578ba2143bc82e161bfbcf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Feb 27 23:06:30 2007 +0000 winspool.drv: Eliminate some W-to-A cross calls. --- dlls/winspool.drv/info.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 891d661..9f07f59 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2822,6 +2822,12 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) HANDLE retval; HKEY hkeyPrinter, hkeyPrinters, hkeyDriver, hkeyDrivers; LONG size; + static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}, + default_devmodeW[] = {'D','e','f','a','u','l','t',' ','D','e','v','M','o','d','e',0}, + priorityW[] = {'P','r','i','o','r','i','t','y',0}, + start_timeW[] = {'S','t','a','r','t','T','i','m','e',0}, + statusW[] = {'S','t','a','t','u','s',0}, + until_timeW[] = {'U','n','t','i','l','T','i','m','e',0}; TRACE("(%s,%d,%p)\n", debugstr_w(pName), Level, pPrinter); @@ -2845,7 +2851,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) return 0; } if(!RegOpenKeyW(hkeyPrinters, pi->pPrinterName, &hkeyPrinter)) { - if (!RegQueryValueA(hkeyPrinter,"Attributes",NULL,NULL)) { + if (!RegQueryValueW(hkeyPrinter, attributesW, NULL, NULL)) { SetLastError(ERROR_PRINTER_ALREADY_EXISTS); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); @@ -2884,7 +2890,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) RegCloseKey(hkeyPrinters); return 0; } - RegSetValueExA(hkeyPrinter, "Attributes", 0, REG_DWORD, + RegSetValueExW(hkeyPrinter, attributesW, 0, REG_DWORD, (LPBYTE)&pi->Attributes, sizeof(DWORD)); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); @@ -2928,7 +2934,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) if (dmW) { dmA = DEVMODEdupWtoA(GetProcessHeap(), dmW); - RegSetValueExA(hkeyPrinter, "Default DevMode", 0, REG_BINARY, + RegSetValueExW(hkeyPrinter, default_devmodeW, 0, REG_BINARY, (LPBYTE)dmA, dmA->dmSize + dmA->dmDriverExtra); HeapFree(GetProcessHeap(), 0, dmA); if(!pi->pDevMode) @@ -2942,16 +2948,16 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, PortW, pi->pPortName); set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - RegSetValueExA(hkeyPrinter, "Priority", 0, REG_DWORD, - (LPBYTE)&pi->Priority, sizeof(DWORD)); + RegSetValueExW(hkeyPrinter, priorityW, 0, REG_DWORD, + (LPBYTE)&pi->Priority, sizeof(DWORD)); set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - RegSetValueExA(hkeyPrinter, "StartTime", 0, REG_DWORD, - (LPBYTE)&pi->StartTime, sizeof(DWORD)); - RegSetValueExA(hkeyPrinter, "Status", 0, REG_DWORD, - (LPBYTE)&pi->Status, sizeof(DWORD)); - RegSetValueExA(hkeyPrinter, "UntilTime", 0, REG_DWORD, - (LPBYTE)&pi->UntilTime, sizeof(DWORD)); + RegSetValueExW(hkeyPrinter, start_timeW, 0, REG_DWORD, + (LPBYTE)&pi->StartTime, sizeof(DWORD)); + RegSetValueExW(hkeyPrinter, statusW, 0, REG_DWORD, + (LPBYTE)&pi->Status, sizeof(DWORD)); + RegSetValueExW(hkeyPrinter, until_timeW, 0, REG_DWORD, + (LPBYTE)&pi->UntilTime, sizeof(DWORD)); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters);

1 0

Misha Koshelev : oleview: Mimick native treeview display of enumerations.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: b2938efbdfed35d180c18aa93b7e434ce01dd20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2938efbdfed35d180c18aa93… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Tue Feb 27 19:37:39 2007 -0600 oleview: Mimick native treeview display of enumerations. --- programs/oleview/typelib.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 779ed26..49568bb 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -95,6 +95,7 @@ static const WCHAR wszDefaultValue[] = { 'd','e','f','a','u','l','t','v','a','l','u','e','\0' }; static const WCHAR wszReadOnly[] = { 'r','e','a','d','o','n','l','y','\0' }; +static const WCHAR wszConst[] = { 'c','o','n','s','t','\0' }; void ShowLastError(void) { @@ -443,6 +444,7 @@ int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) VARDESC *pVarDesc; BSTR bstrName; WCHAR wszText[MAX_LOAD_STRING]; + WCHAR wszAfter[MAX_LOAD_STRING]; U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; @@ -462,7 +464,7 @@ int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) U(tvis).item.lParam = (LPARAM) tld; memset(wszText, 0, sizeof(wszText)); - AddToStrW(wszText, bstrName); + memset(wszAfter, 0, sizeof(wszAfter)); if (pVarDesc->varkind == VAR_CONST) { @@ -470,14 +472,21 @@ int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) VariantInit(&var); if (VariantChangeType(&var, pVarDesc->lpvarValue, 0, VT_BSTR) == S_OK) { + AddToStrW(wszText, wszConst); AddToStrW(wszText, wszSpace); - AddToStrW(wszText, wszEquals); - AddToStrW(wszText, wszSpace); - AddToStrW(wszText, V_BSTR(&var)); + AddToStrW(wszAfter, wszSpace); + AddToStrW(wszAfter, wszEquals); + AddToStrW(wszAfter, wszSpace); + AddToStrW(wszAfter, V_BSTR(&var)); } } - AddToTLDataStrW(tld, wszText); + CreateTypeInfo(wszText, wszAfter, pVarDesc->elemdescVar.tdesc, pTypeInfo); + AddToStrW(wszText, wszSpace); + AddToStrW(wszText, bstrName); + AddToStrW(wszText, wszAfter); + AddToTLDataStrW(tld, bstrName); + AddToTLDataStrW(tld, wszAfter); if (i<cVars-1) AddToTLDataStrW(tld, wszComa); AddToTLDataStrW(tld, wszNewLine);

1 0

H. Verbeet : wined3d: Store multiple constant indices per list entry.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 19d223cadea1956eac0f0f8629c0ce1f7dc7a9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d223cadea1956eac0f0f862… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 27 20:51:58 2007 +0100 wined3d: Store multiple constant indices per list entry. --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++++++++--------- dlls/wined3d/device.c | 18 +++++++++++----- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++++++++-------------- dlls/wined3d/stateblock.c | 6 ++-- dlls/wined3d/wined3d_private.h | 7 +++-- 5 files changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 083c812..e483033 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -50,21 +50,30 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); */ static void shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, WineD3D_GL_Info *gl_info, GLuint target_type, unsigned int max_constants, float* constants, struct list *constant_list) { - constant_entry *constant; + constants_entry *constant; local_constant* lconst; - int i; + DWORD i, j; + DWORD *idx; if (TRACE_ON(d3d_shader)) { - LIST_FOR_EACH_ENTRY(constant, constant_list, constant_entry, entry) { - i = constant->idx; - TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, - constants[i * 4 + 0], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + LIST_FOR_EACH_ENTRY(constant, constant_list, constants_entry, entry) { + idx = constant->idx; + j = constant->count; + while (j--) { + i = *idx++; + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, + constants[i * 4 + 0], constants[i * 4 + 1], + constants[i * 4 + 2], constants[i * 4 + 3]); + } } } - LIST_FOR_EACH_ENTRY(constant, constant_list, constant_entry, entry) { - i = constant->idx; - GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); + LIST_FOR_EACH_ENTRY(constant, constant_list, constants_entry, entry) { + idx = constant->idx; + j = constant->count; + while (j--) { + i = *idx++; + GL_EXTCALL(glProgramEnvParameter4fvARB(target_type, i, constants + (i * 4))); + } } checkGLcall("glProgramEnvParameter4fvARB()"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f73ceb7..94c49fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2958,9 +2958,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShaderConstantF( for (i = start; i < count + start; ++i) { if (!This->updateStateBlock->set.vertexShaderConstantsF[i]) { - constant_entry *ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(constant_entry)); - ptr->idx = i; - list_add_head(&This->updateStateBlock->set_vconstantsF, &ptr->entry); + constants_entry *ptr = LIST_ENTRY(list_head(&This->updateStateBlock->set_vconstantsF), constants_entry, entry); + if (!ptr || ptr->count >= sizeof(ptr->idx) / sizeof(*ptr->idx)) { + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(constants_entry)); + list_add_head(&This->updateStateBlock->set_vconstantsF, &ptr->entry); + } + ptr->idx[ptr->count++] = i; This->updateStateBlock->set.vertexShaderConstantsF[i] = TRUE; } This->updateStateBlock->changed.vertexShaderConstantsF[i] = TRUE; @@ -3238,9 +3241,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShaderConstantF( for (i = start; i < count + start; ++i) { if (!This->updateStateBlock->set.pixelShaderConstantsF[i]) { - constant_entry *ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(constant_entry)); - ptr->idx = i; - list_add_head(&This->updateStateBlock->set_pconstantsF, &ptr->entry); + constants_entry *ptr = LIST_ENTRY(list_head(&This->updateStateBlock->set_pconstantsF), constants_entry, entry); + if (!ptr || ptr->count >= sizeof(ptr->idx) / sizeof(*ptr->idx)) { + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(constants_entry)); + list_add_head(&This->updateStateBlock->set_pconstantsF, &ptr->entry); + } + ptr->idx[ptr->count++] = i; This->updateStateBlock->set.pixelShaderConstantsF[i] = TRUE; } This->updateStateBlock->changed.pixelShaderConstantsF[i] = TRUE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae2bf08..64deb4d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -105,28 +105,37 @@ void shader_glsl_load_psamplers( static void shader_glsl_load_constantsF(IWineD3DBaseShaderImpl* This, WineD3D_GL_Info *gl_info, unsigned int max_constants, float* constants, GLhandleARB *constant_locations, struct list *constant_list) { - constant_entry *constant; + constants_entry *constant; local_constant* lconst; GLhandleARB tmp_loc; - int i; + DWORD i, j; + DWORD *idx; if (TRACE_ON(d3d_shader)) { - LIST_FOR_EACH_ENTRY(constant, constant_list, constant_entry, entry) { - i = constant->idx; - tmp_loc = constant_locations[i]; - if (tmp_loc != -1) { - TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, - constants[i * 4 + 0], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + LIST_FOR_EACH_ENTRY(constant, constant_list, constants_entry, entry) { + idx = constant->idx; + j = constant->count; + while (j--) { + i = *idx++; + tmp_loc = constant_locations[i]; + if (tmp_loc != -1) { + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, + constants[i * 4 + 0], constants[i * 4 + 1], + constants[i * 4 + 2], constants[i * 4 + 3]); + } } } } - LIST_FOR_EACH_ENTRY(constant, constant_list, constant_entry, entry) { - i = constant->idx; - tmp_loc = constant_locations[i]; - if (tmp_loc != -1) { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, constants + (i * 4))); + LIST_FOR_EACH_ENTRY(constant, constant_list, constants_entry, entry) { + idx = constant->idx; + j = constant->count; + while (j--) { + i = *idx++; + tmp_loc = constant_locations[i]; + if (tmp_loc != -1) { + /* We found this uniform name in the program - go ahead and send the data */ + GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, constants + (i * 4))); + } } } checkGLcall("glUniform4fvARB()"); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7622d8e..f9be5e9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -249,7 +249,7 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { TRACE("(%p) : Releasing from %d\n", This, refCount + 1); if (!refCount) { - constant_entry *constant, *constant2; + constants_entry *constant, *constant2; int counter; /* type 0 represents the primary stateblock, so free all the resources */ @@ -284,11 +284,11 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { HeapFree(GetProcessHeap(), 0, This->set.pixelShaderConstantsF); HeapFree(GetProcessHeap(), 0, This->changed.pixelShaderConstantsF); - LIST_FOR_EACH_ENTRY_SAFE(constant, constant2, &This->set_vconstantsF, constant_entry, entry) { + LIST_FOR_EACH_ENTRY_SAFE(constant, constant2, &This->set_vconstantsF, constants_entry, entry) { HeapFree(GetProcessHeap(), 0, constant); } - LIST_FOR_EACH_ENTRY_SAFE(constant, constant2, &This->set_pconstantsF, constant_entry, entry) { + LIST_FOR_EACH_ENTRY_SAFE(constant, constant2, &This->set_pconstantsF, constants_entry, entry) { HeapFree(GetProcessHeap(), 0, constant); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index add82a8..dbb8364 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1194,9 +1194,10 @@ typedef struct SAVEDSTATES { } SAVEDSTATES; typedef struct { - struct list entry; - int idx; -} constant_entry; + struct list entry; + DWORD count; + DWORD idx[13]; +} constants_entry; struct IWineD3DStateBlockImpl {

1 0

H. Verbeet : wined3d: Store GLSL programs in a hash table rather than a linked list.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 2c85e5e8a3998591c89691c524f64c455def019e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c85e5e8a3998591c89691c52… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 27 20:51:53 2007 +0100 wined3d: Store GLSL programs in a hash table rather than a linked list. --- dlls/wined3d/device.c | 82 +------------------------- dlls/wined3d/directx.c | 21 +++++++ dlls/wined3d/glsl_shader.c | 123 ++++++++++++++++++++++----------------- dlls/wined3d/pixelshader.c | 11 +++- dlls/wined3d/vertexshader.c | 11 +++- dlls/wined3d/wined3d_private.h | 22 +++++-- 6 files changed, 128 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c85e5e8a3998591c8969…

1 0

H. Verbeet : wined3d: Boolean constants use up only a single uniform each.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 0170cc429c37c9396da761e8b20678f32da1a084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0170cc429c37c9396da761e8b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 27 20:51:43 2007 +0100 wined3d: Boolean constants use up only a single uniform each. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 58b00d7..095b0e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -285,7 +285,7 @@ void select_shader_max_constants( switch (vs_selected_mode) { case SHADER_GLSL: /* Subtract the other potential uniforms from the max available (bools, ints, and 1 row of projection matrix) */ - gl_info->max_vshader_constantsF = gl_info->vs_glsl_constantsF - MAX_CONST_B - MAX_CONST_I - 1; + gl_info->max_vshader_constantsF = gl_info->vs_glsl_constantsF - (MAX_CONST_B / 4) - MAX_CONST_I - 1; break; case SHADER_ARB: /* We have to subtract any other PARAMs that we might use in our shader programs. @@ -308,7 +308,7 @@ void select_shader_max_constants( * that a sm <= 1.3 shader does not need all the uniforms provided by a glsl-capable card, * and lets not take away a uniform needlessly from all other shaders. */ - gl_info->max_pshader_constantsF = gl_info->ps_glsl_constantsF - MAX_CONST_B - MAX_CONST_I; + gl_info->max_pshader_constantsF = gl_info->ps_glsl_constantsF - (MAX_CONST_B / 4) - MAX_CONST_I; break; case SHADER_ARB: /* The arb shader only loads the bump mapping environment matrix into the shader if it finds

1 0

H. Verbeet : wined3d: Add some hash table code.
by Alexandre Julliard 28 Feb '07

28 Feb '07

Module: wine Branch: master Commit: 2a82ed89b13af91ee660c3464daa2c1bdcaa1224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a82ed89b13af91ee660c3464… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Feb 27 20:51:48 2007 +0100 wined3d: Add some hash table code. --- dlls/wined3d/utils.c | 220 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 30 ++++++ 2 files changed, 249 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 849f915..9b5a8fd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5,7 +5,7 @@ * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber - * Copyright 2006 Henri Verbeet + * Copyright 2006-2007 Henri Verbeet * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2579,3 +2579,221 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4] return TRUE; } #undef GLINFO_LOCATION + +/* Hash table functions */ + +hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function) +{ + hash_table_t *table; + unsigned int initial_size = 8; + + table = HeapAlloc(GetProcessHeap(), 0, sizeof(hash_table_t) + (initial_size * sizeof(struct list))); + if (!table) + { + ERR("Failed to allocate table, returning NULL.\n"); + return NULL; + } + + table->hash_function = hash_function; + table->compare_function = compare_function; + + table->grow_size = initial_size - (initial_size >> 2); + table->shrink_size = 0; + + table->buckets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, initial_size * sizeof(struct list)); + if (!table->buckets) + { + ERR("Failed to allocate table buckets, returning NULL.\n"); + HeapFree(GetProcessHeap(), 0, table); + return NULL; + } + table->bucket_count = initial_size; + + table->entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, table->grow_size * sizeof(hash_table_entry_t)); + if (!table->entries) + { + ERR("Failed to allocate table entries, returning NULL.\n"); + HeapFree(GetProcessHeap(), 0, table->buckets); + HeapFree(GetProcessHeap(), 0, table); + return NULL; + } + table->entry_count = 0; + + list_init(&table->free_entries); + table->count = 0; + + return table; +} + +void hash_table_destroy(hash_table_t *table) +{ + unsigned int i = 0; + + for (i = 0; i < table->entry_count; ++i) + { + HeapFree(GetProcessHeap(), 0, table->entries[i].key); + } + + HeapFree(GetProcessHeap(), 0, table->entries); + HeapFree(GetProcessHeap(), 0, table->buckets); + HeapFree(GetProcessHeap(), 0, table); +} + +static inline hash_table_entry_t *hash_table_get_by_idx(hash_table_t *table, void *key, unsigned int idx) +{ + hash_table_entry_t *entry; + + if (table->buckets[idx].next) + LIST_FOR_EACH_ENTRY(entry, &(table->buckets[idx]), hash_table_entry_t, entry) + if (table->compare_function(entry->key, key)) return entry; + + return NULL; +} + +static BOOL hash_table_resize(hash_table_t *table, unsigned int new_bucket_count) +{ + unsigned int new_entry_count = 0; + hash_table_entry_t *new_entries; + struct list *new_buckets; + unsigned int grow_size = new_bucket_count - (new_bucket_count >> 2); + unsigned int i; + + new_buckets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_bucket_count * sizeof(struct list)); + if (!new_buckets) + { + ERR("Failed to allocate new buckets, returning FALSE.\n"); + return FALSE; + } + + new_entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, grow_size * sizeof(hash_table_entry_t)); + if (!new_entries) + { + ERR("Failed to allocate new entries, returning FALSE.\n"); + HeapFree(GetProcessHeap(), 0, new_buckets); + return FALSE; + } + + for (i = 0; i < table->bucket_count; ++i) + { + if (table->buckets[i].next) + { + hash_table_entry_t *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &table->buckets[i], hash_table_entry_t, entry) + { + int j; + hash_table_entry_t *new_entry = new_entries + (new_entry_count++); + *new_entry = *entry; + + j = new_entry->hash & (new_bucket_count - 1); + + if (!new_buckets[j].next) list_init(&new_buckets[j]); + list_add_head(&new_buckets[j], &new_entry->entry); + } + } + } + + HeapFree(GetProcessHeap(), 0, table->buckets); + table->buckets = new_buckets; + + HeapFree(GetProcessHeap(), 0, table->entries); + table->entries = new_entries; + + table->entry_count = new_entry_count; + list_init(&table->free_entries); + + table->bucket_count = new_bucket_count; + table->grow_size = grow_size; + table->shrink_size = new_bucket_count > 8 ? new_bucket_count >> 2 : 0; + + return TRUE; +} + +void hash_table_put(hash_table_t *table, void *key, void *value) +{ + unsigned int idx; + unsigned int hash; + hash_table_entry_t *entry; + + hash = table->hash_function(key); + idx = hash & (table->bucket_count - 1); + entry = hash_table_get_by_idx(table, key, idx); + + if (entry) + { + HeapFree(GetProcessHeap(), 0, key); + entry->value = value; + + if (!value) + { + HeapFree(GetProcessHeap(), 0, entry->key); + entry->key = NULL; + + /* Remove the entry */ + list_remove(&entry->entry); + list_add_head(&table->free_entries, &entry->entry); + + --table->count; + + /* Shrink if necessary */ + if (table->count < table->shrink_size) { + if (!hash_table_resize(table, table->bucket_count >> 1)) + { + ERR("Failed to shrink the table...\n"); + } + } + } + + return; + } + + if (!value) return; + + /* Grow if necessary */ + if (table->count >= table->grow_size) + { + if (!hash_table_resize(table, table->bucket_count << 1)) + { + ERR("Failed to grow the table, returning.\n"); + return; + } + + idx = hash & (table->bucket_count - 1); + } + + /* Find an entry to insert */ + if (!list_empty(&table->free_entries)) + { + struct list *elem = list_head(&table->free_entries); + + list_remove(elem); + entry = LIST_ENTRY(elem, hash_table_entry_t, entry); + } else { + entry = table->entries + (table->entry_count++); + } + + /* Insert the entry */ + entry->key = key; + entry->value = value; + entry->hash = hash; + if (!table->buckets[idx].next) list_init(&table->buckets[idx]); + list_add_head(&table->buckets[idx], &entry->entry); + + ++table->count; +} + +void hash_table_remove(hash_table_t *table, void *key) +{ + hash_table_put(table, key, NULL); +} + +void *hash_table_get(hash_table_t *table, void *key) +{ + unsigned int idx; + hash_table_entry_t *entry; + + idx = table->hash_function(key) & (table->bucket_count - 1); + entry = hash_table_get_by_idx(table, key, idx); + + return entry ? entry->value : NULL; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e314fd1..c228574 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -44,6 +44,36 @@ #include "wine/wined3d_gl.h" #include "wine/list.h" +/* Hash table functions */ +typedef unsigned int (hash_function_t)(void *key); +typedef BOOL (compare_function_t)(void *keya, void *keyb); + +typedef struct { + void *key; + void *value; + unsigned int hash; + struct list entry; +} hash_table_entry_t; + +typedef struct { + hash_function_t *hash_function; + compare_function_t *compare_function; + struct list *buckets; + unsigned int bucket_count; + hash_table_entry_t *entries; + unsigned int entry_count; + struct list free_entries; + unsigned int count; + unsigned int grow_size; + unsigned int shrink_size; +} hash_table_t; + +hash_table_t *hash_table_create(hash_function_t *hash_function, compare_function_t *compare_function); +void hash_table_destroy(hash_table_t *table); +void *hash_table_get(hash_table_t *table, void *key); +void hash_table_put(hash_table_t *table, void *key, void *value); +void hash_table_remove(hash_table_t *table, void *key); + /* Device caps */ #define MAX_PALETTES 256 #define MAX_STREAMS 16

1 0