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

Mikołaj Zalewski : winecfg: Update Polish translation.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 1eba09b86f13f37613f53e14e5a3968b3950d639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eba09b86f13f37613f53e14e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Apr 2 20:29:20 2008 +0200 winecfg: Update Polish translation. --- programs/winecfg/Pl.rc | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 78d7618..f0c347e 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -295,8 +295,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDC_SYSPARAMS_BUTTON "T�o kontrolek" - IDC_SYSPARAMS_BUTTON_TEXT "Tekst kontrolek" + IDC_SYSPARAMS_BUTTON "Kontrolki - t�o" + IDC_SYSPARAMS_BUTTON_TEXT "Kontrolki - tekst" IDC_SYSPARAMS_DESKTOP "Pulpit" IDC_SYSPARAMS_MENU "T�o menu" IDC_SYSPARAMS_MENU_TEXT "Tekst menu" @@ -312,4 +312,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "T�o nag��wka nieaktywnego okna" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Tytu� nieaktywnego okna" IDC_SYSPARAMS_MSGBOX_TEXT "Tekst okien komunikat�w" + IDC_SYSPARAMS_APPWORKSPACE "Wn�trze okna aplikacji" + IDC_SYSPARAMS_WINDOW_FRAME "Ramka okna" + IDC_SYSPARAMS_ACTIVE_BORDER "Obramowanie aktywnego okna" + IDC_SYSPARAMS_INACTIVE_BORDER "Obramowanie nieaktywnego okna" + IDC_SYSPARAMS_BUTTON_SHADOW "Kontrolki - cie�" + IDC_SYSPARAMS_GRAY_TEXT "Szary tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Kontrolki - pod�wietlenie" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Kontrolki - g��bszy cie�" + IDC_SYSPARAMS_BUTTON_LIGHT "Kontrolki - ja�niejszy cie�" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Kontrolki - alternatywne t�o" + IDC_SYSPARAMS_HOT_TRACKING "�ledzony element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient nag��wka aktywnego okna" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient nag��wka nieaktywnego okna" + IDC_SYSPARAMS_MENU_HILIGHT "Pod�wietlone menu" + IDC_SYSPARAMS_MENUBAR "Pasek menu" END

1 0

Austin English : Spelling fixes.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: b4f52938e4cbf80d28eb4852b9749a612097e822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f52938e4cbf80d28eb4852b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 2 15:10:47 2008 -0500 Spelling fixes. --- dlls/d3d9/tests/visual.c | 4 ++-- dlls/dmloader/container.c | 12 ++++++------ dlls/dmstyle/style.c | 12 ++++++------ dlls/dmusic/collection.c | 2 +- dlls/dnsapi/ns_name.c | 2 +- dlls/dplayx/dplay.c | 4 ++-- dlls/dplayx/dplayx_global.c | 16 ++++++++-------- dlls/dplayx/dplayx_main.c | 6 +++--- dlls/dplayx/dplobby.c | 4 ++-- dlls/dplayx/tests/dplayx.c | 2 +- dlls/dsound/mixer.c | 6 +++--- dlls/faultrep/faultrep.c | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4f52938e4cbf80d28eb4…

1 0

Alexandre Julliard : winedevice: Apply relocations to the driver in cases where the loader doesn't do it.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 52ca8cd3ce40f11dd846739da6c017db0430e1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ca8cd3ce40f11dd846739da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:40:27 2008 +0200 winedevice: Apply relocations to the driver in cases where the loader doesn't do it. --- programs/winedevice/device.c | 51 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5e9c322..d48017a 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "ntstatus.h" @@ -58,6 +61,52 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return NULL; } +/* load the driver module file */ +static HMODULE load_driver_module( const WCHAR *name ) +{ + const IMAGE_NT_HEADERS *nt; + size_t page_size = getpagesize(); + int delta; + HMODULE module = LoadLibraryW( name ); + + if (!module) return NULL; + nt = RtlImageNtHeader( module ); + + if (!(delta = (char *)module - (char *)nt->OptionalHeader.ImageBase)) return module; + + /* the loader does not apply relocations to non page-aligned binaries or executables, + * we have to do it ourselves */ + + if (nt->OptionalHeader.SectionAlignment < page_size || + !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) + { + ULONG size; + DWORD old; + IMAGE_BASE_RELOCATION *rel, *end; + + if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) + { + WINE_TRACE( "%s: relocating from %p to %p\n", + wine_dbgstr_w(name), (char *)module - delta, module ); + end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); + while (rel < end && rel->SizeOfBlock) + { + void *page = (char *)module + rel->VirtualAddress; + VirtualProtect( page, page_size, PAGE_EXECUTE_READWRITE, &old ); + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, page_size, old, NULL ); + if (!rel) goto error; + } + } + } + return module; + +error: + FreeLibrary( module ); + return NULL; +} + /* call the driver init entry point */ static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) { @@ -146,7 +195,7 @@ static BOOL load_driver(void) WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); - module = LoadLibraryW( str ); + module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); if (!module) return FALSE;

1 0

Alexandre Julliard : ntdll: Use LdrProcessRelocationBlock to apply relocations.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: ce21f2924f776956654e5af4dab5a1e0153f3eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce21f2924f776956654e5af4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:39:22 2008 +0200 ntdll: Use LdrProcessRelocationBlock to apply relocations. Don't apply relocations to non page-aligned binaries. --- dlls/ntdll/virtual.c | 107 +++++++------------------------------------------ 1 files changed, 16 insertions(+), 91 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a5b299d..812c9bd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -880,76 +880,6 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz /*********************************************************************** - * do_relocations - * - * Apply the relocations to a mapped PE image - */ -static int do_relocations( char *base, const IMAGE_DATA_DIRECTORY *dir, - int delta, SIZE_T total_size ) -{ - IMAGE_BASE_RELOCATION *rel; - - TRACE_(module)( "relocating from %p-%p to %p-%p\n", - base - delta, base - delta + total_size, base, base + total_size ); - - for (rel = (IMAGE_BASE_RELOCATION *)(base + dir->VirtualAddress); - ((char *)rel < base + dir->VirtualAddress + dir->Size) && rel->SizeOfBlock; - rel = (IMAGE_BASE_RELOCATION*)((char*)rel + rel->SizeOfBlock) ) - { - char *page = base + rel->VirtualAddress; - WORD *TypeOffset = (WORD *)(rel + 1); - int i, count = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(*TypeOffset); - - if (!count) continue; - - /* sanity checks */ - if ((char *)rel + rel->SizeOfBlock > base + dir->VirtualAddress + dir->Size) - { - ERR_(module)("invalid relocation %p,%x,%d at %p,%x,%x\n", - rel, rel->VirtualAddress, rel->SizeOfBlock, - base, dir->VirtualAddress, dir->Size ); - return 0; - } - - if (page > base + total_size) - { - WARN_(module)("skipping %d relocations for page %p beyond module %p-%p\n", - count, page, base, base + total_size ); - continue; - } - - TRACE_(module)("%d relocations for page %x\n", count, rel->VirtualAddress); - - /* patching in reverse order */ - for (i = 0 ; i < count; i++) - { - int offset = TypeOffset[i] & 0xFFF; - int type = TypeOffset[i] >> 12; - switch(type) - { - case IMAGE_REL_BASED_ABSOLUTE: - break; - case IMAGE_REL_BASED_HIGH: - *(short*)(page+offset) += HIWORD(delta); - break; - case IMAGE_REL_BASED_LOW: - *(short*)(page+offset) += LOWORD(delta); - break; - case IMAGE_REL_BASED_HIGHLOW: - *(int*)(page+offset) += delta; - /* FIXME: if this is an exported address, fire up enhanced logic */ - break; - default: - FIXME_(module)("Unknown/unsupported fixup type %d.\n", type); - break; - } - } - } - return 1; -} - - -/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -1055,16 +985,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz VIRTUAL_SetProt( view, ptr, total_size, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); - /* perform relocations if necessary */ - /* FIXME: not 100% compatible, Windows doesn't do this for non page-aligned binaries */ - if (ptr != base) - { - const IMAGE_DATA_DIRECTORY *relocs; - relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - if (relocs->VirtualAddress && relocs->Size) - do_relocations( ptr, relocs, ptr - base, total_size ); - } - + /* no relocations are performed on non page-aligned binaries */ goto done; } @@ -1167,27 +1088,31 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !NtCurrentTeb()->Peb->ImageBaseAddress) ) { + int delta = ptr - base; + IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; - relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { - WARN_(module)( "Need to relocate module from addr %lx, but there are no relocation records\n", - (ULONG_PTR)nt->OptionalHeader.ImageBase ); + WARN_(module)( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, ptr ); status = STATUS_CONFLICTING_ADDRESSES; goto error; } - /* FIXME: If we need to relocate a system DLL (base > 2GB) we should - * really make sure that the *new* base address is also > 2GB. - * Some DLLs really check the MSB of the module handle :-/ - */ - if ((nt->OptionalHeader.ImageBase & 0x80000000) && !((ULONG_PTR)base & 0x80000000)) - ERR_(module)( "Forced to relocate system DLL (base > 2GB). This is not good.\n" ); + TRACE_(module)( "relocating from %p-%p to %p-%p\n", + base, base + total_size, ptr, ptr + total_size ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); + end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); - if (!do_relocations( ptr, relocs, ptr - base, total_size )) + while (rel < end && rel->SizeOfBlock) { - goto error; + rel = LdrProcessRelocationBlock( ptr + rel->VirtualAddress, + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) goto error; } }

1 0

Maarten Lankhorst : quartz: Implement seeking on the null renderer.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 9c0ea9eaa8ef3faacd27b759153a435739825418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0ea9eaa8ef3faacd27b7591… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 11:57:58 2008 -0700 quartz: Implement seeking on the null renderer. --- dlls/quartz/nullrenderer.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index d494ca5..6b543c5 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -65,6 +65,7 @@ typedef struct NullRendererImpl IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; + MediaSeekingImpl mediaSeeking; } NullRendererImpl; static const IMemInputPinVtbl MemInputPin_Vtbl = @@ -145,6 +146,62 @@ static HRESULT NullRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_OK; } +static inline NullRendererImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (NullRendererImpl *)((char*)iface - FIELD_OFFSET(NullRendererImpl, mediaSeeking.lpVtbl)); +} + +static HRESULT WINAPI NullRendererImpl_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + NullRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI NullRendererImpl_Seeking_AddRef(IMediaSeeking * iface) +{ + NullRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI NullRendererImpl_Seeking_Release(IMediaSeeking * iface) +{ + NullRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = +{ + NullRendererImpl_Seeking_QueryInterface, + NullRendererImpl_Seeking_AddRef, + NullRendererImpl_Seeking_Release, + MediaSeekingImpl_GetCapabilities, + MediaSeekingImpl_CheckCapabilities, + MediaSeekingImpl_IsFormatSupported, + MediaSeekingImpl_QueryPreferredFormat, + MediaSeekingImpl_GetTimeFormat, + MediaSeekingImpl_IsUsingTimeFormat, + MediaSeekingImpl_SetTimeFormat, + MediaSeekingImpl_GetDuration, + MediaSeekingImpl_GetStopPosition, + MediaSeekingImpl_GetCurrentPosition, + MediaSeekingImpl_ConvertTimeFormat, + MediaSeekingImpl_SetPositions, + MediaSeekingImpl_GetPositions, + MediaSeekingImpl_GetAvailable, + MediaSeekingImpl_SetRate, + MediaSeekingImpl_GetRate, + MediaSeekingImpl_GetPreroll +}; + +static HRESULT NullRendererImpl_Change(IBaseFilter *iface) +{ + TRACE("(%p)\n", iface); + return S_OK; +} + HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -181,6 +238,9 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { pNullRenderer->ppPins[0] = (IPin *)pNullRenderer->pInputPin; + MediaSeekingImpl_Init((IBaseFilter*)pNullRenderer, NullRendererImpl_Change, NullRendererImpl_Change, NullRendererImpl_Change, &pNullRenderer->mediaSeeking, &pNullRenderer->csFilter); + pNullRenderer->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; + *ppv = (LPVOID)pNullRenderer; } else @@ -212,6 +272,8 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->mediaSeeking; if (*ppv) {

1 0

Maarten Lankhorst : quartz: Fix stop_playback used in pullpin.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 9d6239bdace63b9148fb03b8c24965a4fa28b43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6239bdace63b9148fb03b8c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 10:45:32 2008 -0700 quartz: Fix stop_playback used in pullpin. --- dlls/quartz/pin.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 686669e..270a3c5 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1517,7 +1517,7 @@ HRESULT PullPin_PauseProcessing(PullPin * This) PullPin_WaitForStateChange(This, INFINITE); EnterCriticalSection(This->pin.pCritSec); - This->stop_playback = 0; + This->stop_playback = 1; LeaveCriticalSection(This->pin.pCritSec); ResetEvent(This->hEventStateChanged); @@ -1535,7 +1535,7 @@ HRESULT PullPin_StopProcessing(PullPin * This) { PullPin_WaitForStateChange(This, INFINITE); - This->stop_playback = 0; + This->stop_playback = 1; ResetEvent(This->hEventStateChanged); if (!QueueUserAPC(PullPin_Thread_Stop, This->hThread, (ULONG_PTR)This))

1 0

Frans Kool : shell32: Corrected/added Dutch translations.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 46ab1b2b1ee8252d0a5bfec498349437359e0986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ab1b2b1ee8252d0a5bfec49… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 2 14:05:56 2008 +0200 shell32: Corrected/added Dutch translations. --- dlls/shell32/shell32_Nl.rc | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 8c6f0b2..d22a07a 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -113,7 +114,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDD_FOLDER, 10, 156, 40, 12 + LTEXT "Map:", IDD_FOLDER, 10, 156, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, @@ -143,10 +144,12 @@ CAPTION "Info %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + PUSHBUTTON "Wine &licentie...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 + LTEXT "Draait op %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine is geschreven door:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } @@ -249,3 +252,21 @@ STRINGTABLE IDS_NEWFOLDER "Nieuwe Map" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Wine Licentie" +/* Only translated the title, since there is no official translation of the LGPL */ +IDS_LICENSE, +"Wine 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.\n\n\ +Wine 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.\n\n\ +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." +}

1 0

Alexandre Julliard : ntdll: Implemented LdrProcessRelocationBlock.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: fca606774864794ddc29745f076a8b2d55c1da48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca606774864794ddc29745f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:38:51 2008 +0200 ntdll: Implemented LdrProcessRelocationBlock. --- dlls/ntdll/loader.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1091c32..b0000b8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2035,6 +2035,41 @@ NTSTATUS WINAPI LdrAddRefDll( ULONG flags, HMODULE module ) } +/*********************************************************************** + * LdrProcessRelocationBlock (NTDLL.@) + * + * Apply relocations to a given page of a mapped PE image. + */ +IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count, + USHORT *relocs, INT delta ) +{ + while (count--) + { + USHORT offset = *relocs & 0xfff; + int type = *relocs >> 12; + switch(type) + { + case IMAGE_REL_BASED_ABSOLUTE: + break; + case IMAGE_REL_BASED_HIGH: + *(short *)((char *)page + offset) += HIWORD(delta); + break; + case IMAGE_REL_BASED_LOW: + *(short *)((char *)page + offset) += LOWORD(delta); + break; + case IMAGE_REL_BASED_HIGHLOW: + *(int *)((char *)page + offset) += delta; + break; + default: + FIXME("Unknown/unsupported fixup type %x.\n", type); + return NULL; + } + relocs++; + } + return (IMAGE_BASE_RELOCATION *)relocs; /* return address of next block */ +} + + /****************************************************************** * LdrQueryProcessModuleInformation * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2d27d61..23ee968 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -72,7 +72,7 @@ @ stub LdrLoadAlternateResourceModule @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) -@ stub LdrProcessRelocationBlock +@ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stub LdrQueryImageFileExecutionOptions @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) @ stub LdrSetAppCompatDllRedirectionCallback diff --git a/include/winternl.h b/include/winternl.h index eafbbed..39339c2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1844,6 +1844,7 @@ NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, UL NTSYSAPI void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); +IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void);

1 0

Frans Kool : winecfg: Added missing Dutch translations.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: d2dd8f94db5514a24768e1894172c5659a6a585c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dd8f94db5514a24768e1894… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 2 14:24:16 2008 +0200 winecfg: Added missing Dutch translations. --- programs/winecfg/Nl.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index c9c5cd3..5fb6929 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -309,4 +309,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inactieve Titel Balk" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactieve Title Tekst" IDC_SYSPARAMS_MSGBOX_TEXT "Melding Window Tekst" + IDC_SYSPARAMS_APPWORKSPACE "Applicatie Werkruimte" + IDC_SYSPARAMS_WINDOW_FRAME "Window Raamwerk" + IDC_SYSPARAMS_ACTIVE_BORDER "Actieve Rand" + IDC_SYSPARAMS_INACTIVE_BORDER "Inactieve Rand" + IDC_SYSPARAMS_BUTTON_SHADOW "Knoppen Schaduw" + IDC_SYSPARAMS_GRAY_TEXT "Grijze Tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Knoppen Gemarkeerd" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Knoppen Donkere Schaduw" + IDC_SYSPARAMS_BUTTON_LIGHT "Knoppen Licht" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Knoppen Alternatieve Achtergrond" + IDC_SYSPARAMS_HOT_TRACKING "'Hot-Tracked' Onderdeel" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Actieve Titelbalk Verloop" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactieve Titelbalk Verloop" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Gemarkeerd" + IDC_SYSPARAMS_MENUBAR "Menubalk" END

1 0

Stefan Dösinger : ddraw: Remove some leftover test debug output.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: c1503a2579b10ef2f41831f50b1bff0978504b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1503a2579b10ef2f41831f50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 22:40:07 2008 +0100 ddraw: Remove some leftover test debug output. --- dlls/ddraw/tests/dsurface.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 99c45fd..7ff1fe7 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1504,7 +1504,6 @@ static void CubeMapTest(void) IDirectDrawSurface7_EnumAttachedSurfaces(cubemap, &num, CubeTestLvl1Enum); - trace("Enumerated %d surfaces in total\n", num); ok(num == 6, "Surface has %d attachments\n", num); IDirectDrawSurface7_Release(cubemap); @@ -2110,7 +2109,6 @@ static void SizeTest(void) desc.dwSize = sizeof(desc); desc.dwFlags = DDSD_CAPS; desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; - trace("before offscreenplain create dsurface = %p\n", dsurface); ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without a size info returned %08x (dsurface=%p)\n", ret, dsurface); if(dsurface)

1 0