April 2010 - Wine-commits - list.winehq.org

Jörg Höhle : winmm: Improve MCI A/W mapping.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: db0df4c067fd6b701905aaef735c4729fca9d73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0df4c067fd6b701905aaef7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 28 20:01:15 2010 +0200 winmm: Improve MCI A/W mapping. --- dlls/winmm/mci.c | 117 +++++++++++++++++++++++++---------------------------- 1 files changed, 55 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db0df4c067fd6b701905a…

1 0

Paul Vriens : ntdll/tests: Make sure we can enumerate the directory.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 8b8d2038fbefd87d28d6fd0c20536ccd521d1c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8d2038fbefd87d28d6fd0c2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 14:44:30 2010 +0200 ntdll/tests: Make sure we can enumerate the directory. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7540d78..af5747a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -269,8 +269,8 @@ static void open_file_test(void) attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = pNtOpenFile( &dir, GENERIC_READ, &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW );

1 0

Paul Vriens : ntdll/tests: Enumerate one by one.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 35367700839ffe28ebe5dca9bd222cd4250ec90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35367700839ffe28ebe5dca9b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 14:52:50 2010 +0200 ntdll/tests: Enumerate one by one. --- dlls/ntdll/tests/file.c | 78 ++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index af5747a..08f8139 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -254,7 +254,7 @@ static void open_file_test(void) NTSTATUS status; HANDLE dir, root, handle; WCHAR path[MAX_PATH]; - BYTE data[8192]; + BYTE data[1024]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; @@ -320,56 +320,52 @@ static void open_file_test(void) /* try open by file id */ while (!pNtQueryDirectoryFile( dir, NULL, NULL, NULL, &io, data, sizeof(data), - FileIdBothDirectoryInformation, FALSE, NULL, restart )) + FileIdBothDirectoryInformation, TRUE, NULL, restart )) { FILE_ID_BOTH_DIRECTORY_INFORMATION *info = (FILE_ID_BOTH_DIRECTORY_INFORMATION *)data; restart = FALSE; - for (;;) + + if (!info->FileId.QuadPart) continue; + + nameW.Buffer = (WCHAR *)&info->FileId; + nameW.Length = sizeof(info->FileId); + info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; + attr.RootDirectory = dir; + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN_BY_FILE_ID | + ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, + "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + if (status == STATUS_NOT_IMPLEMENTED) + { + win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); + break; + } + if (!status) { - if (!info->FileId.QuadPart) goto next; - nameW.Buffer = (WCHAR *)&info->FileId; - nameW.Length = sizeof(info->FileId); - info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; - attr.RootDirectory = dir; + FILE_ALL_INFORMATION all_info; + + if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) + { + /* check that it's the same file */ + ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, + "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); + ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, + "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); + } + CloseHandle( handle ); + + /* try same thing from drive root */ + attr.RootDirectory = root; status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, + ok( status == STATUS_SUCCESS || status == STATUS_NOT_IMPLEMENTED, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); - if (status == STATUS_NOT_IMPLEMENTED) - { - win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); - break; - } - if (!status) - { - FILE_ALL_INFORMATION all_info; - - if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) - { - /* check that it's the same file */ - ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, - "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); - ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, - "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); - } - CloseHandle( handle ); - - /* try same thing from drive root */ - attr.RootDirectory = root; - status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN_BY_FILE_ID | - ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_NOT_IMPLEMENTED, - "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); - if (!status) CloseHandle( handle ); - } - next: - if (!info->NextEntryOffset) break; - info = (FILE_ID_BOTH_DIRECTORY_INFORMATION *)((char *)info + info->NextEntryOffset); + if (!status) CloseHandle( handle ); } }

1 0

Paul Vriens : ntdll/tests: We need a bigger buffer for NtQueryInformationFile.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: a155cf5f35cda968d5c695a3a1bd45d5e84888e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a155cf5f35cda968d5c695a3a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 14:59:58 2010 +0200 ntdll/tests: We need a bigger buffer for NtQueryInformationFile. --- dlls/ntdll/tests/file.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 08f8139..4e0512e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -345,14 +345,16 @@ static void open_file_test(void) } if (!status) { - FILE_ALL_INFORMATION all_info; + BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; - if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) + if (!pNtQueryInformationFile( handle, &io, buf, sizeof(buf), FileAllInformation )) { + FILE_ALL_INFORMATION *fai = (FILE_ALL_INFORMATION *)buf; + /* check that it's the same file */ - ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, + ok( info->EndOfFile.QuadPart == fai->StandardInformation.EndOfFile.QuadPart, "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); - ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, + ok( info->LastWriteTime.QuadPart == fai->BasicInformation.LastWriteTime.QuadPart, "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); } CloseHandle( handle );

1 0

Paul Vriens : ntdll/tests: Prevent test failures on Windows.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 42094d259875956083f12e4fc2f82d9394974d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42094d259875956083f12e4fc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 15:10:24 2010 +0200 ntdll/tests: Prevent test failures on Windows. --- dlls/ntdll/tests/file.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4e0512e..c483045 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -332,17 +332,20 @@ static void open_file_test(void) nameW.Length = sizeof(info->FileId); info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; attr.RootDirectory = dir; + /* We skip 'open' files by not specifying FILE_SHARE_WRITE */ status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_SHARE_READ, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED || status == STATUS_SHARING_VIOLATION, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); if (status == STATUS_NOT_IMPLEMENTED) { win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); break; } + if (status == STATUS_SHARING_VIOLATION) + trace( "%s is currently open\n", wine_dbgstr_w(info->FileName) ); if (!status) { BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; @@ -351,11 +354,15 @@ static void open_file_test(void) { FILE_ALL_INFORMATION *fai = (FILE_ALL_INFORMATION *)buf; - /* check that it's the same file */ - ok( info->EndOfFile.QuadPart == fai->StandardInformation.EndOfFile.QuadPart, - "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); - ok( info->LastWriteTime.QuadPart == fai->BasicInformation.LastWriteTime.QuadPart, - "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); + /* check that it's the same file/directory */ + + /* don't check the size for directories */ + if (!(info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + ok( info->EndOfFile.QuadPart == fai->StandardInformation.EndOfFile.QuadPart, + "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); + + ok( info->CreationTime.QuadPart == fai->BasicInformation.CreationTime.QuadPart, + "mismatched creation time for %s\n", wine_dbgstr_w(info->FileName)); } CloseHandle( handle );

1 0

Maarten Lankhorst : winmm: Remove timeGetTime.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 137469479c9645d3ce192638ac00fb522f864949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137469479c9645d3ce192638a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 7 18:57:06 2010 +0200 winmm: Remove timeGetTime. --- dlls/winmm/time.c | 18 ------------------ dlls/winmm/winmm.spec | 2 +- 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 85577c2..ee835c7 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -436,21 +436,3 @@ MMRESULT WINAPI timeEndPeriod(UINT wPeriod) } return 0; } - -/************************************************************************** - * timeGetTime [WINMM.@] - */ -DWORD WINAPI timeGetTime(void) -{ -#if defined(COMMENTOUTPRIORTODELETING) - DWORD count; - - /* FIXME: releasing the win16 lock here is a temporary hack (I hope) - * that lets mciavi32.dll run correctly - */ - if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count); - if (pFnRestoreThunkLock) pFnRestoreThunkLock(count); -#endif - - return GetTickCount(); -} diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 870b775..a1eaf81 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -147,7 +147,7 @@ @ stdcall timeEndPeriod(long) @ stdcall timeGetDevCaps(ptr long) @ stdcall timeGetSystemTime(ptr long) -@ stdcall timeGetTime() +@ stdcall timeGetTime() kernel32.GetTickCount @ stdcall timeKillEvent(long) @ stdcall timeSetEvent(long long ptr long long) @ stdcall waveInAddBuffer(long ptr long)

1 0

Alexandre Julliard : winmm/tests: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 36822bbd7d383474a0f1c65f947671ff0b88b549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36822bbd7d383474a0f1c65f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 15:39:32 2010 +0200 winmm/tests: Fix a pointer conversion warning on 64-bit. --- dlls/winmm/tests/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 3abdb1d..4ceec33 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -233,7 +233,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) /* The W95 ESFM Synthesis device reports NOTENABLED although * GetVolume by handle works and music plays. */ - rc = midiOutGetVolume((HMIDIOUT)udev, &ovolume); + rc = midiOutGetVolume(UlongToHandle(udev), &ovolume); ok((capsA.dwSupport & MIDICAPS_VOLUME) ? rc==MMSYSERR_NOERROR || broken(rc==MMSYSERR_NOTENABLED) : rc==MMSYSERR_NOTSUPPORTED, "midiOutGetVolume(dev=%d) rc=%s\n", udev, mmsys_error(rc)); /* Tests with midiOutSetvolume show that the midi mapper forwards

1 0

Christian Costa : d3dx9_36: Add support for 32-bit BGRA in D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 9e67f954f1e6c4c0f2cdeb9e2d83cfc0b3492af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e67f954f1e6c4c0f2cdeb9e2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 12 11:21:14 2010 +0200 d3dx9_36: Add support for 32-bit BGRA in D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 0a882b5..7504811 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -129,6 +129,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D info->Format = D3DFMT_R8G8B8; else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat32bppBGR)) info->Format = D3DFMT_X8R8G8B8; + else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat32bppBGRA)) + info->Format = D3DFMT_A8R8G8B8; else { WARN("Unsupported pixel format %s\n", debugstr_guid(&pixel_format)); hr = D3DXERR_INVALIDDATA;

1 0

Alexandre Julliard : winebuild: Add cfi annotations to the relay functions for i386.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 5c2db41cdc9ee899953aba57c864a64cc961c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2db41cdc9ee899953aba57c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 12:33:19 2010 +0200 winebuild: Add cfi annotations to the relay functions for i386. --- tools/winebuild/relay.c | 35 ++++++++++++++++++++++++++++++++++- tools/winebuild/spec16.c | 15 +++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 723bd17..1c84394 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -386,13 +386,20 @@ static void BuildCallTo16Core( int reg_func ) function_header( name ); /* Function entry sequence */ + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); output( "\tmovl %%esp, %%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); /* Save the 32-bit registers */ output( "\tpushl %%ebx\n" ); + output_cfi( ".cfi_rel_offset %%ebx,-4" ); output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-8" ); output( "\tpushl %%edi\n" ); + output_cfi( ".cfi_rel_offset %%edi,-12" ); output( "\t.byte 0x64\n\tmov %%gs,(%d)\n", GS_OFFSET ); /* Setup exception frame */ @@ -443,12 +450,18 @@ static void BuildCallTo16Core( int reg_func ) /* Restore the 32-bit registers */ output( "\tpopl %%edi\n" ); + output_cfi( ".cfi_same_value %%edi" ); output( "\tpopl %%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); output( "\tpopl %%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx" ); /* Function exit sequence */ output( "\tpopl %%ebp\n" ); + output_cfi( ".cfi_def_cfa %%esp,4" ); + output_cfi( ".cfi_same_value %%ebp" ); output( "\tret $12\n" ); + output_cfi( ".cfi_endproc" ); /* Start of the actual CallTo16 routine */ @@ -652,11 +665,18 @@ static void BuildCallTo32CBClient( int isEx ) /* Entry code */ + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); output( "\tpushl %%edi\n" ); + output_cfi( ".cfi_rel_offset %%edi,-4" ); output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-8" ); output( "\tpushl %%ebx\n" ); + output_cfi( ".cfi_rel_offset %%ebx,-12" ); /* Get pointer to temporary area and save the 32-bit stack pointer */ @@ -694,10 +714,16 @@ static void BuildCallTo32CBClient( int isEx ) /* Restore registers and return */ output( "\tpopl %%ebx\n" ); + output_cfi( ".cfi_same_value %%ebx" ); output( "\tpopl %%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); output( "\tpopl %%edi\n" ); + output_cfi( ".cfi_same_value %%edi" ); output( "\tpopl %%ebp\n" ); + output_cfi( ".cfi_def_cfa %%esp,4" ); + output_cfi( ".cfi_same_value %%ebp" ); output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( isEx ? "CALL32_CBClientEx" : "CALL32_CBClient" ); /* '16-bit' return stub */ @@ -757,8 +783,12 @@ static void build_call_from_regs_x86(void) /* Allocate some buffer space on the stack */ + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); - output( "\tmovl %%esp,%%ebp\n "); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); + output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); output( "\tleal -%d(%%esp),%%esp\n", STACK_SPACE ); /* Build the context structure */ @@ -846,11 +876,14 @@ static void build_call_from_regs_x86(void) output( "\tpopl %%ds\n" ); output( "\tiret\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" ); function_header( "__wine_restore_regs" ); + output_cfi( ".cfi_startproc" ); output( "\tmovl 4(%%esp),%%ecx\n" ); output( "\tjmp 2b\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( "__wine_restore_regs" ); } diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index e60b4bc..57ee533 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -312,12 +312,17 @@ static void output_call16_function( ORDDEF *odp ) output( "\t.align %d\n", get_alignment(4) ); output( "\t%s\n", func_declaration(name) ); output( "%s:\n", name ); + output_cfi( ".cfi_startproc" ); output( "\tpushl %%ebp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); + output_cfi( ".cfi_rel_offset %%ebp,0" ); output( "\tmovl %%esp,%%ebp\n" ); + output_cfi( ".cfi_def_cfa_register %%ebp" ); stack_words = 2; if (needs_ldt) { output( "\tpushl %%esi\n" ); + output_cfi( ".cfi_rel_offset %%esi,-4" ); stack_words++; if (UsePIC) { @@ -390,10 +395,16 @@ static void output_call16_function( ORDDEF *odp ) output( "\tcall *8(%%ebp)\n" ); - if (needs_ldt) output( "\tmovl -4(%%ebp),%%esi\n" ); - + if (needs_ldt) + { + output( "\tmovl -4(%%ebp),%%esi\n" ); + output_cfi( ".cfi_same_value %%esi" ); + } output( "\tleave\n" ); + output_cfi( ".cfi_def_cfa %%esp,4" ); + output_cfi( ".cfi_same_value %%ebp" ); output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); output_function_size( name ); }

1 0

Alexandre Julliard : libport: Make cfi annotations optional for x86_64.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 671eb84f9eca0ae7037873c99740eace5125a119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671eb84f9eca0ae7037873c99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 12:37:32 2010 +0200 libport: Make cfi annotations optional for x86_64. --- libs/port/interlocked.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index b2d4b52..8fb9972 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -164,8 +164,8 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add, "ret") __ASM_GLOBAL_FUNC(interlocked_cmpxchg128, "push %rbx\n\t" - ".cfi_adjust_cfa_offset 8\n\t" - ".cfi_rel_offset %rbx,0\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbx,0\n\t") "mov %rcx,%r8\n\t" /* compare */ "mov %rdx,%rbx\n\t" /* xchg_low */ "mov %rsi,%rcx\n\t" /* xchg_high */ @@ -176,8 +176,8 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg128, "mov %rdx,8(%r8)\n\t" "setz %al\n\t" "pop %rbx\n\t" - ".cfi_adjust_cfa_offset -8\n\t" - ".cfi_same_value %rbx\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbx\n\t") "ret") #elif defined(__powerpc__)

1 0