October 2007 - Wine-commits

Stefan Dösinger : wined3d: Clear up in Init3D if something fails.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 8fc4e3cec7377ff30e3bf1c353ee49415e86a763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc4e3cec7377ff30e3bf1c35… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 22:04:18 2007 +0200 wined3d: Clear up in Init3D if something fails. --- dlls/wined3d/device.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f489cf..3857ebd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1952,15 +1952,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR NULL); if (WINED3D_OK != hr) { /* Note: No parent needed for initial internal stateblock */ WARN("Failed to create stateblock\n"); - return hr; + goto err_out; } TRACE("(%p) : Created stateblock (%p)\n", This, This->stateBlock); This->updateStateBlock = This->stateBlock; IWineD3DStateBlock_AddRef((IWineD3DStateBlock*)This->updateStateBlock); hr = allocate_shader_constants(This->updateStateBlock); - if (WINED3D_OK != hr) - return hr; + if (WINED3D_OK != hr) { + goto err_out; + } This->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); This->fbo_color_attachments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); @@ -1982,15 +1983,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR hr=D3DCB_CreateAdditionalSwapChain((IUnknown *) This->parent, pPresentationParameters, (IWineD3DSwapChain **)&swapchain); if (FAILED(hr) || !swapchain) { WARN("Failed to create implicit swapchain\n"); - return hr; + goto err_out; } This->NumberOfSwapChains = 1; This->swapchains = HeapAlloc(GetProcessHeap(), 0, This->NumberOfSwapChains * sizeof(IWineD3DSwapChain *)); if(!This->swapchains) { ERR("Out of memory!\n"); - IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); - return E_OUTOFMEMORY; + goto err_out; } This->swapchains[0] = (IWineD3DSwapChain *) swapchain; @@ -2074,6 +2074,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR IWineD3DDeviceImpl_LoadLogo(This, wined3d_settings.logo); } return WINED3D_OK; + + err_out: + HeapFree(GetProcessHeap(), 0, This->render_targets); + HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); + HeapFree(GetProcessHeap(), 0, This->draw_buffers); + HeapFree(GetProcessHeap(), 0, This->swapchains); + This->NumberOfSwapChains = 0; + if(swapchain) { + IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); + } + This->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers)); + if(This->stateBlock) { + IWineD3DStateBlock_Release((IWineD3DStateBlock *) This->stateBlock); + This->stateBlock = NULL; + } + return hr; } static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroyDepthStencilSurface, D3DCB_DESTROYSWAPCHAINFN D3DCB_DestroySwapChain) {

1 0

Stefan Dösinger : ddraw: Cope with Init3D failures.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: c5055fb3eb59b951898d7408fae0d9461313e397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5055fb3eb59b951898d7408f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 14:42:06 2007 +0200 ddraw: Cope with Init3D failures. --- dlls/ddraw/ddraw.c | 29 ++++++++++++++++++++++++----- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7c6bf5f..508832b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2519,10 +2519,6 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, return hr; } - /* Addref the ddraw interface to keep an reference for each surface */ - IDirectDraw7_AddRef(iface); - object->ifaceToRelease = (IUnknown *) iface; - /* If the implementation is OpenGL and there's no d3ddevice, attach a d3ddevice * But attach the d3ddevice only if the currently created surface was * a primary surface (2D app in 3D mode) or a 3DDEVICE surface (3D app) @@ -2555,10 +2551,32 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, hr = IDirectDrawImpl_AttachD3DDevice(This, target); if(hr != D3D_OK) { + IDirectDrawSurfaceImpl *release_surf; ERR("IDirectDrawImpl_AttachD3DDevice failed, hr = %x\n", hr); + *Surf = NULL; + + /* The before created surface structures are in an incomplete state here. + * WineD3D holds the reference on the IParents, and it released them on the failure + * already. So the regular release method implementation would fail on the attempt + * to destroy either the IParents or the swapchain. So free the surface here. + * The surface structure here is a list, not a tree, because onscreen targets + * cannot be cube textures + */ + while(object) + { + release_surf = object; + object = object->complex_array[0]; + IDirectDrawSurfaceImpl_Destroy(release_surf); + } + LeaveCriticalSection(&ddraw_cs); + return hr; } } + /* Addref the ddraw interface to keep an reference for each surface */ + IDirectDraw7_AddRef(iface); + object->ifaceToRelease = (IUnknown *) iface; + /* Create a WineD3DTexture if a texture was requested */ if(desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) { @@ -3077,7 +3095,8 @@ IDirectDrawImpl_AttachD3DDevice(IDirectDrawImpl *This, D3D7CB_CreateAdditionalSwapChain); if(FAILED(hr)) { - This->wineD3DDevice = NULL; + This->d3d_target = NULL; + This->d3d_initialized = FALSE; return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2f35643..9b78edf 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -273,6 +273,7 @@ const IDirect3DTexture2Vtbl IDirect3DTexture2_Vtbl; const IDirect3DTextureVtbl IDirect3DTexture1_Vtbl; HRESULT WINAPI IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This, IDirectDrawSurfaceImpl *Surf); +void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This); /* Get the number of bytes per pixel for a given surface */ #define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a5a0b21..646ea1a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -178,7 +178,7 @@ IDirectDrawSurfaceImpl_AddRef(IDirectDrawSurface7 *iface) * This: Surface to free * *****************************************************************************/ -static void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This) +void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This) { TRACE("(%p)\n", This);

1 0

Stefan Dösinger : wined3d: Silently ignore setting the 0 texture on gdi surfaces.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: aec86b4ef92c8d0b2b19364dafb8236e19df6f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec86b4ef92c8d0b2b19364da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 14:53:58 2007 +0200 wined3d: Silently ignore setting the 0 texture on gdi surfaces. --- dlls/wined3d/surface_gdi.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 33dfb10..c198dbb 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -710,7 +710,16 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) void WINAPI IWineGDISurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT textureName, int target) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - FIXME("(%p) : Should not be called on a GDI surface. textureName %u, target %i\n", This, textureName, target); + + /* Ignore 0 textureName and target. D3D textures can be created with gdi surfaces as plain + * containers, but they're useless until the app creates a d3d device from a d3d point of + * view, it's not an implementation limitation. This avoids false warnings when the texture + * is destroyed and sets the description back to 0/0 + */ + if(textureName != 0 || target != 0) { + FIXME("(%p) : Should not be called on a GDI surface. textureName %u, target %i\n", This, textureName, target); + DebugBreak(); + } } void WINAPI IWineGDISurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) {

1 0

Hwang YunSong(황윤성) : wineboot: New Korean resource.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 4bf62af099fdacf831bf590542e44c1eb614d968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf62af099fdacf831bf59054… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Oct 8 08:39:42 2007 +0900 wineboot: New Korean resource. --- programs/wineboot/wineboot.rc | 1 + programs/wineboot/wineboot_Ko.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.rc b/programs/wineboot/wineboot.rc index 4607e01..0e699c1 100644 --- a/programs/wineboot/wineboot.rc +++ b/programs/wineboot/wineboot.rc @@ -28,3 +28,4 @@ #include "resource.h" #include "wineboot_En.rc" +#include "wineboot_Ko.rc" diff --git a/programs/wineboot/wineboot_Ko.rc b/programs/wineboot/wineboot_Ko.rc new file mode 100644 index 0000000..869a6af --- /dev/null +++ b/programs/wineboot/wineboot_Ko.rc @@ -0,0 +1,37 @@ +/* + * WineBoot Korean resources + * + * Copyright (C) 2007 Robert Shearman for CodeWeavers + * Copyright (C) 2007 YunSong Hwang(hys545(a)dreamwiz.com, Ȳ��) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + + +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "��α׷� ��" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "��μ�� ",IDOK,51,49,71,15 + PUSHBUTTON "��",IDCANCEL,129,49,50,15 + LTEXT " �� μ�� α� �� Ḧ �õ��, �� α׷�� ƹ�� ϴ�.", + IDC_STATIC,7,7,172,19 + LTEXT "�� μ�� ٸ� �� ͸� �Ҿ�� Դϴ�.", + IDC_STATIC,7,28,172,15 +END

1 0

Andrew Talbot : urlmon: Fix some memory leaks.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: dbf995a8b4b60dbbc2832c7865151ea884f4eb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf995a8b4b60dbbc2832c786… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Oct 5 21:52:08 2007 +0100 urlmon: Fix some memory leaks. --- dlls/urlmon/sec_mgr.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 52e29b6..6330906 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -318,6 +318,8 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa static const BYTE secidFile[] = {'f','i','l','e',':'}; + HeapFree(GetProcessHeap(), 0, buf); + if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); @@ -341,8 +343,10 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa len = WideCharToMultiByte(CP_ACP, 0, buf, -1, NULL, 0, NULL, NULL)-1; - if(len+sizeof(DWORD) > *pcbSecurityId) + if(len+sizeof(DWORD) > *pcbSecurityId) { + HeapFree(GetProcessHeap(), 0, buf); return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } WideCharToMultiByte(CP_ACP, 0, buf, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); HeapFree(GetProcessHeap(), 0, buf);

1 0

Andrew Talbot : winealsa.drv: Fix a memory leak.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 3b47a5732a81896b85409198eb3ccfa0fcd2f2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b47a5732a81896b85409198e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 6 10:38:21 2007 +0100 winealsa.drv: Fix a memory leak. --- dlls/winealsa.drv/midi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index f5e98ed..26e1623 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1018,6 +1018,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) default: WARN("Technology not supported (yet) %d !\n", MidiOutDev[wDevID].caps.wTechnology); + HeapFree(GetProcessHeap(), 0, lpNewData); return MMSYSERR_NOTENABLED; }

1 0

Andrew Talbot : wined3d: Fix a memory leak.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 057a7eba55752d42828db965f34ee0ac9a63fce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=057a7eba55752d42828db965f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 8 20:52:17 2007 +0100 wined3d: Fix a memory leak. --- dlls/wined3d/resource.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a75bcbd..4a620f6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -137,6 +137,7 @@ HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFG if (Flags & WINED3DSPD_IUNKNOWN) { if(SizeOfData != sizeof(IUnknown *)) { WARN("IUnknown data with size %d, returning WINED3DERR_INVALIDCALL\n", SizeOfData); + HeapFree(GetProcessHeap(), 0, data); return WINED3DERR_INVALIDCALL; } data->ptr.object = (LPUNKNOWN)pData;

1 0

Andrew Talbot : wineps.drv: Fix some memory leaks.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 91128b901ec308dd86346e971e94f85fb24ba680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91128b901ec308dd86346e971… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 9 21:17:24 2007 +0100 wineps.drv: Fix some memory leaks. --- dlls/wineps.drv/download.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 78bdce9..e794af6 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -242,16 +242,18 @@ BOOL PSDRV_WriteSetDownloadFont(PSDRV_PDEVICE *physDev) RECT bbox; UINT emsize; + if (!get_bbox(physDev, &bbox, &emsize)) { + HeapFree(GetProcessHeap(), 0, potm); + return FALSE; + } + if(!is_room_for_font(physDev)) + PSDRV_EmptyDownloadList(physDev, TRUE); + pdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdl)); pdl->ps_name = HeapAlloc(GetProcessHeap(), 0, strlen(ps_name)+1); strcpy(pdl->ps_name, ps_name); pdl->next = NULL; - if (!get_bbox(physDev, &bbox, &emsize)) - return FALSE; - if(!is_room_for_font(physDev)) - PSDRV_EmptyDownloadList(physDev, TRUE); - if(physDev->pi->ppd->TTRasterizer == RO_Type42) { pdl->typeinfo.Type42 = T42_download_header(physDev, ps_name, &bbox, emsize); pdl->type = Type42;

1 0

EA Durbin : kernel32: Implement SetUserGeoID.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 64dda7f3175a380d8e7d85012f08e4665f261f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dda7f3175a380d8e7d85012… Author: EA Durbin <ead1234(a)hotmail.com> Date: Sat Oct 6 23:56:49 2007 -0500 kernel32: Implement SetUserGeoID. --- dlls/kernel32/locale.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8a62991..73ca344 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3508,8 +3508,37 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) */ BOOL WINAPI SetUserGeoID( GEOID GeoID ) { - FIXME("%d\n",GeoID); - return FALSE; + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + static const WCHAR formatW[] = {'%','i',0}; + UNICODE_STRING nameW,keyW; + WCHAR bufferW[10]; + OBJECT_ATTRIBUTES attr; + HANDLE hkey; + + if(!(hkey = create_registry_key())) return FALSE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, geoW ); + RtlInitUnicodeString( &keyW, nationW ); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + + { + NtClose(attr.RootDirectory); + return FALSE; + } + + sprintfW(bufferW, formatW, GeoID); + NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); + NtClose(attr.RootDirectory); + NtClose(hkey); + return TRUE; } typedef struct

1 0

Andrey Turkin : dbghelp: Avoid crashing on files with bogus export table.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 4c8e88df7e6e281561339dcbd517809c82ae27d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8e88df7e6e281561339dcbd… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 8 21:41:37 2007 +0400 dbghelp: Avoid crashing on files with bogus export table. --- dlls/dbghelp/pe_module.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index a42ade1..3027f5b 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -248,25 +248,28 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, ordinals = RtlImageRvaToVa(nth, (void*)mapping, exports->AddressOfNameOrdinals, NULL); names = RtlImageRvaToVa(nth, (void*)mapping, exports->AddressOfNames, NULL); - for (i = 0; i < exports->NumberOfNames; i++) + if (functions && ordinals && names) { - if (!names[i]) continue; - symt_new_public(module, NULL, - RtlImageRvaToVa(nth, (void*)mapping, names[i], NULL), - base + functions[ordinals[i]], - 1, TRUE /* FIXME */, TRUE /* FIXME */); - } - - for (i = 0; i < exports->NumberOfFunctions; i++) - { - if (!functions[i]) continue; - /* Check if we already added it with a name */ - for (j = 0; j < exports->NumberOfNames; j++) - if ((ordinals[j] == i) && names[j]) break; - if (j < exports->NumberOfNames) continue; - snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); - symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, - TRUE /* FIXME */, TRUE /* FIXME */); + for (i = 0; i < exports->NumberOfNames; i++) + { + if (!names[i]) continue; + symt_new_public(module, NULL, + RtlImageRvaToVa(nth, (void*)mapping, names[i], NULL), + base + functions[ordinals[i]], + 1, TRUE /* FIXME */, TRUE /* FIXME */); + } + + for (i = 0; i < exports->NumberOfFunctions; i++) + { + if (!functions[i]) continue; + /* Check if we already added it with a name */ + for (j = 0; j < exports->NumberOfNames; j++) + if ((ordinals[j] == i) && names[j]) break; + if (j < exports->NumberOfNames) continue; + snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); + symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1, + TRUE /* FIXME */, TRUE /* FIXME */); + } } } /* no real debug info, only entry points */

1 0