April 2006 - Wine-Commits - list.winehq.org

Robert Shearman : widl: Fix the type offset for generated conformant string calls.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: e2ea2b5891077e9419437511605a8f5cf85eca2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2ea2b5891077e941943751… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Apr 3 16:27:17 2006 +0100 widl: Fix the type offset for generated conformant string calls. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a8ab982..96d42a1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1591,11 +1591,11 @@ void write_remoting_arguments(FILE *file fprintf(file, ";\n"); } - /* FIXME: these can't both be correct */ if (phase == PHASE_FREE) print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); else - print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); + print_phase_function(file, indent, "ConformantString", phase, var->name, + *type_offset + (has_size ? 4 : 2)); } } else if (is_array_type(var->attrs, var->ptr_level, var->array))

1 0

Robert Shearman : kernel: Remove some stubs that aren't present in NT.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: 62c25c5a512acaa7a797dd4da2666db8785657f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62c25c5a512acaa7a797dd4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Apr 3 16:26:27 2006 +0100 kernel: Remove some stubs that aren't present in NT. --- dlls/kernel/kernel32.spec | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index a29f8ab..5bb79af 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -175,22 +175,6 @@ @ stdcall BuildCommDCBW(wstr ptr) @ stdcall CallNamedPipeA(str ptr long ptr long ptr long) @ stdcall CallNamedPipeW(wstr ptr long ptr long ptr long) -@ stub Callback12 -@ stub Callback16 -@ stub Callback20 -@ stub Callback24 -@ stub Callback28 -@ stub Callback32 -@ stub Callback36 -@ stub Callback40 -@ stub Callback44 -@ stub Callback48 -@ stub Callback4 -@ stub Callback52 -@ stub Callback56 -@ stub Callback60 -@ stub Callback64 -@ stub Callback8 @ stub CancelDeviceWakeupRequest @ stdcall CancelIo(long) # @ stub CancelTimerQueueTimer

1 0

Stefan Dösinger : wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: f6ed704f96e336d76960d299a36ec76fb2e1759c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6ed704f96e336d76960d29… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Apr 3 14:54:16 2006 +0200 wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d_interface.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 720bc4a..96f44f0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -150,7 +150,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetD HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, pParameters); + return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, (WINED3DDEVICE_CREATION_PARAMETERS *) pParameters); } HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface8* pCursorBitmap) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d87eab4..9c68e84 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -138,7 +138,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, pParameters); + return IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, (WINED3DDEVICE_CREATION_PARAMETERS *) pParameters); } HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVICE9 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9* pCursorBitmap) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff47d57..14d1b5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6549,7 +6549,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetDia } -HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice *iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { +HRESULT WINAPI IWineD3DDeviceImpl_GetCreationParameters(IWineD3DDevice *iface, WINED3DDEVICE_CREATION_PARAMETERS *pParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; TRACE("(%p) : pParameters %p\n", This, pParameters); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f852536..817f05d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -521,7 +521,7 @@ typedef struct IWineD3DDeviceImpl IWineD3DStateBlockImpl *updateStateBlock; /* Internal use fields */ - D3DDEVICE_CREATION_PARAMETERS createParms; + WINED3DDEVICE_CREATION_PARAMETERS createParms; UINT adapterNo; D3DDEVTYPE devType; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 8a007f5..6478d8d 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -324,7 +324,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(EvictManagedResources)(THIS) PURE; STDMETHOD_(UINT, GetAvailableTextureMem)(THIS) PURE; STDMETHOD(GetBackBuffer)(THIS_ UINT iSwapChain, UINT BackBuffer, WINED3DBACKBUFFER_TYPE, struct IWineD3DSurface** ppBackBuffer) PURE; - STDMETHOD(GetCreationParameters)(THIS_ D3DDEVICE_CREATION_PARAMETERS *pParameters) PURE; + STDMETHOD(GetCreationParameters)(THIS_ WINED3DDEVICE_CREATION_PARAMETERS *pParameters) PURE; STDMETHOD(GetDeviceCaps)(THIS_ WINED3DCAPS* pCaps) PURE; STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE; STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE;

1 0

Mike McCormack : user32: More informative message on failure to load x11drv .
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: ba41900d49ec41f617e11a1ff8d259a0803b778c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba41900d49ec41f617e11a1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Apr 3 22:46:35 2006 +0900 user32: More informative message on failure to load x11drv. --- dlls/user/driver.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user/driver.c b/dlls/user/driver.c index 994152b..4a31049 100644 --- a/dlls/user/driver.c +++ b/dlls/user/driver.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); static const USER_DRIVER null_driver, lazy_load_driver; const USER_DRIVER *USER_Driver = &lazy_load_driver; +static DWORD driver_load_error; /* load the graphics driver */ static const USER_DRIVER *load_driver(void) @@ -62,6 +63,9 @@ static const USER_DRIVER *load_driver(vo name = next; } + if (!graphics_driver) + driver_load_error = GetLastError(); + driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); memcpy( driver, &null_driver, sizeof(*driver) ); @@ -305,10 +309,22 @@ static BOOL nulldrv_CreateDesktopWindow( static BOOL nulldrv_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) { static int warned; + if (warned++) + return FALSE; + + MESSAGE( "Application tried to create a window, but no driver could be loaded.\n"); + switch (driver_load_error) + { + case ERROR_MOD_NOT_FOUND: + MESSAGE( "The X11 driver is missing. Check your build!\n" ); + break; + case ERROR_DLL_INIT_FAILED: + MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" ); + break; + default: + MESSAGE( "Unknown error (%ld).\n", driver_load_error ); + } - if (!warned++) - MESSAGE( "Application tries to create a window, but no driver could be loaded.\n" - "Make sure that your X server is running and that $DISPLAY is set correctly.\n" ); return FALSE; }

1 0

Huw Davies : fonts: Add an 11 ppem strike of 'Small Fonts'.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: f875d30e7af63fe60e46ef0b8f87e67632fee1a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f875d30e7af63fe60e46ef0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 3 14:42:48 2006 +0100 fonts: Add an 11 ppem strike of 'Small Fonts'. --- fonts/.gitignore | 19 fonts/Makefile.in | 66 + fonts/small_fonts.sfd | 2687 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2772 insertions(+), 0 deletions(-) create mode 100644 fonts/small_fonts.sfd Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f875d30e7af63fe60e4…

1 0

Dmitry Timoshkov : gdi: Move WineEngInit call before stock fonts creation.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: fd2ed6fffe495e243ce4480315f7bdb19d2a59e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd2ed6fffe495e243ce4480… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 3 21:33:15 2006 +0900 gdi: Move WineEngInit call before stock fonts creation. Move WineEngInit call before stock fonts creation, otherwise we end up caching wrong fonts before loading built-in bitmap fonts. --- dlls/gdi/gdiobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/gdiobj.c b/dlls/gdi/gdiobj.c index a4c9a07..c8df45c 100644 --- a/dlls/gdi/gdiobj.c +++ b/dlls/gdi/gdiobj.c @@ -584,6 +584,8 @@ BOOL GDI_Init(void) const struct DefaultFontInfo* deffonts; int i; + WineEngInit(); + /* create stock objects */ stock_objects[WHITE_BRUSH] = CreateBrushIndirect( &WhiteBrush ); stock_objects[LTGRAY_BRUSH] = CreateBrushIndirect( &LtGrayBrush ); @@ -631,8 +633,6 @@ BOOL GDI_Init(void) __wine_make_gdi_object_system( stock_objects[i], TRUE ); } - WineEngInit(); - return TRUE; }

1 0

Dmitry Timoshkov : gdi: Separate GDI tests by moving them into appropriate files.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: 48bb687dfb00b00f789b688459ad5d0ec77a617b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48bb687dfb00b00f789b688… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 3 21:59:27 2006 +0900 gdi: Separate GDI tests by moving them into appropriate files. Separate GDI tests by moving them into appropriate files: bitmap tests to bitmap.c, font test to font.c, pen tests to pen.c. --- dlls/gdi/tests/.gitignore | 2 dlls/gdi/tests/Makefile.in | 4 dlls/gdi/tests/bitmap.c | 85 ++++- dlls/gdi/tests/font.c | 357 ++++++++++++++++++++ dlls/gdi/tests/gdiobj.c | 799 -------------------------------------------- dlls/gdi/tests/pen.c | 433 ++++++++++++++++++++++++ 6 files changed, 872 insertions(+), 808 deletions(-) create mode 100644 dlls/gdi/tests/font.c create mode 100644 dlls/gdi/tests/pen.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=48bb687dfb00b00f789…

1 0

Vitaliy Margolen : d3dx: VertexBuffer should keep reference to the parent device object.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: fc13420770edd4db49bd2ec7d3aa5436f2863201 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc13420770edd4db49bd2ec… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Apr 2 13:24:00 2006 -0600 d3dx: VertexBuffer should keep reference to the parent device object. --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/device.c | 2 ++ dlls/d3d8/vertexbuffer.c | 1 + dlls/d3d9/d3d9_private.h | 3 +++ dlls/d3d9/vertexbuffer.c | 3 +++ 5 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 31fe04c..c0f8eb0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -295,6 +295,9 @@ struct IDirect3DVertexBuffer8Impl /* IDirect3DResource8 fields */ IWineD3DVertexBuffer *wineD3DVertexBuffer; + + /* Parent reference */ + LPDIRECT3DDEVICE8 parentDevice; }; /* --------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f21a5dc..720bc4a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -418,6 +418,8 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea HeapFree(GetProcessHeap(), 0, object); *ppVertexBuffer = NULL; } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; *ppVertexBuffer = (LPDIRECT3DVERTEXBUFFER8) object; } return hrc; diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 5ca8318..fc22936 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -57,6 +57,7 @@ ULONG WINAPI IDirect3DVertexBuffer8Impl_ if (ref == 0) { IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 916cff2..02c15eb 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -353,6 +353,9 @@ typedef struct IDirect3DVertexBuffer9Imp /* IDirect3DResource9 fields */ IWineD3DVertexBuffer *wineD3DVertexBuffer; + + /* Parent reference */ + LPDIRECT3DDEVICE9 parentDevice; } IDirect3DVertexBuffer9Impl; /* --------------------- */ diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d679c14..b2c43a4 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -58,6 +58,7 @@ ULONG WINAPI IDirect3DVertexBuffer9Impl_ if (ref == 0) { IWineD3DVertexBuffer_Release(This->wineD3DVertexBuffer); + IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -180,6 +181,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea FIXME("(%p) call to IWineD3DDevice_CreateVertexBuffer failed\n", This); HeapFree(GetProcessHeap(), 0, object); } else { + IUnknown_AddRef(iface); + object->parentDevice = iface; TRACE("(%p) : Created vertex buffer %p\n", This, object); *ppVertexBuffer = (LPDIRECT3DVERTEXBUFFER9) object; }

1 0

Alexandre Julliard : setupapi: Copy the complete resource tree into the fake dlls.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: 605574bebf71e98a9ef656ed77d394547848a672 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=605574bebf71e98a9ef656e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 14:03:08 2006 +0200 setupapi: Copy the complete resource tree into the fake dlls. --- dlls/setupapi/fakedll.c | 123 +++++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 67 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 6c075f3..d8458f0 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -95,87 +95,76 @@ static inline void add_directory( struct info->nt->OptionalHeader.DataDirectory[idx].Size = size; } +/* find the limits of the resource data */ +static void get_resource_data( const IMAGE_RESOURCE_DIRECTORY *dir, const BYTE *root, + DWORD *rva_start, DWORD *rva_end ) +{ + const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; + int i; + + entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); + for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) + { + const void *ptr = root + entry->u2.s3.OffsetToDirectory; + if (entry->u2.s3.DataIsDirectory) get_resource_data( ptr, root, rva_start, rva_end ); + else + { + const IMAGE_RESOURCE_DATA_ENTRY *data = ptr; + *rva_start = min( *rva_start, data->OffsetToData ); + *rva_end = max( *rva_end, data->OffsetToData + data->Size ); + } + } +} + +/* fixup RVAs of resource data */ +static void fixup_resources( IMAGE_RESOURCE_DIRECTORY *dir, BYTE *root, int delta ) +{ + IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; + int i; + + entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); + for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++) + { + void *ptr = root + entry->u2.s3.OffsetToDirectory; + if (entry->u2.s3.DataIsDirectory) fixup_resources( ptr, root, delta ); + else + { + IMAGE_RESOURCE_DATA_ENTRY *data = ptr; + if (data->OffsetToData) data->OffsetToData += delta; + } + } +} + /* add version resources to the dll by copying them from the source module */ static BOOL add_version_resource( HMODULE module, struct dll_info *dll_info ) { - int i; BOOL ret = FALSE; - DWORD size, pos; + DWORD rva_start = ~0U, rva_end = 0, dir_size, total_size; + const IMAGE_RESOURCE_DIRECTORY *basedir; + const BYTE *data_start, *root; BYTE *buffer; - LDR_RESOURCE_INFO info; - IMAGE_RESOURCE_DIRECTORY *dir; - IMAGE_RESOURCE_DIRECTORY_ENTRY *entry; - IMAGE_RESOURCE_DATA_ENTRY *data; - const IMAGE_RESOURCE_DIRECTORY *basedir, *resdir; - const IMAGE_RESOURCE_DIRECTORY_ENTRY *src_entry; - const IMAGE_RESOURCE_DATA_ENTRY *src_data; if (!module) return TRUE; if (LdrFindResourceDirectory_U( module, NULL, 0, &basedir ) != STATUS_SUCCESS) return TRUE; - info.Type = VS_FILE_INFO; - info.Name = VS_VERSION_INFO; - if (LdrFindResourceDirectory_U( module, &info, 2, &resdir ) != STATUS_SUCCESS) return TRUE; - - size = 3 * sizeof(IMAGE_RESOURCE_DIRECTORY); - size += (resdir->NumberOfIdEntries + 2) * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY); - size += resdir->NumberOfIdEntries * sizeof(IMAGE_RESOURCE_DATA_ENTRY); - - buffer = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); - - /* types directory */ - dir = (IMAGE_RESOURCE_DIRECTORY *)buffer; - dir->NumberOfIdEntries = 1; - entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - entry->u1.s2.Id = info.Type; - entry->u2.s3.DataIsDirectory = 1; - entry->u2.s3.OffsetToDirectory = (BYTE *)(entry + 1) - buffer; - - /* names directory */ - dir = (IMAGE_RESOURCE_DIRECTORY *)(entry + 1); - dir->NumberOfIdEntries = 1; - entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - entry->u1.s2.Id = info.Name; - entry->u2.s3.DataIsDirectory = 1; - entry->u2.s3.OffsetToDirectory = (BYTE *)(entry + 1) - buffer; - - /* languages directory */ - dir = (IMAGE_RESOURCE_DIRECTORY *)(entry + 1); - *dir = *resdir; - entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1); - src_entry = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - memcpy( entry, src_entry, resdir->NumberOfIdEntries * sizeof(*entry) ); - - /* data entries */ - data = (IMAGE_RESOURCE_DATA_ENTRY *)(entry + resdir->NumberOfIdEntries); - pos = size; - for (i = 0; i < resdir->NumberOfIdEntries; i++) - { - void *ptr; - ULONG data_size; - src_data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)basedir + src_entry[i].u2.OffsetToData); - if (LdrAccessResource( module, src_data, &ptr, &data_size )) goto done; - - entry[i].u2.OffsetToData = (BYTE *)&data[i] - buffer; - data[i] = *src_data; - data[i].OffsetToData = dll_info->mem_pos + pos; - if (!xwrite( dll_info, ptr, data_size, dll_info->file_pos + pos )) goto done; - pos += (data_size + 3) & ~3; - } - if (!xwrite( dll_info, buffer, size, dll_info->file_pos )) goto done; - - add_directory( dll_info, IMAGE_DIRECTORY_ENTRY_RESOURCE, dll_info->mem_pos, pos ); - add_section( dll_info, ".rsrc", pos, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ ); + root = (const BYTE *)basedir; + get_resource_data( basedir, root, &rva_start, &rva_end ); + data_start = (const BYTE *)module + rva_start; + if (data_start <= root) return FALSE; + dir_size = data_start - root; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, dir_size ))) return FALSE; + memcpy( buffer, root, dir_size ); + fixup_resources( (IMAGE_RESOURCE_DIRECTORY *)buffer, buffer, dll_info->mem_pos + dir_size - rva_start ); + if (!xwrite( dll_info, buffer, dir_size, dll_info->file_pos )) goto done; + if (!xwrite( dll_info, data_start, rva_end - rva_start, dll_info->file_pos + dir_size )) goto done; + total_size = dir_size + rva_end - rva_start; + add_directory( dll_info, IMAGE_DIRECTORY_ENTRY_RESOURCE, dll_info->mem_pos, total_size ); + add_section( dll_info, ".rsrc", total_size, IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ ); ret = TRUE; done: HeapFree( GetProcessHeap(), 0, buffer ); return ret; } -void dummy(void) -{ - __asm__ __volatile__("movl $1,%eax; ret $4"); -} - /* build a complete fake dll, optionally using module as a source */ static BOOL build_fake_dll( HANDLE file, HMODULE module ) {

1 0

Antonio Codazzi : comctl32: Italian language updates.
by Alexandre Julliard April 3, 2006

April 3, 2006

Module: wine Branch: refs/heads/master Commit: c106f2fe6479ff830219acd8010935ebdf452105 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c106f2fe6479ff830219acd… Author: Antonio Codazzi <f_sophia(a)libero.it> Date: Sat Apr 1 17:51:58 2006 +0200 comctl32: Italian language updates. --- dlls/comctl32/comctl_It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/comctl_It.rc b/dlls/comctl32/comctl_It.rc index 8c4a880..b6b2e8c 100644 --- a/dlls/comctl32/comctl_It.rc +++ b/dlls/comctl32/comctl_It.rc @@ -34,13 +34,13 @@ END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" +CAPTION "Procedura guidata" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Indietro", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Anulla", IDCANCEL,178,138,50,14 + PUSHBUTTON "Annulla", IDCANCEL,178,138,50,14 PUSHBUTTON "Aiuto", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 @@ -50,19 +50,19 @@ END IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Personalitta la barra degli strumenti" +CAPTION "Personalizza la barra degli strumenti" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Chiudi", IDCANCEL,308,6,44,14 PUSHBUTTON "R&eimpostare", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "&Aiuto", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "Muovi &Su", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "Muovi &gi�", IDC_MOVEDN_BTN,308,91,44,14 + PUSHBUTTON "Muovi &Gi�", IDC_MOVEDN_BTN,308,91,44,14 LTEXT "&Tasti disponibili:", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Aggiungi ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- &Rimuovi", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Tast della barra degli strumenti:", -1,182,5,78,10 + LTEXT "&Tasti della barra degli strumenti:", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END

1 0