September 2010 - Wine-Commits

Hans Leidekker : wuapi: Return success from automatic_updates_Resume.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: a4d7540a4530e9d76e0cd5a3ee47b1d7bfe11d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d7540a4530e9d76e0cd5a3e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:39 2010 +0200 wuapi: Return success from automatic_updates_Resume. --- dlls/wuapi/updates.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 0366ebc..663ff39 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -151,7 +151,7 @@ static HRESULT WINAPI automatic_updates_Resume( IAutomaticUpdates *This ) { FIXME("\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI automatic_updates_ShowSettingsDialog(

1 0

Hans Leidekker : propsys: Add a stub implementation of PSGetPropertyDescription.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 01176ce7db45e2838b6d0711c7d2da98d0a135dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=01176ce7db45e2838b6d0711c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 27 12:18:00 2010 +0200 propsys: Add a stub implementation of PSGetPropertyDescription. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ include/propsys.idl | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 10a1cba..3e99b94 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -79,7 +79,7 @@ @ stub PSGetItemPropertyHandlerWithCreateObject @ stub PSGetNameFromPropertyKey @ stub PSGetNamedPropertyFromPropertyStorage -@ stub PSGetPropertyDescription +@ stdcall PSGetPropertyDescription(ptr ptr ptr) @ stub PSGetPropertyDescriptionByName @ stub PSGetPropertyDescriptionListFromString @ stub PSGetPropertyFromPropertyStorage diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 6c46781..631c49e 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -66,6 +66,12 @@ HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path) return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + FIXME("%p, %p, %p\n", propkey, riid, ppv); + return E_NOTIMPL; +} + HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch) { static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-', diff --git a/include/propsys.idl b/include/propsys.idl index da401c5..ef9ecfc 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -801,6 +801,7 @@ cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") +cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") /* TODO: Add remainder of the C api here */

1 0

Henri Verbeet : wined3d: Set initial stateblock state directly on a wined3d_state structure.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 39886193fd7f60bf8a07e6ef2a5bafa0506550c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39886193fd7f60bf8a07e6ef2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 27 12:07:56 2010 +0200 wined3d: Set initial stateblock state directly on a wined3d_state structure. --- dlls/wined3d/stateblock.c | 355 ++++++++++++++++++++++----------------------- 1 files changed, 173 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39886193fd7f60bf8a07e…

1 0

Henri Verbeet : wined3d: Capture stateblock state from a wined3d_state structure.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: b9f4fdcc5135a2a6c53da6347d15c76fab3b19ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f4fdcc5135a2a6c53da6347… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 27 12:07:55 2010 +0200 wined3d: Capture stateblock state from a wined3d_state structure. --- dlls/wined3d/stateblock.c | 221 ++++++++++++++++++++++----------------------- 1 files changed, 106 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f4fdcc5135a2a6c53da…

1 0

Piotr Caban : oleaut32: Set dialog size in dialog box units in OleCreatePropertyFrame.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: f4ef2d6e027a90f3209adc991d97230266eb7dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ef2d6e027a90f3209adc991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 12:03:08 2010 +0200 oleaut32: Set dialog size in dialog box units in OleCreatePropertyFrame. --- dlls/oleaut32/olepropframe.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 1a82290..7acf4e9 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -150,6 +150,8 @@ IPropertyPageSiteVtbl PropertyPageSiteVtbl = { */ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) { + static const WCHAR comctlW[] = { 'c','o','m','c','t','l','3','2','.','d','l','l',0 }; + PROPSHEETHEADERW property_sheet; PROPSHEETPAGEW property_sheet_page; struct { @@ -162,6 +164,14 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) IPropertyPageSite *property_page_site; HRESULT res; int i; + HMODULE hcomctl; + HRSRC property_sheet_dialog_find = NULL; + HGLOBAL property_sheet_dialog_load = NULL; + WCHAR *property_sheet_dialog_data = NULL; + HDC hdc; + LOGFONTW font_desc; + HFONT hfont; + LONG font_width = 4, font_height = 8; if(!lpParams) return E_POINTER; @@ -183,6 +193,47 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) if(lpParams->dispidInitialProperty) FIXME("dispidInitialProperty not yet implemented\n"); + hdc = GetDC(NULL); + hcomctl = LoadLibraryW(comctlW); + if(hcomctl) + property_sheet_dialog_find = FindResourceW(hcomctl, + MAKEINTRESOURCEW(1006 /*IDD_PROPSHEET*/), (LPWSTR)RT_DIALOG); + if(property_sheet_dialog_find) + property_sheet_dialog_load = LoadResource(hcomctl, property_sheet_dialog_find); + if(property_sheet_dialog_load) + property_sheet_dialog_data = LockResource(property_sheet_dialog_load); + + if(property_sheet_dialog_data) { + if(property_sheet_dialog_data[1] == 0xffff) { + ERR("Expected DLGTEMPLATE structure\n"); + return E_OUTOFMEMORY; + } + + property_sheet_dialog_data += sizeof(DLGTEMPLATE)/sizeof(WCHAR); + /* Skip menu, class and title */ + property_sheet_dialog_data += lstrlenW(property_sheet_dialog_data)+1; + property_sheet_dialog_data += lstrlenW(property_sheet_dialog_data)+1; + property_sheet_dialog_data += lstrlenW(property_sheet_dialog_data)+1; + + memset(&font_desc, 0, sizeof(LOGFONTW)); + /* Calculate logical height */ + font_desc.lfHeight = -MulDiv(property_sheet_dialog_data[0], + GetDeviceCaps(hdc, LOGPIXELSY), 72); + font_desc.lfCharSet = DEFAULT_CHARSET; + memcpy(font_desc.lfFaceName, property_sheet_dialog_data+1, + sizeof(WCHAR*)*(lstrlenW(property_sheet_dialog_data+1)+1)); + hfont = CreateFontIndirectW(&font_desc); + + if(hfont) { + hfont = SelectObject(hdc, hfont); + font_width = GdiGetCharDimensions(hdc, NULL, &font_height); + SelectObject(hdc, hfont); + } + } + if(hcomctl) + FreeLibrary(hcomctl); + ReleaseDC(NULL, hdc); + memset(&property_sheet, 0, sizeof(property_sheet)); property_sheet.dwSize = sizeof(property_sheet); if(lpParams->lpszCaption) { @@ -237,8 +288,8 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) if(FAILED(res)) continue; - dialogs[i].template.cx = page_info.size.cx; - dialogs[i].template.cy = page_info.size.cy; + dialogs[i].template.cx = MulDiv(page_info.size.cx, 4, font_width); + dialogs[i].template.cy = MulDiv(page_info.size.cy, 8, font_height); property_sheet_page.u.pResource = &dialogs[i].template; property_sheet_page.lParam = (LPARAM)property_page[i];

1 0

Piotr Caban : oleaut32: Added OleCreatePropertyFrameIndirect implementation .
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 9ccbadc9a84251a0e58fe8a51143f6ef89909fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccbadc9a84251a0e58fe8a51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 12:02:58 2010 +0200 oleaut32: Added OleCreatePropertyFrameIndirect implementation. Based on patch written by Geoffrey Hausheer. --- dlls/oleaut32/olepropframe.c | 232 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 229 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 23bd9e0..1a82290 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -2,6 +2,7 @@ * Copyright 1999 Corel Corporation * Sean Langley * Copyright 2010 Geoffrey Hausheer + * Copyright 2010 Piotr Caban for Codeweavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,20 +21,245 @@ #include <stdarg.h> +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" -#include "wine/debug.h" +#include "wingdi.h" #include "ole2.h" #include "olectl.h" +#include "oledlg.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); +typedef struct { + const IPropertyPageSiteVtbl *lpVtbl; + LCID lcid; + LONG ref; +} PropertyPageSite; + +static INT_PTR CALLBACK property_sheet_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + IPropertyPage *property_page = (IPropertyPage*)GetWindowLongPtrW(hwnd, DWLP_USER); + + switch(msg) { + case WM_INITDIALOG: { + RECT rect; + + property_page = (IPropertyPage*)((LPPROPSHEETPAGEW)lparam)->lParam; + + GetClientRect(hwnd, &rect); + IPropertyPage_Activate(property_page, hwnd, &rect, TRUE); + IPropertyPage_Show(property_page, SW_SHOW); + + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG)property_page); + return FALSE; + } + case WM_DESTROY: + IPropertyPage_Show(property_page, SW_HIDE); + IPropertyPage_Deactivate(property_page); + return FALSE; + default: + return FALSE; + } +} + +static HRESULT WINAPI PropertyPageSite_QueryInterface(IPropertyPageSite* iface, + REFIID riid, void** ppv) +{ + TRACE("(%p riid: %s)\n",iface, debugstr_guid(riid)); + + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IPropertyPageSite, riid)) + *ppv = iface; + else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface) +{ + PropertyPageSite *this = (PropertyPageSite*)iface; + LONG ref = InterlockedIncrement(&this->ref); + + TRACE("(%p) ref=%d\n", this, ref); + return ref; +} + +static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) +{ + PropertyPageSite *this = (PropertyPageSite *)iface; + LONG ref = InterlockedDecrement(&this->ref); + + TRACE("(%p) ref=%d\n", this, ref); + if(!ref) + HeapFree(GetProcessHeap(), 0, this); + return ref; +} + +static HRESULT WINAPI PropertyPageSite_OnStatusChange( + IPropertyPageSite *iface, DWORD dwFlags) +{ + TRACE("(%p, %x)\n", iface, dwFlags); + return S_OK; +} + +static HRESULT WINAPI PropertyPageSite_GetLocaleID( + IPropertyPageSite *iface, LCID *pLocaleID) +{ + PropertyPageSite *this = (PropertyPageSite *)iface; + + TRACE("(%p, %p)\n", iface, pLocaleID); + *pLocaleID = this->lcid; + return S_OK; +} + +static HRESULT WINAPI PropertyPageSite_GetPageContainer( + IPropertyPageSite* iface, IUnknown** ppUnk) +{ + FIXME("(%p, %p)\n", iface, ppUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI PropertyPageSite_TranslateAccelerator( + IPropertyPageSite* iface, MSG *pMsg) +{ + FIXME("(%p, %p)\n", iface, pMsg); + return E_NOTIMPL; +} + +IPropertyPageSiteVtbl PropertyPageSiteVtbl = { + PropertyPageSite_QueryInterface, + PropertyPageSite_AddRef, + PropertyPageSite_Release, + PropertyPageSite_OnStatusChange, + PropertyPageSite_GetLocaleID, + PropertyPageSite_GetPageContainer, + PropertyPageSite_TranslateAccelerator +}; + /*********************************************************************** * OleCreatePropertyFrameIndirect (OLEAUT32.416) */ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) { - FIXME("(%p), not implemented (olepro32.dll)\n", lpParams); + PROPSHEETHEADERW property_sheet; + PROPSHEETPAGEW property_sheet_page; + struct { + DLGTEMPLATE template; + WORD menu; + WORD class; + WORD title; + } *dialogs; + IPropertyPage **property_page; + IPropertyPageSite *property_page_site; + HRESULT res; + int i; + + if(!lpParams) + return E_POINTER; + + TRACE("(%d %p %d %d %s %d %p %d %p %d %d)\n", lpParams->cbStructSize, + lpParams->hWndOwner, lpParams->x, lpParams->y, + debugstr_w(lpParams->lpszCaption), lpParams->cObjects, + lpParams->lplpUnk, lpParams->cPages, lpParams->lpPages, + lpParams->lcid, lpParams->dispidInitialProperty); + + if(!lpParams->lplpUnk || !lpParams->lpPages) + return E_POINTER; + + if(lpParams->cbStructSize != sizeof(OCPFIPARAMS)) { + WARN("incorrect structure size\n"); + return E_INVALIDARG; + } + + if(lpParams->dispidInitialProperty) + FIXME("dispidInitialProperty not yet implemented\n"); + + memset(&property_sheet, 0, sizeof(property_sheet)); + property_sheet.dwSize = sizeof(property_sheet); + if(lpParams->lpszCaption) { + property_sheet.dwFlags = PSH_PROPTITLE; + property_sheet.pszCaption = lpParams->lpszCaption; + } + + property_sheet.u3.phpage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + lpParams->cPages*sizeof(HPROPSHEETPAGE)); + property_page = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + lpParams->cPages*sizeof(IPropertyPage*)); + dialogs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + lpParams->cPages*sizeof(*dialogs)); + if(!property_sheet.u3.phpage || !property_page || !dialogs) { + HeapFree(GetProcessHeap(), 0, property_sheet.u3.phpage); + HeapFree(GetProcessHeap(), 0, property_page); + HeapFree(GetProcessHeap(), 0, dialogs); + return E_OUTOFMEMORY; + } + + memset(&property_sheet_page, 0, sizeof(PROPSHEETPAGEW)); + property_sheet_page.dwSize = sizeof(PROPSHEETPAGEW); + property_sheet_page.dwFlags = PSP_DLGINDIRECT|PSP_USETITLE; + property_sheet_page.pfnDlgProc = property_sheet_proc; + + for(i=0; i<lpParams->cPages; i++) { + PROPPAGEINFO page_info; + + res = CoCreateInstance(&lpParams->lpPages[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IPropertyPage, (void**)&property_page[i]); + if(FAILED(res)) + continue; + + property_page_site = HeapAlloc(GetProcessHeap(), 0, sizeof(PropertyPageSite)); + if(!property_page_site) + continue; + ((PropertyPageSite*)property_page_site)->lpVtbl = &PropertyPageSiteVtbl; + ((PropertyPageSite*)property_page_site)->ref = 1; + ((PropertyPageSite*)property_page_site)->lcid = lpParams->lcid; + + res = IPropertyPage_SetPageSite(property_page[i], property_page_site); + IPropertyPageSite_Release(property_page_site); + if(FAILED(res)) + continue; + + res = IPropertyPage_SetObjects(property_page[i], + lpParams->cObjects, lpParams->lplpUnk); + if(FAILED(res)) + continue; + + res = IPropertyPage_GetPageInfo(property_page[i], &page_info); + if(FAILED(res)) + continue; + + dialogs[i].template.cx = page_info.size.cx; + dialogs[i].template.cy = page_info.size.cy; + + property_sheet_page.u.pResource = &dialogs[i].template; + property_sheet_page.lParam = (LPARAM)property_page[i]; + property_sheet_page.pszTitle = page_info.pszTitle; + + property_sheet.u3.phpage[property_sheet.nPages++] = + CreatePropertySheetPageW(&property_sheet_page); + } + + PropertySheetW(&property_sheet); + + for(i=0; i<lpParams->cPages; i++) { + if(property_page[i]) { + IPropertyPage_SetPageSite(property_page[i], NULL); + IPropertyPage_Release(property_page[i]); + } + } + + HeapFree(GetProcessHeap(), 0, dialogs); + HeapFree(GetProcessHeap(), 0, property_page); + HeapFree(GetProcessHeap(), 0, property_sheet.u3.phpage); return S_OK; } @@ -41,7 +267,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) * OleCreatePropertyFrame (OLEAUT32.417) */ HRESULT WINAPI OleCreatePropertyFrame( - HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption,ULONG cObjects, + HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved, LPVOID pvReserved) {

1 0

Piotr Caban : oleaut32: Execute OleCreatePropertyFrameIndirect in OleCreatePropertyFrame.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 9c9baf4da1de9146d4941f9a2b9712bab4e2eeae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9baf4da1de9146d4941f9a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 12:02:48 2010 +0200 oleaut32: Execute OleCreatePropertyFrameIndirect in OleCreatePropertyFrame. Based on patch written by Geoffrey Hausheer. --- dlls/oleaut32/olepropframe.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index b3e27d2..23bd9e0 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -1,6 +1,7 @@ /* * Copyright 1999 Corel Corporation * Sean Langley + * Copyright 2010 Geoffrey Hausheer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -44,8 +45,19 @@ HRESULT WINAPI OleCreatePropertyFrame( LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved, LPVOID pvReserved) { - FIXME("(%p,%d,%d,%s,%d,%p,%d,%p,%x,%d,%p), not implemented (olepro32.dll)\n", - hwndOwner, x, y, debugstr_w(lpszCaption), cObjects, ppUnk, cPages, - pPageClsID, (int)lcid, dwReserved, pvReserved); - return S_OK; + OCPFIPARAMS ocpf; + + ocpf.cbStructSize = sizeof(OCPFIPARAMS); + ocpf.hWndOwner = hwndOwner; + ocpf.x = x; + ocpf.y = y; + ocpf.lpszCaption = lpszCaption; + ocpf.cObjects = cObjects; + ocpf.lplpUnk = ppUnk; + ocpf.cPages = cPages; + ocpf.lpPages = pPageClsID; + ocpf.lcid = lcid; + ocpf.dispidInitialProperty = 0; + + return OleCreatePropertyFrameIndirect(&ocpf); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to record_lights().
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 8b54093bbc1cda8e31aa848642af351629064723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b54093bbc1cda8e31aa84864… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 27 12:07:53 2010 +0200 wined3d: Pass a wined3d_state structure to record_lights(). --- dlls/wined3d/stateblock.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2523bcb..7e1cfe1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -540,14 +540,15 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { /********************************************************** * IWineD3DStateBlockImpl parts follows **********************************************************/ -static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlockImpl *targetStateBlock) +static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_state *state) { UINT i; /* Lights... For a recorded state block, we just had a chain of actions to perform, * so we need to walk that chain and update any actions which differ */ - for(i = 0; i < LIGHTMAP_SIZE; i++) { + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { struct list *e, *f; LIST_FOR_EACH(e, &This->state.light_map[i]) { @@ -555,7 +556,7 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; /* Look up the light in the destination */ - LIST_FOR_EACH(f, &targetStateBlock->state.light_map[i]) + LIST_FOR_EACH(f, &state->light_map[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); if (realLight->OriginalIndex == src->OriginalIndex) @@ -582,8 +583,8 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ - WARN("Light %u in stateblock %p does not exist in device stateblock %p.\n", - src->OriginalIndex, This, targetStateBlock); + WARN("Light %u in stateblock %p does not exist in device state %p.\n", + src->OriginalIndex, This, state); src->OriginalParms = WINED3D_default_light; if (src->glIndex != -1) @@ -887,7 +888,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->state.pixel_shader = targetStateBlock->state.pixel_shader; } - record_lights(This, targetStateBlock); + record_lights(This, &targetStateBlock->state); TRACE("(%p) : Updated state block %p ------------------^\n", targetStateBlock, This);

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to apply_lights().
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: 9f75633a4f662506d2c46481db56fd85d0a78536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f75633a4f662506d2c46481d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 27 12:07:54 2010 +0200 wined3d: Pass a wined3d_state structure to apply_lights(). --- dlls/wined3d/stateblock.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7e1cfe1..3716ace 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -895,13 +895,15 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) return WINED3D_OK; } -static void apply_lights(IWineD3DDevice *device, const IWineD3DStateBlockImpl *This) +static void apply_lights(IWineD3DDevice *device, const struct wined3d_state *state) { UINT i; - for(i = 0; i < LIGHTMAP_SIZE; i++) { + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { struct list *e; - LIST_FOR_EACH(e, &This->state.light_map[i]) + LIST_FOR_EACH(e, &state->light_map[i]) { const struct wined3d_light_info *light = LIST_ENTRY(e, struct wined3d_light_info, entry); @@ -942,7 +944,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) This->state.vs_consts_b + This->contained_vs_consts_b[i], 1); } - apply_lights(device, This); + apply_lights(device, &This->state); if (This->changed.pixelShader) IWineD3DDevice_SetPixelShader(device, (IWineD3DPixelShader *)This->state.pixel_shader);

1 0

Piotr Caban : oleaut32: Rename stubs.c file.
by Alexandre Julliard Sept. 27, 2010

Sept. 27, 2010

Module: wine Branch: master Commit: b32c3102d2b45f8d0b18ac8692706304563aa12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32c3102d2b45f8d0b18ac869… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 27 12:00:19 2010 +0200 oleaut32: Rename stubs.c file. --- dlls/oleaut32/Makefile.in | 2 +- dlls/oleaut32/{stubs.c => olepropframe.c} | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index ec23bd2..bf84c80 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -13,10 +13,10 @@ C_SRCS = \ oleaut.c \ olefont.c \ olepicture.c \ + olepropframe.c \ recinfo.c \ regsvr.c \ safearray.c \ - stubs.c \ tmarshal.c \ typelib.c \ typelib2.c \ diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/olepropframe.c similarity index 67% rename from dlls/oleaut32/stubs.c rename to dlls/oleaut32/olepropframe.c index d87e76e..b3e27d2 100644 --- a/dlls/oleaut32/stubs.c +++ b/dlls/oleaut32/olepropframe.c @@ -1,8 +1,5 @@ /* - * OlePro32 Stubs - * * Copyright 1999 Corel Corporation - * * Sean Langley * * This library is free software; you can redistribute it and/or @@ -24,8 +21,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" #include "wine/debug.h" #include "ole2.h" #include "olectl.h" @@ -35,22 +30,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /*********************************************************************** * OleCreatePropertyFrameIndirect (OLEAUT32.416) */ -HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) +HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) { - FIXME("(%p), not implemented (olepro32.dll)\n",lpParams); - return S_OK; + FIXME("(%p), not implemented (olepro32.dll)\n", lpParams); + return S_OK; } /*********************************************************************** * OleCreatePropertyFrame (OLEAUT32.417) */ HRESULT WINAPI OleCreatePropertyFrame( - HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption,ULONG cObjects, - LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, - DWORD dwReserved, LPVOID pvReserved ) + HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption,ULONG cObjects, + LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, + DWORD dwReserved, LPVOID pvReserved) { - FIXME("(%p,%d,%d,%s,%d,%p,%d,%p,%x,%d,%p), not implemented (olepro32.dll)\n", - hwndOwner,x,y,debugstr_w(lpszCaption),cObjects,ppUnk,cPages, - pPageClsID, (int)lcid,dwReserved,pvReserved); - return S_OK; + FIXME("(%p,%d,%d,%s,%d,%p,%d,%p,%x,%d,%p), not implemented (olepro32.dll)\n", + hwndOwner, x, y, debugstr_w(lpszCaption), cObjects, ppUnk, cPages, + pPageClsID, (int)lcid, dwReserved, pvReserved); + return S_OK; }

1 0