wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Eric Pouech : dbghelp: Extend the CPU object in order to manipulate context 's registers (getting context's content & register names).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 1d60aa6000e457b77e424bd63a2f95312efa4b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d60aa6000e457b77e424bd63… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:07:56 2010 +0100 dbghelp: Extend the CPU object in order to manipulate context's registers (getting context's content & register names). --- dlls/dbghelp/cpu_i386.c | 14 +++++ dlls/dbghelp/cpu_ppc.c | 14 +++++ dlls/dbghelp/cpu_x86_64.c | 124 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 4 + 4 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 32d600c..094b241 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -450,6 +450,18 @@ reg: fop 31 return reg; } +static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ + FIXME("NIY\n"); + return NULL; +} + +static const char* i386_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, 4, @@ -457,4 +469,6 @@ struct cpu cpu_i386 = { i386_stack_walk, NULL, i386_map_dwarf_register, + i386_fetch_context_reg, + i386_fetch_regname, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index 9a17aee..938e371 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -60,6 +60,18 @@ static unsigned ppc_map_dwarf_register(unsigned regno) return 0; } +static void* ppc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ + FIXME("NIY\n"); + return NULL; +} + +static const char* ppc_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + struct cpu cpu_ppc = { IMAGE_FILE_MACHINE_POWERPC, 4, @@ -67,4 +79,6 @@ struct cpu cpu_ppc = { ppc_stack_walk, NULL, ppc_map_dwarf_register, + ppc_fetch_context_reg, + ppc_fetch_regname, }; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 43af5e0..8d35d92 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -633,6 +633,128 @@ static unsigned x86_64_map_dwarf_register(unsigned regno) return reg; } +static void* x86_64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ +#ifdef __x86_64__ + switch (regno) + { + case CV_AMD64_RAX: *size = sizeof(ctx->Rax); return &ctx->Rax; + case CV_AMD64_RDX: *size = sizeof(ctx->Rdx); return &ctx->Rdx; + case CV_AMD64_RCX: *size = sizeof(ctx->Rcx); return &ctx->Rcx; + case CV_AMD64_RBX: *size = sizeof(ctx->Rbx); return &ctx->Rbx; + case CV_AMD64_RSI: *size = sizeof(ctx->Rsi); return &ctx->Rsi; + case CV_AMD64_RDI: *size = sizeof(ctx->Rdi); return &ctx->Rdi; + case CV_AMD64_RBP: *size = sizeof(ctx->Rbp); return &ctx->Rbp; + case CV_AMD64_RSP: *size = sizeof(ctx->Rsp); return &ctx->Rsp; + case CV_AMD64_R8: *size = sizeof(ctx->R8); return &ctx->R8; + case CV_AMD64_R9: *size = sizeof(ctx->R9); return &ctx->R9; + case CV_AMD64_R10: *size = sizeof(ctx->R10); return &ctx->R10; + case CV_AMD64_R11: *size = sizeof(ctx->R11); return &ctx->R11; + case CV_AMD64_R12: *size = sizeof(ctx->R12); return &ctx->R12; + case CV_AMD64_R13: *size = sizeof(ctx->R13); return &ctx->R13; + case CV_AMD64_R14: *size = sizeof(ctx->R14); return &ctx->R14; + case CV_AMD64_R15: *size = sizeof(ctx->R15); return &ctx->R15; + case CV_AMD64_RIP: *size = sizeof(ctx->Rip); return &ctx->Rip; + + case CV_AMD64_XMM0 + 0: *size = sizeof(ctx->u.s.Xmm0 ); return &ctx->u.s.Xmm0; + case CV_AMD64_XMM0 + 1: *size = sizeof(ctx->u.s.Xmm1 ); return &ctx->u.s.Xmm1; + case CV_AMD64_XMM0 + 2: *size = sizeof(ctx->u.s.Xmm2 ); return &ctx->u.s.Xmm2; + case CV_AMD64_XMM0 + 3: *size = sizeof(ctx->u.s.Xmm3 ); return &ctx->u.s.Xmm3; + case CV_AMD64_XMM0 + 4: *size = sizeof(ctx->u.s.Xmm4 ); return &ctx->u.s.Xmm4; + case CV_AMD64_XMM0 + 5: *size = sizeof(ctx->u.s.Xmm5 ); return &ctx->u.s.Xmm5; + case CV_AMD64_XMM0 + 6: *size = sizeof(ctx->u.s.Xmm6 ); return &ctx->u.s.Xmm6; + case CV_AMD64_XMM0 + 7: *size = sizeof(ctx->u.s.Xmm7 ); return &ctx->u.s.Xmm7; + case CV_AMD64_XMM8 + 0: *size = sizeof(ctx->u.s.Xmm8 ); return &ctx->u.s.Xmm8; + case CV_AMD64_XMM8 + 1: *size = sizeof(ctx->u.s.Xmm9 ); return &ctx->u.s.Xmm9; + case CV_AMD64_XMM8 + 2: *size = sizeof(ctx->u.s.Xmm10); return &ctx->u.s.Xmm10; + case CV_AMD64_XMM8 + 3: *size = sizeof(ctx->u.s.Xmm11); return &ctx->u.s.Xmm11; + case CV_AMD64_XMM8 + 4: *size = sizeof(ctx->u.s.Xmm12); return &ctx->u.s.Xmm12; + case CV_AMD64_XMM8 + 5: *size = sizeof(ctx->u.s.Xmm13); return &ctx->u.s.Xmm13; + case CV_AMD64_XMM8 + 6: *size = sizeof(ctx->u.s.Xmm14); return &ctx->u.s.Xmm14; + case CV_AMD64_XMM8 + 7: *size = sizeof(ctx->u.s.Xmm15); return &ctx->u.s.Xmm15; + + case CV_AMD64_ST0 + 0: *size = sizeof(ctx->u.s.Legacy[0]); return &ctx->u.s.Legacy[0]; + case CV_AMD64_ST0 + 1: *size = sizeof(ctx->u.s.Legacy[1]); return &ctx->u.s.Legacy[1]; + case CV_AMD64_ST0 + 2: *size = sizeof(ctx->u.s.Legacy[2]); return &ctx->u.s.Legacy[2]; + case CV_AMD64_ST0 + 3: *size = sizeof(ctx->u.s.Legacy[3]); return &ctx->u.s.Legacy[3]; + case CV_AMD64_ST0 + 4: *size = sizeof(ctx->u.s.Legacy[4]); return &ctx->u.s.Legacy[4]; + case CV_AMD64_ST0 + 5: *size = sizeof(ctx->u.s.Legacy[5]); return &ctx->u.s.Legacy[5]; + case CV_AMD64_ST0 + 6: *size = sizeof(ctx->u.s.Legacy[6]); return &ctx->u.s.Legacy[6]; + case CV_AMD64_ST0 + 7: *size = sizeof(ctx->u.s.Legacy[7]); return &ctx->u.s.Legacy[7]; + + case CV_AMD64_EFLAGS: *size = sizeof(ctx->EFlags); return &ctx->EFlags; + case CV_AMD64_ES: *size = sizeof(ctx->SegEs); return &ctx->SegEs; + case CV_AMD64_CS: *size = sizeof(ctx->SegCs); return &ctx->SegCs; + case CV_AMD64_SS: *size = sizeof(ctx->SegSs); return &ctx->SegSs; + case CV_AMD64_DS: *size = sizeof(ctx->SegDs); return &ctx->SegDs; + case CV_AMD64_FS: *size = sizeof(ctx->SegFs); return &ctx->SegFs; + case CV_AMD64_GS: *size = sizeof(ctx->SegGs); return &ctx->SegGs; + + } +#endif + FIXME("Unknown register %x\n", regno); + return NULL; +} + +static const char* x86_64_fetch_regname(unsigned regno) +{ + switch (regno) + { + case CV_AMD64_RAX: return "rax"; + case CV_AMD64_RDX: return "rdx"; + case CV_AMD64_RCX: return "rcx"; + case CV_AMD64_RBX: return "rbx"; + case CV_AMD64_RSI: return "rsi"; + case CV_AMD64_RDI: return "rdi"; + case CV_AMD64_RBP: return "rbp"; + case CV_AMD64_RSP: return "rsp"; + case CV_AMD64_R8: return "r8"; + case CV_AMD64_R9: return "r9"; + case CV_AMD64_R10: return "r10"; + case CV_AMD64_R11: return "r11"; + case CV_AMD64_R12: return "r12"; + case CV_AMD64_R13: return "r13"; + case CV_AMD64_R14: return "r14"; + case CV_AMD64_R15: return "r15"; + case CV_AMD64_RIP: return "rip"; + + case CV_AMD64_XMM0 + 0: return "xmm0"; + case CV_AMD64_XMM0 + 1: return "xmm1"; + case CV_AMD64_XMM0 + 2: return "xmm2"; + case CV_AMD64_XMM0 + 3: return "xmm3"; + case CV_AMD64_XMM0 + 4: return "xmm4"; + case CV_AMD64_XMM0 + 5: return "xmm5"; + case CV_AMD64_XMM0 + 6: return "xmm6"; + case CV_AMD64_XMM0 + 7: return "xmm7"; + case CV_AMD64_XMM8 + 0: return "xmm8"; + case CV_AMD64_XMM8 + 1: return "xmm9"; + case CV_AMD64_XMM8 + 2: return "xmm10"; + case CV_AMD64_XMM8 + 3: return "xmm11"; + case CV_AMD64_XMM8 + 4: return "xmm12"; + case CV_AMD64_XMM8 + 5: return "xmm13"; + case CV_AMD64_XMM8 + 6: return "xmm14"; + case CV_AMD64_XMM8 + 7: return "xmm15"; + + case CV_AMD64_ST0 + 0: return "st0"; + case CV_AMD64_ST0 + 1: return "st1"; + case CV_AMD64_ST0 + 2: return "st2"; + case CV_AMD64_ST0 + 3: return "st3"; + case CV_AMD64_ST0 + 4: return "st4"; + case CV_AMD64_ST0 + 5: return "st5"; + case CV_AMD64_ST0 + 6: return "st6"; + case CV_AMD64_ST0 + 7: return "st7"; + + case CV_AMD64_EFLAGS: return "eflags"; + case CV_AMD64_ES: return "es"; + case CV_AMD64_CS: return "cs"; + case CV_AMD64_SS: return "ss"; + case CV_AMD64_DS: return "ds"; + case CV_AMD64_FS: return "fs"; + case CV_AMD64_GS: return "gs"; + } + FIXME("Unknown register %x\n", regno); + return NULL; +} struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, @@ -641,4 +763,6 @@ struct cpu cpu_x86_64 = { x86_64_stack_walk, x86_64_find_runtime_function, x86_64_map_dwarf_register, + x86_64_fetch_context_reg, + x86_64_fetch_regname, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9f47b32..728e464 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -481,6 +481,10 @@ struct cpu /* dwarf dedicated information */ unsigned (*map_dwarf_register)(unsigned regno); + + /* context related maniputation */ + void* (*fetch_context_reg)(CONTEXT* context, unsigned regno, unsigned* size); + const char* (*fetch_regname)(unsigned regno); }; extern struct cpu* dbghelp_current_cpu;

1 0

Eric Pouech : dbghelp: Keep the . debug_frame section mapped when parsing dwarf debug_info ( needed for CFA management).
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 9851ebf792459c4e0efbff8fdb5a4f51e2990644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9851ebf792459c4e0efbff8fd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:07:50 2010 +0100 dbghelp: Keep the .debug_frame section mapped when parsing dwarf debug_info (needed for CFA management). --- dlls/dbghelp/dwarf.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e3c9ed9..a1410b2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -196,6 +196,8 @@ typedef struct dwarf2_parse_context_s struct dwarf2_module_info_s { dwarf2_section_t debug_loc; + dwarf2_section_t debug_frame; + dwarf2_section_t eh_frame; unsigned char word_size; }; @@ -2346,6 +2348,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect; + BOOL ret = TRUE; struct module_format* dwarf2_modfmt; @@ -2396,6 +2399,8 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_modfmt->module->format_info[DFI_DWARF] = dwarf2_modfmt; dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->eh_frame, fmap, ".eh_frame", NULL); while (mod_ctx.data < mod_ctx.end_data) {

1 0

Vincent Povirk : mscoree: Stub ClrCreateManagedInstance.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 949730736b6736bcc59821648250d5106a27ca5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=949730736b6736bcc59821648… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 26 16:10:43 2010 -0500 mscoree: Stub ClrCreateManagedInstance. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 9365f18..8e25cec 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -7,7 +7,7 @@ @ stub CallFunctionShim @ stub CloseCtrs -@ stub ClrCreateManagedInstance +@ stdcall ClrCreateManagedInstance(wstr ptr ptr) @ stub CoEEShutDownCOM @ stdcall CoInitializeCor(long) @ stub CoInitializeEE diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index a19f103..5b20c85 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -343,6 +343,12 @@ HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID return E_NOTIMPL; } +STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) +{ + FIXME("(%s,%s,%p)\n", debugstr_w(pTypeName), debugstr_guid(riid), ppObject); + return E_NOTIMPL; +} + BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) { FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags);

1 0

Alexandre Julliard : wine.inf: Some fake dlls should only be created for 32-bit.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: fc1fca5fbd1dadb9d0bac3e4c112254e9c87cc20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1fca5fbd1dadb9d0bac3e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 12:13:10 2010 +0100 wine.inf: Some fake dlls should only be created for 32-bit. --- tools/wine.inf.in | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7eac8b5..06f0707 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -28,7 +28,7 @@ signature="$CHICAGO$" [DefaultInstall] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDllsSection +WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni AddReg=\ Classes,\ @@ -53,7 +53,7 @@ AddReg=\ [DefaultInstall.NT] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDllsSection +WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni AddReg=\ Classes,\ @@ -79,7 +79,7 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection -WineFakeDlls=FakeDllsSection +WineFakeDlls=FakeDlls UpdateInis=SystemIni AddReg=\ Classes,\ @@ -2521,7 +2521,19 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wuapi.dll,1 16422,Internet Explorer,iexplore.exe,1 -[FakeDllsSection] +; 32bit-only fake dlls +[FakeDllsWin32] +10,,twain.dll,twain.dll16 +10,,twain_32.dll +10,,winhelp.exe,winhelp.exe16 +10,,winhlp32.exe +10,command,start.exe +10,system,ddeml.dll,ddeml.dll16 +11,,ddhelp.exe +11,,dosx.exe +11,,dsound.vxd + +[FakeDlls] ; create some directories first 10,help, 10,inf, @@ -2534,18 +2546,9 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,hh.exe 10,,notepad.exe 10,,regedit.exe -10,,twain.dll,twain.dll16 -10,,twain_32.dll -10,,winhelp.exe,winhelp.exe16 -10,,winhlp32.exe -10,command,start.exe -10,system,ddeml.dll,ddeml.dll16 -11,,ddhelp.exe -11,,dosx.exe -11,,dsound.vxd +11,,explorer.exe 11,,notepad.exe 11,,winetest.exe,- -11,,winhlp32.exe 12,,mountmgr.sys 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Alexandre Julliard : setupapi: Create proper AMD64 fake dlls on 64-bit.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0566db7b897231272d0321d5d9eceeca9010698d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0566db7b897231272d0321d5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 11:50:23 2010 +0100 setupapi: Create proper AMD64 fake dlls on 64-bit. --- dlls/setupapi/fakedll.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index ade6754..4090fa1 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -272,7 +272,11 @@ static BOOL build_fake_dll( HANDLE file ) nt = info.nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); /* some fields are copied from the source dll */ +#ifdef _WIN64 + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#else nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; +#endif nt->FileHeader.TimeDateStamp = 0; nt->FileHeader.Characteristics = IMAGE_FILE_DLL; nt->OptionalHeader.MajorLinkerVersion = 1;

1 0

Alexandre Julliard : setupapi: Only cleanup fake dlls once the whole section has been executed.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6836990e0b1143cad40d6f9cf54d85483e353cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6836990e0b1143cad40d6f9cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 11:50:01 2010 +0100 setupapi: Only cleanup fake dlls once the whole section has been executed. --- dlls/setupapi/fakedll.c | 1 + dlls/setupapi/install.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 3b5a47c..ade6754 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -630,5 +630,6 @@ void cleanup_fake_dlls(void) HeapFree( GetProcessHeap(), 0, file_buffer ); file_buffer = NULL; HeapFree( GetProcessHeap(), 0, handled_dlls ); + handled_dlls = NULL; handled_count = handled_total = 0; } diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index cb476af..354f105 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -713,7 +713,6 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) HeapFree( GetProcessHeap(), 0, path ); if (!ret) break; } - cleanup_fake_dlls(); return ret; } @@ -1095,7 +1094,9 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } else info.callback = NULL; - if (!iterate_section_fields( hinf, section, WineFakeDlls, fake_dlls_callback, NULL )) + if (iterate_section_fields( hinf, section, WineFakeDlls, fake_dlls_callback, NULL )) + cleanup_fake_dlls(); + else return FALSE; if (!iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info ))

1 0

Alexandre Julliard : makefiles: Don' t create font symlinks when fonts are disabled.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0ef63e16d6d5ae3a006ee7e4375d75067ba6dbb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef63e16d6d5ae3a006ee7e43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 11:44:13 2010 +0100 makefiles: Don't create font symlinks when fonts are disabled. --- aclocal.m4 | 8 +++++--- configure | 8 ++++++++ configure.ac | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 3a7765f..cc1d083 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -407,11 +407,13 @@ AC_DEFUN([WINE_CONFIG_EXTRA_DIR], dnl **** Create symlinks from config.status **** dnl -dnl Usage: WINE_CONFIG_SYMLINK(name,target) +dnl Usage: WINE_CONFIG_SYMLINK(name,target,enable) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1]) +m4_ifval([$3],[if test "x$[$3]" != xno; then +])AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl +m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1[]m4_ifval([$3],[ +fi])]) dnl **** Create a make rules file from config.status **** dnl diff --git a/configure b/configure index 3186e81..b02fe65 100755 --- a/configure +++ b/configure @@ -14107,14 +14107,22 @@ distclean:: } ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf +fi +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/symbol.ttf +fi +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahoma.ttf +fi +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf +fi ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine diff --git a/configure.ac b/configure.ac index fc05f10..25a1313 100644 --- a/configure.ac +++ b/configure.ac @@ -2134,10 +2134,10 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) -WINE_CONFIG_SYMLINK(fonts/marlett.ttf) -WINE_CONFIG_SYMLINK(fonts/symbol.ttf) -WINE_CONFIG_SYMLINK(fonts/tahoma.ttf) -WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf) +WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Alexandre Julliard : makefiles: Move wineapploader to the tools directory and get rid of the programs makefile .
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 718ea42fe4065e0f4a88c78270ddae0fe5e6a210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718ea42fe4065e0f4a88c7827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 09:29:10 2010 +0100 makefiles: Move wineapploader to the tools directory and get rid of the programs makefile. --- .gitignore | 2 +- Makefile.in | 2 +- aclocal.m4 | 6 +++--- configure | 7 +++---- configure.ac | 1 - programs/Makefile.in | 13 ------------- tools/Makefile.in | 4 ++++ {programs => tools}/wineapploader.in | 0 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index d0cf776..bb19dad 100644 --- a/.gitignore +++ b/.gitignore @@ -235,7 +235,6 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c -programs/wineapploader programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c @@ -260,6 +259,7 @@ tools/widl/parser.yy.c tools/widl/widl tools/widl/widl.man tools/wine.inf +tools/wineapploader tools/winebuild/winebuild tools/winebuild/winebuild.man tools/winedump/winedump diff --git a/Makefile.in b/Makefile.in index 62ac1f6..67507a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,7 +24,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ # Sub-directories that don't have a makefile -EXTRASUBDIRS = dlls libs +EXTRASUBDIRS = dlls libs programs # Destination directories for make install INSTALLDIRS = $(DESTDIR)$(bindir) diff --git a/aclocal.m4 b/aclocal.m4 index 1735fd0..3a7765f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -296,11 +296,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-lib:: programs \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +"install install-lib:: tools \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi]) diff --git a/configure b/configure index 74a51a8..3186e81 100755 --- a/configure +++ b/configure @@ -14009,11 +14009,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-lib:: programs \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +"install install-lib:: tools \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi @@ -14633,7 +14633,6 @@ wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader -wine_fn_config_makefile programs enable_programs wine_fn_config_program attrib enable_attrib install wine_fn_config_program cacls enable_cacls install wine_fn_config_program clock enable_clock install diff --git a/configure.ac b/configure.ac index 68d6f45..fc05f10 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,7 +2634,6 @@ WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader]) -WINE_CONFIG_MAKEFILE([programs]) WINE_CONFIG_PROGRAM(attrib,install) WINE_CONFIG_PROGRAM(cacls,install) WINE_CONFIG_PROGRAM(clock,install) diff --git a/programs/Makefile.in b/programs/Makefile.in deleted file mode 100644 index ebb7547..0000000 --- a/programs/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. -SRCDIR = @srcdir@ -VPATH = @srcdir@ - -PROGRAMS = wineapploader - -@MAKE_RULES@ - -all: $(PROGRAMS) - -wineapploader: wineapploader.in - sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2dd6f8a..5e005e0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,6 +15,7 @@ PROGRAMS = \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wine.inf \ + wineapploader \ wineprefixcreate MANPAGES = \ @@ -64,6 +65,9 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT) wine.inf: wine.inf.in LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.inf.in >$@ || ($(RM) $@ && false) +wineapploader: wineapploader.in + sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) + wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate diff --git a/programs/wineapploader.in b/tools/wineapploader.in similarity index 100% rename from programs/wineapploader.in rename to tools/wineapploader.in

1 0

Alexandre Julliard : makefiles: Install bindir programs from the top-level makefile.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 2fb302188dae3c0c35ab27c39d46bfde89c4da5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb302188dae3c0c35ab27c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 09:24:33 2010 +0100 makefiles: Install bindir programs from the top-level makefile. --- Makefile.in | 3 +++ aclocal.m4 | 14 +++++++++----- configure | 18 +++++++++--------- configure.ac | 3 --- programs/Makefile.in | 21 --------------------- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2697d2b..62ac1f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,6 +26,9 @@ VPATH = @srcdir@ # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs +# Destination directories for make install +INSTALLDIRS = $(DESTDIR)$(bindir) + all: wine @echo "Wine build complete." diff --git a/aclocal.m4 b/aclocal.m4 index 08f0bcd..1735fd0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -151,7 +151,6 @@ Makefile: Makefile.in Make.rules config.status AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_TEST_BINARIES,"") -AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") wine_fn_append_file () { @@ -291,14 +290,19 @@ wine_fn_config_program () programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE)" - if test -n "$ac_install" - then - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + test -n "$ac_install" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-lib:: programs/$ac_dir/Makefile __builddeps__ @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir + if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-lib:: programs \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +uninstall:: + \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi]) } diff --git a/configure b/configure index 7461096..74a51a8 100755 --- a/configure +++ b/configure @@ -596,7 +596,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS -ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES ALL_WINETEST_DEPENDS LDAPLIBS @@ -13854,8 +13853,6 @@ ALL_WINETEST_DEPENDS="# Test binaries" ALL_TEST_BINARIES="" -ALL_PROGRAM_BIN_INSTALL_DIRS="" - wine_fn_append_file () { @@ -14006,14 +14003,19 @@ else programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE)" - if test -n "$ac_install" - then - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + test -n "$ac_install" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-lib:: programs/$ac_dir/Makefile __builddeps__ @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir + if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-lib:: programs \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +uninstall:: + \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi fi } @@ -14704,8 +14706,6 @@ ac_config_commands="$ac_config_commands Makefile" ac_config_files="$ac_config_files Make.tmp:Makefile.in" -test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" - wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)" diff --git a/configure.ac b/configure.ac index 142d32a..68d6f45 100644 --- a/configure.ac +++ b/configure.ac @@ -2713,9 +2713,6 @@ _WINE_EOF AC_CONFIG_FILES([Make.tmp:Makefile.in]) -dnl Don't install in bin dir for Windows build -test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" - dnl Some final makefile rules WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], [uninstall:: diff --git a/programs/Makefile.in b/programs/Makefile.in index 9946998..ebb7547 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -3,11 +3,6 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ -ALL_INSTALLS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ -INSTALLPROGS = $(ALL_INSTALLS:programs/%=%) - -INSTALLDIRS = $(DESTDIR)$(bindir) - PROGRAMS = wineapploader @MAKE_RULES@ @@ -16,19 +11,3 @@ all: $(PROGRAMS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) - -# Rules for installation - -.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) - -$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy - $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@` - -install-progs.so: $(INSTALLPROGS:%=%/__installprog__) -install-progs: # nothing to do here - -@WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) - -uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS) - -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)

1 0

Paul Vriens : msxml3/tests: Skip some tests when network connection can' t be made.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: 719d904e351fa8fd1c7d1ebfbbae809ef27aa47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=719d904e351fa8fd1c7d1ebfb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Mar 26 16:42:15 2010 +0100 msxml3/tests: Skip some tests when network connection can't be made. --- dlls/msxml3/tests/domdoc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 08b5776..a743e51 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2750,6 +2750,12 @@ static void test_XMLHTTP(void) SysFreeString(str2); hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); + if (hr == INET_E_RESOURCE_NOT_FOUND) + { + skip("No connection could be made with crossover.codeweavers.com\n"); + IXMLHttpRequest_Release(pXMLHttpRequest); + return; + } todo_wine ok(hr == S_OK, "IXMLHttpRequest_send should have succeeded instead of failing with 0x%08x\n", hr); VariantClear(&varbody);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010