August 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Merge wined3d_surface_blt(), surface_blt() and gdi_surface_blt().
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 41cff1618cfeeb3f0e563bb65b14560744c27165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cff1618cfeeb3f0e563bb65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 21:42:17 2011 +0200 wined3d: Merge wined3d_surface_blt(), surface_blt() and gdi_surface_blt(). --- dlls/wined3d/surface.c | 94 +++++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 3 - 2 files changed, 35 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 267da66..1c0425a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1281,13 +1281,15 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co } /* Do not call while under the GL lock. */ -static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, +HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, + struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) { const struct wined3d_swapchain *src_swapchain, *dst_swapchain; struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; + RECT src_rect, dst_rect; + static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL | WINEDDBLT_WAIT @@ -1295,19 +1297,31 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ | WINEDDBLT_DONOTWAIT; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), + dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); - if (flags & ~simple_blit) + if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) { - WARN("Using fallback for complex blit (%#x).\n", flags); - goto fallback; + WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); + return WINEDDERR_SURFACEBUSY; } + surface_get_rect(dst_surface, dst_rect_in, &dst_rect); + if (src_surface) + surface_get_rect(src_surface, src_rect_in, &src_rect); + else + memset(&src_rect, 0, sizeof(src_rect)); + if (!device->d3d_initialized) { WARN("D3D not initialized, using fallback.\n"); + goto cpu; + } + + if (flags & ~simple_blit) + { + WARN("Using fallback for complex blit (%#x).\n", flags); goto fallback; } @@ -1349,7 +1363,7 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ if (!surface_convert_depth_to_float(dst_surface, fx->u5.dwFillDepth, &depth)) return WINED3DERR_INVALIDCALL; - if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, dst_rect, depth))) + if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, &dst_rect, depth))) return WINED3D_OK; } else @@ -1368,21 +1382,21 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ return WINED3DERR_INVALIDCALL; } - if (src_rect->top || src_rect->left - || src_rect->bottom != src_surface->resource.height - || src_rect->right != src_surface->resource.width) + if (src_rect.top || src_rect.left + || src_rect.bottom != src_surface->resource.height + || src_rect.right != src_surface->resource.width) { WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", - wine_dbgstr_rect(src_rect)); + wine_dbgstr_rect(&src_rect)); return WINED3DERR_INVALIDCALL; } - if (dst_rect->top || dst_rect->left - || dst_rect->bottom != dst_surface->resource.height - || dst_rect->right != dst_surface->resource.width) + if (dst_rect.top || dst_rect.left + || dst_rect.bottom != dst_surface->resource.height + || dst_rect.right != dst_surface->resource.width) { WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", - wine_dbgstr_rect(src_rect)); + wine_dbgstr_rect(&src_rect)); return WINED3DERR_INVALIDCALL; } @@ -1393,7 +1407,7 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_rect, dst_surface, dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) return WINED3D_OK; } } @@ -1404,15 +1418,17 @@ fallback: if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET))) { - if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(dst_surface, dst_rect, - src_surface, src_rect, flags, fx, filter))) + if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(dst_surface, &dst_rect, + src_surface, &src_rect, flags, fx, filter))) return WINED3D_OK; } +cpu: + /* For the rest call the X11 surface implementation. For render targets * this should be implemented OpenGL accelerated in BltOverride, other * blits are rather rare. */ - return surface_cpu_blt(dst_surface, dst_rect, src_surface, src_rect, flags, fx, filter); + return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); } /* Do not call while under the GL lock. */ @@ -1641,7 +1657,6 @@ static const struct wined3d_surface_ops surface_ops = surface_unmap, surface_getdc, surface_flip, - surface_blt, surface_bltfast, surface_set_mem, }; @@ -1826,17 +1841,6 @@ static HRESULT gdi_surface_flip(struct wined3d_surface *surface, struct wined3d_ return WINED3D_OK; } -static HRESULT gdi_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) -{ - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), - flags, fx, debug_d3dtexturefiltertype(filter)); - - return surface_cpu_blt(dst_surface, dst_rect, src_surface, src_rect, flags, fx, filter); -} - static HRESULT gdi_surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD trans) { @@ -1904,7 +1908,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_unmap, gdi_surface_getdc, gdi_surface_flip, - gdi_surface_blt, gdi_surface_bltfast, gdi_surface_set_mem, }; @@ -3442,33 +3445,6 @@ do { \ } /* Do not call while under the GL lock. */ -HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, - const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) -{ - RECT src_rect, dst_rect; - - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), - flags, fx, debug_d3dtexturefiltertype(filter)); - - if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) - { - WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); - return WINEDDERR_SURFACEBUSY; - } - - surface_get_rect(dst_surface, dst_rect_in, &dst_rect); - if (src_surface) - surface_get_rect(src_surface, src_rect_in, &src_rect); - else - memset(&src_rect, 0, sizeof(src_rect)); - - return dst_surface->surface_ops->surface_blt(dst_surface, - &dst_rect, src_surface, &src_rect, flags, fx, filter); -} - -/* Do not call while under the GL lock. */ HRESULT CDECL wined3d_surface_bltfast(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD trans) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7cc3eb..0c53d22 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1984,9 +1984,6 @@ struct wined3d_surface_ops void (*surface_unmap)(struct wined3d_surface *surface); HRESULT (*surface_getdc)(struct wined3d_surface *surface); HRESULT (*surface_flip)(struct wined3d_surface *surface, struct wined3d_surface *override); - HRESULT (*surface_blt)(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter); HRESULT (*surface_bltfast)(struct wined3d_surface *dst_surface, DWORD dst_x, DWORD dst_y, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD trans); HRESULT (*surface_set_mem)(struct wined3d_surface *surface, void *mem);

1 0

Alexandre Julliard : wiaservc: Register the service from wine.inf.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 49ef4f1c7501262c4e4f8bbf84053ae48f62c682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ef4f1c7501262c4e4f8bbf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 21:48:37 2011 +0200 wiaservc: Register the service from wine.inf. --- dlls/wiaservc/wiaservc.inf | 4 ---- dlls/wiaservc/wiaservc_main.c | 35 ----------------------------------- tools/wine.inf.in | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 39 deletions(-) diff --git a/dlls/wiaservc/wiaservc.inf b/dlls/wiaservc/wiaservc.inf index 7adc6da..b46eb14 100644 --- a/dlls/wiaservc/wiaservc.inf +++ b/dlls/wiaservc/wiaservc.inf @@ -11,7 +11,3 @@ DelReg = WiaServc.Reg HKCR,"AppID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" HKCR,"AppID\%CLSID_WiaDevMgr%","LocalService",,"stisvc" HKCR,"CLSID\%CLSID_WiaDevMgr%","AppID",,"%CLSID_WiaDevMgr%" - -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","imgsvc",0x00010000,"StiSvc" - -HKLM,"System\CurrentControlSet\Services\stisvc\Parameters","ServiceDll",0x00020000,"wiaservc.dll" diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index 8ffb215..a190f31 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -102,35 +102,6 @@ static void cleanup_register_strtable(STRTABLEA *strtable) } } -static HRESULT register_service(BOOL do_register) -{ - static const WCHAR name[] = { 's','t','i','s','v','c', 0 }; - static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', - ' ','-','k',' ','i','m','g','s','v','c', 0 }; - SC_HANDLE scm, service; - - scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (!scm) - return SELFREG_E_CLASS; - - if (do_register) - service = CreateServiceW(scm, name, name, SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, - path, NULL, NULL, NULL, NULL, NULL); - else - service = OpenServiceW(scm, name, DELETE); - - - CloseServiceHandle(scm); - if (service) - { - if (!do_register) DeleteService(service); - CloseServiceHandle(service); - } - return S_OK; -} - /* Use an INF file to register or unregister the DLL */ static HRESULT register_server(BOOL do_register) { @@ -142,12 +113,6 @@ static HRESULT register_server(BOOL do_register) TRACE("(%x)\n", do_register); - hr = register_service(do_register); - if (FAILED(hr)) { - ERR("register_service failed: %d\n", GetLastError()); - return hr; - } - hAdvpack = LoadLibraryW(wszAdvpack); pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index c27524d..ad891c4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -126,18 +126,21 @@ AddReg=\ [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService [DefaultInstall.NT.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService [DefaultInstall.ntamd64.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService +AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService @@ -2980,6 +2983,19 @@ ServiceType=32 StartType=3 ErrorControl=1 +[StiService] +AddReg=StiServiceKeys +Description="WIA Service" +DisplayName="WIA Service" +ServiceBinary="%11%\svchost.exe -k imgsvc" +ServiceType=16 +StartType=3 +ErrorControl=1 + +[StiServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" +HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc" + [PlugPlayService] Description="Enables automatic configuration of devices" DisplayName="Plug and Play Service"

1 0

Alexandre Julliard : wiaservc: Convert the remaining registrations to IRegistrar format.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: ee9698c55f647a3e9fea0ea71b2d01d6b91c430c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9698c55f647a3e9fea0ea71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 21:55:15 2011 +0200 wiaservc: Convert the remaining registrations to IRegistrar format. --- dlls/wiaservc/rsrc.rc | 4 +- dlls/wiaservc/wiaservc.inf | 13 ------- dlls/wiaservc/wiaservc.rgs | 17 +++++++++ dlls/wiaservc/wiaservc_main.c | 76 +--------------------------------------- tools/wine.inf.in | 1 - 5 files changed, 21 insertions(+), 90 deletions(-) diff --git a/dlls/wiaservc/rsrc.rc b/dlls/wiaservc/rsrc.rc index d54734b..2cb425f 100644 --- a/dlls/wiaservc/rsrc.rc +++ b/dlls/wiaservc/rsrc.rc @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: wiaservc.inf */ -REGINST REGINST wiaservc.inf +/* @makedep: wiaservc.rgs */ +1 WINE_REGISTRY wiaservc.rgs diff --git a/dlls/wiaservc/wiaservc.inf b/dlls/wiaservc/wiaservc.inf deleted file mode 100644 index b46eb14..0000000 --- a/dlls/wiaservc/wiaservc.inf +++ /dev/null @@ -1,13 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg = WiaServc.Reg - -[UnregisterDll] -DelReg = WiaServc.Reg - -[WiaServc.Reg] -HKCR,"AppID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" -HKCR,"AppID\%CLSID_WiaDevMgr%","LocalService",,"stisvc" -HKCR,"CLSID\%CLSID_WiaDevMgr%","AppID",,"%CLSID_WiaDevMgr%" diff --git a/dlls/wiaservc/wiaservc.rgs b/dlls/wiaservc/wiaservc.rgs new file mode 100644 index 0000000..a6553f6 --- /dev/null +++ b/dlls/wiaservc/wiaservc.rgs @@ -0,0 +1,17 @@ +HKCR +{ + NoRemove AppID + { + '{A1F4E726-8CF1-11D1-BF92-0060081ED811}' = s 'WIA Device Manager' + { + val LocalService = s 'stisvc' + } + } + NoRemove CLSID + { + '{A1F4E726-8CF1-11D1-BF92-0060081ED811}' + { + val AppID = s '{A1F4E726-8CF1-11D1-BF92-0060081ED811}' + } + } +} diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index a190f31..e383aee 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -60,84 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(WiaDevMgr) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = wiaservc_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - HRESULT hr = __wine_register_resources( hInst ); - if (FAILED(hr)) return hr; - return register_server(TRUE); + return __wine_register_resources( hInst ); } HRESULT WINAPI DllUnregisterServer(void) { - HRESULT hr = __wine_unregister_resources( hInst ); - if (FAILED(hr)) return hr; - return register_server(FALSE); + return __wine_unregister_resources( hInst ); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ad891c4..ffe1937 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2502,7 +2502,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,qmgr.dll,1 11,,quartz.dll,1 11,,urlmon.dll,1 -11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1

1 0

Alexandre Julliard : qmgr: Register the service from wine.inf.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c1fce7458715154f11d748ab543b35522ed136eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fce7458715154f11d748ab5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 22:05:06 2011 +0200 qmgr: Register the service from wine.inf. --- dlls/qmgr/qmgr_main.c | 35 ----------------------------------- tools/wine.inf.in | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 9c6b345..6cf9668 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -107,35 +107,6 @@ static void cleanup_register_strtable(STRTABLEA *strtable) } } -static HRESULT register_service(BOOL do_register) -{ - static const WCHAR name[] = { 'B','I','T','S', 0 }; - static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', - ' ','-','k',' ','n','e','t','s','v','c','s', 0 }; - SC_HANDLE scm, service; - - scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (!scm) - return SELFREG_E_CLASS; - - if (do_register) - service = CreateServiceW(scm, name, name, SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, - path, NULL, NULL, NULL, NULL, NULL); - else - service = OpenServiceW(scm, name, DELETE); - - - CloseServiceHandle(scm); - if (service) - { - if (!do_register) DeleteService(service); - CloseServiceHandle(service); - } - return S_OK; -} - /* Use an INF file to register or unregister the DLL */ static HRESULT register_server(BOOL do_register) { @@ -147,12 +118,6 @@ static HRESULT register_server(BOOL do_register) TRACE("(%x)\n", do_register); - hr = register_service(do_register); - if (FAILED(hr)) { - ERR("register_service failed: %d\n", GetLastError()); - return hr; - } - hAdvpack = LoadLibraryW(wszAdvpack); pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ffe1937..d9e987b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -124,6 +124,7 @@ AddReg=\ VersionInfo [DefaultInstall.Services] +AddService=BITS,0,BITSService AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -131,6 +132,7 @@ AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService [DefaultInstall.NT.Services] +AddService=BITS,0,BITSService AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -138,6 +140,7 @@ AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService [DefaultInstall.ntamd64.Services] +AddService=BITS,0,BITSService AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -2957,6 +2960,15 @@ HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Std",,"Yakutsk Standar HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersion%\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\%CurrentVersionNT%\Time Zones" +[BITSService] +AddReg=BITSServiceKeys +Description="BITS Service" +DisplayName="BITS Service" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=16 +StartType=3 +ErrorControl=1 + [MountMgrService] Description="Device mounting service" DisplayName="Mount Manager" @@ -2991,6 +3003,10 @@ ServiceType=16 StartType=3 ErrorControl=1 +[BITSServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\qmgr.dll" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010000,"BITS" + [StiServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc"

1 0

Alexandre Julliard : qmgr: Convert the remaining registrations to IRegistrar format.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c90a79a728f24ba09c7c89e218578d35d04ad336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90a79a728f24ba09c7c89e21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 22:08:49 2011 +0200 qmgr: Convert the remaining registrations to IRegistrar format. --- dlls/qmgr/qmgr.inf | 16 ---------------- dlls/qmgr/qmgr.rgs | 15 +++++++++++++++ dlls/qmgr/rsrc.rc | 4 ++-- tools/wine.inf.in | 1 - 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/qmgr/qmgr.inf b/dlls/qmgr/qmgr.inf deleted file mode 100644 index ef51f9b..0000000 --- a/dlls/qmgr/qmgr.inf +++ /dev/null @@ -1,16 +0,0 @@ -[version] -Signature="$CHICAGO$" - -[RegisterDll] -AddReg = Qmgr.Reg - -[UnregisterDll] -DelReg = Qmgr.Reg - -[Qmgr.Reg] -HKCR,"AppID\BITS","AppID",,"%CLSID_BackgroundCopyQMgr%" -HKCR,"AppID\%CLSID_BackgroundCopyQMgr%","LocalService",,"BITS" -HKCR,"CLSID\%CLSID_BackgroundCopyManager%","AppID",,"%CLSID_BackgroundCopyQMgr%" - -HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS" -HKLM,"System\CurrentControlSet\Services\BITS\Parameters","ServiceDll",0x00020000,"qmgr.dll" diff --git a/dlls/qmgr/qmgr.rgs b/dlls/qmgr/qmgr.rgs new file mode 100644 index 0000000..675505e --- /dev/null +++ b/dlls/qmgr/qmgr.rgs @@ -0,0 +1,15 @@ +HKCR +{ + NoRemove AppID + { + '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' { val LocalService = s 'BITS' } + BITS { val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' } + } + NoRemove CLSID + { + '{4991D34B-80A1-4291-83B6-3328366B9097}' + { + val AppID = s '{69AD4AEE-51BE-439B-A92C-86AE490E8B30}' + } + } +} diff --git a/dlls/qmgr/rsrc.rc b/dlls/qmgr/rsrc.rc index dfc64d0..66fd2a5 100644 --- a/dlls/qmgr/rsrc.rc +++ b/dlls/qmgr/rsrc.rc @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: qmgr.inf */ -REGINST REGINST qmgr.inf +/* @makedep: qmgr.rgs */ +1 WINE_REGISTRY qmgr.rgs diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d9e987b..86d00e4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2502,7 +2502,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msiexec.exe,1 11,,msisip.dll,1 11,,qcap.dll,1 -11,,qmgr.dll,1 11,,quartz.dll,1 11,,urlmon.dll,1 11,,windowscodecs.dll,1

1 0

Alexandre Julliard : devenum: Don't register quartz from devenum.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: dc1dad6a72e3e2ae023f857ef1e556f3ed609f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1dad6a72e3e2ae023f857ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 22:53:40 2011 +0200 devenum: Don't register quartz from devenum. --- dlls/devenum/devenum_main.c | 22 ---------------------- tools/wine.inf.in | 2 +- 2 files changed, 1 insertions(+), 23 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index c4bec2e..576e3ea 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -35,8 +35,6 @@ typedef struct BOOL instance; } register_info; -static void DEVENUM_RegisterQuartz(void); - /*********************************************************************** * Global string constant definitions */ @@ -102,9 +100,6 @@ HRESULT WINAPI DllRegisterServer(void) res = __wine_register_resources( DEVENUM_hInstance ); - /* Quartz is needed for IFilterMapper2 */ - DEVENUM_RegisterQuartz(); - /*** ActiveMovieFilter Categories ***/ CoInitialize(NULL); @@ -151,20 +146,3 @@ HRESULT WINAPI DllUnregisterServer(void) FIXME("stub!\n"); return __wine_unregister_resources( DEVENUM_hInstance ); } - -typedef HRESULT (WINAPI *DllRegisterServer_func)(void); - -/* calls DllRegisterServer() for the Quartz DLL */ -static void DEVENUM_RegisterQuartz(void) -{ - HANDLE hDLL = LoadLibraryA("quartz.dll"); - DllRegisterServer_func pDllRegisterServer = NULL; - if (hDLL) - pDllRegisterServer = (DllRegisterServer_func)GetProcAddress(hDLL, "DllRegisterServer"); - if (pDllRegisterServer) - { - HRESULT hr = pDllRegisterServer(); - if (FAILED(hr)) - ERR("Failed to register Quartz. Error was 0x%x)\n", hr); - } -} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 86d00e4..f3a569a 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2493,6 +2493,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] ;;some dlls have to be registered first 11,,shell32.dll,1 +11,,quartz.dll,1 11,,comctl32.dll,2 11,,cryptdlg.dll,1 @@ -2502,7 +2503,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msiexec.exe,1 11,,msisip.dll,1 11,,qcap.dll,1 -11,,quartz.dll,1 11,,urlmon.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1

1 0

Alexandre Julliard : tools: Register the MSI service from wine.inf.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 27d88987c2932fe44d006b6fc6b44d6c0cd822e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d88987c2932fe44d006b6fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 23:24:46 2011 +0200 tools: Register the MSI service from wine.inf. --- tools/wine.inf.in | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f3a569a..77c9d4d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -125,6 +125,7 @@ AddReg=\ [DefaultInstall.Services] AddService=BITS,0,BITSService +AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -133,6 +134,7 @@ AddService=PlugPlay,0,PlugPlayService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService +AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -141,6 +143,7 @@ AddService=PlugPlay,0,PlugPlayService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService +AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService @@ -2500,7 +2503,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptnet.dll,1 11,,devenum.dll,1 11,,mshtml.dll,1 -11,,msiexec.exe,1 11,,msisip.dll,1 11,,qcap.dll,1 11,,urlmon.dll,1 @@ -2968,6 +2970,14 @@ ServiceType=16 StartType=3 ErrorControl=1 +[MSIService] +Description="MSI Installer Server" +DisplayName="MSIServer" +ServiceBinary="%11%\msiexec.exe /V" +ServiceType=32 +StartType=3 +ErrorControl=1 + [MountMgrService] Description="Device mounting service" DisplayName="Mount Manager"

1 0

Alexandre Julliard : oleaut32: Generate a few more coclass registrations from idl.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: cde24ec095fa801dde1dc07943b6769fb52a1c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde24ec095fa801dde1dc0794… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 23:25:17 2011 +0200 oleaut32: Generate a few more coclass registrations from idl. --- dlls/oleaut32/oleaut32.rgs | 46 +++++------------------------------ dlls/oleaut32/oleaut32_ocidl.idl | 48 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rgs b/dlls/oleaut32/oleaut32.rgs index 1c558e7..87a848c 100644 --- a/dlls/oleaut32/oleaut32.rgs +++ b/dlls/oleaut32/oleaut32.rgs @@ -2,45 +2,13 @@ HKCR { NoRemove CLSID { - ForceRemove '{0000002F-0000-0000-C000-000000000046}' = s 'CLSID_RecordInfo' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{00020420-0000-0000-C000-000000000046}' = s 'PSDispatch' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{00020421-0000-0000-C000-000000000046}' = s 'PSEnumVariant' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{00020422-0000-0000-C000-000000000046}' = s 'PSTypeInfo' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{00020423-0000-0000-C000-000000000046}' = s 'PSTypeLib' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{00020424-0000-0000-C000-000000000046}' = s 'PSOAInterface' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{00020425-0000-0000-C000-000000000046}' = s 'PSTypeComp' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - ForceRemove '{DF0B3D60-548F-101B-8E65-08002B2BD119}' = s 'PSSupportErrorInfo' - { - InprocServer = s 'ole2disp.dll' - InprocServer32 = s '%MODULE%' - } + '{00020420-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' } + '{00020421-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' } + '{00020422-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' } + '{00020423-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' } + '{00020424-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' } + '{00020425-0000-0000-C000-000000000046}' { InprocServer = s 'ole2disp.dll' } + '{DF0B3D60-548F-101B-8E65-08002B2BD119}' { InprocServer = s 'ole2disp.dll' } } NoRemove Interface { diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index 514e5d9..fad3741 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -47,3 +47,51 @@ coclass OldFont { interface IFont; } uuid(0be35204-8f91-11ce-9de3-00aa004bb851) ] coclass StdPicture { interface IPicture; } + +[ + threading(both), + uuid(00020420-0000-0000-c000-000000000046) +] +coclass PSDispatch { } + +[ + threading(both), + uuid(00020421-0000-0000-c000-000000000046) +] +coclass PSEnumVariant { } + +[ + threading(both), + uuid(00020422-0000-0000-c000-000000000046) +] +coclass PSTypeInfo { } + +[ + threading(both), + uuid(00020423-0000-0000-c000-000000000046) +] +coclass PSTypeLib { } + +[ + threading(both), + uuid(00020424-0000-0000-c000-000000000046) +] +coclass PSOAInterface { } + +[ + threading(both), + uuid(00020425-0000-0000-c000-000000000046) +] +coclass PSTypeComp { } + +[ + threading(both), + uuid(df0b3d60-548f-101b-8e65-08002b2bd119) +] +coclass PSSupportErrorInfo { } + +[ + threading(both), + uuid(0000002f-0000-0000-c000-000000000046) +] +coclass CLSID_RecordInfo { }

1 0

Alexandre Julliard : atl: Use the standard registration mechanism now that the initial registration is handled differently .
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 5622f8f782d3d3df2e1c733522bd467769eca62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5622f8f782d3d3df2e1c73352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 09:19:46 2011 +0200 atl: Use the standard registration mechanism now that the initial registration is handled differently. --- dlls/atl/registrar.c | 73 ++----------------------------------------------- 1 files changed, 3 insertions(+), 70 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index dad2eaf..7edd739 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -27,8 +27,7 @@ #include "winreg.h" #include "objbase.h" #include "oaidl.h" - -#define ATL_INITGUID +#include "rpcproxy.h" #include "atliface.h" #include "atlbase.h" @@ -789,58 +788,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) extern HINSTANCE hInst; -/* this is a copy of the winecrt0 registration code that creates the registrar directly, */ -/* since we can't do it through ole32 until it has been registered */ - -struct reg_info -{ - IRegistrar *registrar; - BOOL do_register; - HRESULT result; -}; - -static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) -{ - info->result = Registrar_create( NULL, &IID_IRegistrar, (void**)&info->registrar ); - if (SUCCEEDED( info->result )) - { - static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; - WCHAR str[MAX_PATH]; - - GetModuleFileNameW( hInst, str, MAX_PATH ); - IRegistrar_AddReplacement( info->registrar, moduleW, str ); - } - return info->registrar; -} - -static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg ) -{ - struct reg_info *info = (struct reg_info *)arg; - WCHAR *buffer; - HRSRC rsrc = FindResourceW( module, name, type ); - char *str = LoadResource( module, rsrc ); - DWORD lenW, lenA = SizeofResource( module, rsrc ); - - if (!str) return FALSE; - if (!info->registrar && !create_registrar( module, info )) return FALSE; - lenW = MultiByteToWideChar( CP_UTF8, 0, str, lenA, NULL, 0 ) + 1; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) - { - info->result = E_OUTOFMEMORY; - return FALSE; - } - MultiByteToWideChar( CP_UTF8, 0, str, lenA, buffer, lenW ); - buffer[lenW - 1] = 0; - - if (info->do_register) - info->result = IRegistrar_StringRegister( info->registrar, buffer ); - else - info->result = IRegistrar_StringUnregister( info->registrar, buffer ); - - HeapFree( GetProcessHeap(), 0, buffer ); - return SUCCEEDED(info->result); -} - static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) @@ -904,14 +851,7 @@ static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R' */ HRESULT WINAPI DllRegisterServer(void) { - struct reg_info info; - - info.registrar = NULL; - info.do_register = TRUE; - info.result = S_OK; - EnumResourceNamesW( hInst, regtypeW, register_resource, (LONG_PTR)&info ); - if (info.registrar) IRegistrar_Release( info.registrar ); - return info.result; + return __wine_register_resources( hInst ); } /*********************************************************************** @@ -919,14 +859,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllUnregisterServer(void) { - struct reg_info info; - - info.registrar = NULL; - info.do_register = FALSE; - info.result = S_OK; - EnumResourceNamesW( hInst, regtypeW, register_resource, (LONG_PTR)&info ); - if (info.registrar) IRegistrar_Release( info.registrar ); - return info.result; + return __wine_unregister_resources( hInst ); } /***********************************************************************

1 0

Michael Mc Donnell : d3dx9: Implemented ConvertPointRepsToAdjacency.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 507daa2154688d7b294591c078fb42b078eb3710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507daa2154688d7b294591c07… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Mon Jun 27 22:44:33 2011 +0200 d3dx9: Implemented ConvertPointRepsToAdjacency. --- dlls/d3dx9_36/mesh.c | 177 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 30 ++++---- 2 files changed, 190 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 0d17941..9a0fd03 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -432,13 +432,186 @@ static HRESULT WINAPI ID3DXMeshImpl_GetAttributeTable(ID3DXMesh *iface, D3DXATTR return D3D_OK; } +struct edge_face +{ + struct list entry; + DWORD v2; + DWORD face; +}; + +struct edge_face_map +{ + struct list *lists; + struct edge_face *entries; +}; + +/* Builds up a map of which face a new edge belongs to. That way the adjacency + * of another edge can be looked up. An edge has an adjacent face if there + * is an edge going in the opposite direction in the map. For example if the + * edge (v1, v2) belongs to face 4, and there is a mapping (v2, v1)->7, then + * face 4 and 7 are adjacent. + * + * Each edge might have been replaced with another edge, or none at all. There + * is at most one edge to face mapping, i.e. an edge can only belong to one + * face. + */ +static HRESULT init_edge_face_map(struct edge_face_map *edge_face_map, CONST DWORD *index_buffer, CONST DWORD *point_reps, CONST DWORD num_faces) +{ + DWORD face, edge; + DWORD i; + + edge_face_map->lists = HeapAlloc(GetProcessHeap(), 0, 3 * num_faces * sizeof(*edge_face_map->lists)); + if (!edge_face_map->lists) return E_OUTOFMEMORY; + + edge_face_map->entries = HeapAlloc(GetProcessHeap(), 0, 3 * num_faces * sizeof(*edge_face_map->entries)); + if (!edge_face_map->entries) return E_OUTOFMEMORY; + + + /* Initialize all lists */ + for (i = 0; i < 3 * num_faces; i++) + { + list_init(&edge_face_map->lists[i]); + } + /* Build edge face mapping */ + for (face = 0; face < num_faces; face++) + { + for (edge = 0; edge < 3; edge++) + { + DWORD v1 = index_buffer[3*face + edge]; + DWORD v2 = index_buffer[3*face + (edge+1)%3]; + DWORD new_v1 = point_reps[v1]; /* What v1 has been replaced with */ + DWORD new_v2 = point_reps[v2]; + + if (v1 != v2) /* Only map non-collapsed edges */ + { + i = 3*face + edge; + edge_face_map->entries[i].v2 = new_v2; + edge_face_map->entries[i].face = face; + list_add_head(&edge_face_map->lists[new_v1], &edge_face_map->entries[i].entry); + } + } + } + + return D3D_OK; +} + +static DWORD find_adjacent_face(struct edge_face_map *edge_face_map, DWORD vertex1, DWORD vertex2, CONST DWORD num_faces) +{ + struct edge_face *edge_face_ptr; + + LIST_FOR_EACH_ENTRY(edge_face_ptr, &edge_face_map->lists[vertex2], struct edge_face, entry) + { + if (edge_face_ptr->v2 == vertex1) + return edge_face_ptr->face; + } + + return -1; +} + +static DWORD *generate_identity_point_reps(DWORD num_vertices) +{ + DWORD *id_point_reps; + DWORD i; + + id_point_reps = HeapAlloc(GetProcessHeap(), 0, num_vertices * sizeof(*id_point_reps)); + if (!id_point_reps) + return NULL; + + for (i = 0; i < num_vertices; i++) + { + id_point_reps[i] = i; + } + + return id_point_reps; +} + static HRESULT WINAPI ID3DXMeshImpl_ConvertPointRepsToAdjacency(ID3DXMesh *iface, CONST DWORD *point_reps, DWORD *adjacency) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + HRESULT hr; + DWORD num_faces = iface->lpVtbl->GetNumFaces(iface); + DWORD num_vertices = iface->lpVtbl->GetNumVertices(iface); + DWORD options = iface->lpVtbl->GetOptions(iface); + BOOL indices_are_16_bit = !(options & D3DXMESH_32BIT); + DWORD *ib = NULL; + void *ib_ptr = NULL; + DWORD face; + DWORD edge; + struct edge_face_map edge_face_map = {0}; + CONST DWORD *point_reps_ptr = NULL; + DWORD *id_point_reps = NULL; - FIXME("(%p)->(%p,%p): stub\n", This, point_reps, adjacency); + TRACE("(%p)->(%p,%p)\n", This, point_reps, adjacency); - return E_NOTIMPL; + if (!adjacency) return D3DERR_INVALIDCALL; + + if (!point_reps) /* Identity point reps */ + { + id_point_reps = generate_identity_point_reps(num_vertices); + if (!id_point_reps) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + point_reps_ptr = id_point_reps; + } + else + { + point_reps_ptr = point_reps; + } + + hr = iface->lpVtbl->LockIndexBuffer(iface, D3DLOCK_READONLY, &ib_ptr); + if (FAILED(hr)) goto cleanup; + + if (indices_are_16_bit) + { + /* Widen 16 bit to 32 bit */ + DWORD i; + WORD *ib_16bit = ib_ptr; + ib = HeapAlloc(GetProcessHeap(), 0, 3 * num_faces * sizeof(DWORD)); + if (!ib) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + for (i = 0; i < 3 * num_faces; i++) + { + ib[i] = ib_16bit[i]; + } + } + else + { + ib = ib_ptr; + } + + hr = init_edge_face_map(&edge_face_map, ib, point_reps_ptr, num_faces); + if (FAILED(hr)) goto cleanup; + + /* Create adjacency */ + for (face = 0; face < num_faces; face++) + { + for (edge = 0; edge < 3; edge++) + { + DWORD v1 = ib[3*face + edge]; + DWORD v2 = ib[3*face + (edge+1)%3]; + DWORD new_v1 = point_reps_ptr[v1]; + DWORD new_v2 = point_reps_ptr[v2]; + DWORD adj_face; + + adj_face = find_adjacent_face(&edge_face_map, new_v1, new_v2, num_faces); + adjacency[3*face + edge] = adj_face; + } + } + + hr = D3D_OK; +cleanup: + HeapFree(GetProcessHeap(), 0, id_point_reps); + if (indices_are_16_bit) HeapFree(GetProcessHeap(), 0, ib); + HeapFree(GetProcessHeap(), 0, edge_face_map.lists); + HeapFree(GetProcessHeap(), 0, edge_face_map.entries); + if(ib_ptr) iface->lpVtbl->UnlockIndexBuffer(iface); + return hr; } /* ConvertAdjacencyToPointReps helper function. diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d8f9b97..39c78e6 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5923,28 +5923,28 @@ static void test_convert_point_reps_to_adjacency(void) /* Convert point representation to adjacency*/ memset(adjacency, -2, VERTS_PER_FACE * tc[i].num_faces * sizeof(*adjacency)); hr = mesh->lpVtbl->ConvertPointRepsToAdjacency(mesh, tc[i].point_reps, adjacency); - todo_wine ok(hr == D3D_OK, "ConvertPointRepsToAdjacency failed case %d. " - "Got %x expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "ConvertPointRepsToAdjacency failed case %d. " + "Got %x expected D3D_OK\n", i, hr); /* Check adjacency */ for (j = 0; j < VERTS_PER_FACE * tc[i].num_faces; j++) { - todo_wine ok(adjacency[j] == tc[i].exp_adjacency[j], - "Unexpected adjacency information at (%d, %d)." - " Got %d expected %d\n", - i, j, adjacency[j], tc[i].exp_adjacency[j]); + ok(adjacency[j] == tc[i].exp_adjacency[j], + "Unexpected adjacency information at (%d, %d)." + " Got %d expected %d\n", + i, j, adjacency[j], tc[i].exp_adjacency[j]); } /* NULL point representation is considered identity. */ memset(adjacency, -2, VERTS_PER_FACE * tc[i].num_faces * sizeof(*adjacency)); hr = mesh_null_check->lpVtbl->ConvertPointRepsToAdjacency(mesh, NULL, adjacency); - todo_wine ok(hr == D3D_OK, "ConvertPointRepsToAdjacency NULL point_reps. " + ok(hr == D3D_OK, "ConvertPointRepsToAdjacency NULL point_reps. " "Got %x expected D3D_OK\n", hr); for (j = 0; j < VERTS_PER_FACE * tc[i].num_faces; j++) { - todo_wine ok(adjacency[j] == tc[i].exp_id_adjacency[j], - "Unexpected adjacency information (id) at (%d, %d)." - " Got %d expected %d\n", - i, j, adjacency[j], tc[i].exp_id_adjacency[j]); + ok(adjacency[j] == tc[i].exp_id_adjacency[j], + "Unexpected adjacency information (id) at (%d, %d)." + " Got %d expected %d\n", + i, j, adjacency[j], tc[i].exp_id_adjacency[j]); } HeapFree(GetProcessHeap(), 0, adjacency); @@ -5954,11 +5954,11 @@ static void test_convert_point_reps_to_adjacency(void) /* NULL checks */ hr = mesh_null_check->lpVtbl->ConvertPointRepsToAdjacency(mesh_null_check, tc[0].point_reps, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL adjacency. " - "Got %x expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL adjacency. " + "Got %x expected D3DERR_INVALIDCALL\n", hr); hr = mesh_null_check->lpVtbl->ConvertPointRepsToAdjacency(mesh_null_check, NULL, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL point_reps and adjacency. " - "Got %x expected D3DERR_INVALIDCALL\n", hr); + ok(hr == D3DERR_INVALIDCALL, "ConvertPointRepsToAdjacency NULL point_reps and adjacency. " + "Got %x expected D3DERR_INVALIDCALL\n", hr); cleanup: if (mesh_null_check)

1 0