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

Jonathan Ernst : shell32: Updated French translation.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 992e3edc4bb75e936719d4935baf9f14a7c681d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992e3edc4bb75e936719d4935… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 2 09:02:08 2008 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 126 ++++++++++++++++++++++++++------------------ 1 files changed, 74 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992e3edc4bb75e936719d…

1 0

James Hawkins : ddraw: Delete the temporarily attached surface.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 735297871364007cf7e6a2a74209b8b2164611a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735297871364007cf7e6a2a74… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 31 16:19:29 2008 -0500 ddraw: Delete the temporarily attached surface. --- dlls/ddraw/tests/dsurface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 42c23a4..342b88a 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1271,7 +1271,10 @@ static void AttachmentTest(void) ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); if (SUCCEEDED(IDirectDrawSurface7_AddAttachedSurface(surface1, surface4))) + { + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface4); refrast = TRUE; + } hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface4); /* Succeeds on refrast */ if (refrast)

1 0

Simon Richter : winebuild: Fix import stub on ppc.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 238e1868b2b29df813250ae2961a68a9b744f2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=238e1868b2b29df813250ae29… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:51:01 2008 +0200 winebuild: Fix import stub on ppc. The address calculation was wrong, as the addition of the lower 16 bits is a signed addition, so if bit 15 is set, the upper 16 bits need to be incremented by one (so the hi portion of the symbol always references the symbol + 0x8000). --- tools/winebuild/import.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5b62512..5e0c172 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -699,30 +699,20 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tjmp $31,($0)\n" ); break; case CPU_POWERPC: - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) ); - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) ); - output( "\taddi %s, %s, -0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tstw %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) ); + output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); if (target_platform == PLATFORM_APPLE) { - output( "\tlis %s, ha16(%s+%d)\n", ppc_reg(9), table, pos ); - output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); + output( "\tlis %s, ha16(%s+%d+32768)\n", ppc_reg(31), table, pos ); + output( "\tla %s, lo16(%s+%d)(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) ); } else { - output( "\tlis %s, (%s+%d)@h\n", ppc_reg(9), table, pos ); - output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); + output( "\tlis %s, (%s+%d+32768)@h\n", ppc_reg(31), table, pos ); + output( "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(31), table, pos, ppc_reg(31) ); } - output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) ); - output( "\tmtctr %s\n", ppc_reg(7) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(8), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); - output( "\tlwz %s, 0(%s)\n", ppc_reg(9), ppc_reg(1) ); - output( "\taddi %s, %s, 0x4\n", ppc_reg(1), ppc_reg(1) ); + output( "\tlwz %s, 0(%s)\n", ppc_reg(31), ppc_reg(31) ); + output( "\tmtctr %s\n", ppc_reg(31) ); + output( "\tmr %s, %s\n", ppc_reg(31), ppc_reg(0) ); output( "\tbctr\n" ); break; }

1 0

Simon Richter : libwine: Implement wine_call_on_stack for ppc.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: ff77ba8e17a8e3902dbc8a2dcd5f6e66b7642348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff77ba8e17a8e3902dbc8a2dc… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:50:36 2008 +0200 libwine: Implement wine_call_on_stack for ppc. --- libs/wine/port.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index e2f7b0c..cbc00f9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -179,6 +179,23 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "popq %rbx\n\t" "popq %rbp\n\t" "ret") +#elif defined(__powerpc__) && defined(__GNUC__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "mflr 0\n\t" /* get return address */ + "stw 0, 4(1)\n\t" /* save return address */ + "subi 5, 5, 16\n\t" /* reserve space on new stack */ + "stw 1, 12(5)\n\t" /* store old sp */ + "mtctr 3\n\t" /* func -> ctr */ + "mr 3,4\n\t" /* args -> function param 1 (r3) */ + "mr 1,5\n\t" /* stack */ + "li 0, 0\n\t" /* zero */ + "stw 0, 0(1)\n\t" /* bottom of stack */ + "stwu 1, -16(1)\n\t" /* create a frame for this function */ + "bctrl\n\t" /* call ctr */ + "lwz 1, 28(1)\n\t" /* fetch old sp */ + "lwz 0, 4(1)\n\t" /* fetch return address */ + "mtlr 0\n\t" /* return address -> lr */ + "blr") /* return */ #else #error You must implement wine_switch_to_stack for your platform #endif

1 0

Simon Richter : libwine: Fix wine_switch_to_stack on ppc.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 2416533cd5187fdb0118c14a8a4bb48b5dc28e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2416533cd5187fdb0118c14a8… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:50:11 2008 +0200 libwine: Fix wine_switch_to_stack on ppc. The PowerPC ABI expects the caller to allocate space for the return address on the stack, above the current stack pointer, even if the address is passed in the link register (usually the address is stored at SP+4 by the callee). --- libs/wine/port.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index cbc00f9..859818f 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -90,14 +90,17 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mr r3,r4\n\t" /* args -> function param 1 (r3) */ "mr r1,r5\n\t" /* stack */ "subi r1,r1,0x100\n\t" /* adjust stack pointer */ - "bctr\n" /* call ctr */ + "bctrl\n" /* call ctr */ "1:\tb 1b") /* loop */ #elif defined(__powerpc__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_switch_to_stack, "mtctr 3\n\t" /* func -> ctr */ "mr 3,4\n\t" /* args -> function param 1 (r3) */ "mr 1,5\n\t" /* stack */ - "bctr\n\t" /* call ctr */ + "subi 1, 1, 16\n\t" /* allocate space for the callee */ + "li 0, 0\n\t" /* load zero */ + "stw 0, 0(1)\n\t" /* create a bottom stack frame */ + "bctrl\n\t" /* call ctr */ "1:\tb 1b") /* loop */ #elif defined(__ALPHA__) && defined(__GNUC__) __ASM_GLOBAL_FUNC( wine_switch_to_stack,

1 0

Hans Leidekker : wininet: Make resolving hostnames thread-safe.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 2f99450c49ccfe0e4cf2f8b39ac0e7b350d3dbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f99450c49ccfe0e4cf2f8b39… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:46:07 2008 +0200 wininet: Make resolving hostnames thread-safe. --- dlls/wininet/http.c | 4 +++- dlls/wininet/utility.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 119b49b..2326a7a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1346,6 +1346,8 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); + + TRACE("resolved %s to %s\n", debugstr_w(lpwhs->lpszServerName), szaddr); return TRUE; } @@ -3607,7 +3609,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.sin_family, SOCK_STREAM, 0)) { - WARN("Socket creation failed\n"); + WARN("Socket creation failed: %u\n", INTERNET_GetLastError()); goto lend; } diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 2597268..b0d9c9c 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +/* critical section to protect non-reentrant gethostbyname() */ +static CRITICAL_SECTION cs_gethostbyname; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_gethostbyname, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_gethostbyname") } +}; +static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; + #define TIME_STRING_LEN 30 time_t ConvertTimeString(LPCWSTR asctime) @@ -151,12 +161,15 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, name = HeapAlloc(GetProcessHeap(), 0, sz+1); WideCharToMultiByte( CP_UNIXCP, 0, lpszServerName, len, name, sz, NULL, NULL ); name[sz] = 0; + + EnterCriticalSection( &cs_gethostbyname ); phe = gethostbyname(name); HeapFree( GetProcessHeap(), 0, name ); if (NULL == phe) { TRACE("Failed to get hostname: (%s)\n", debugstr_w(lpszServerName) ); + LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } @@ -165,6 +178,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, psa->sin_family = phe->h_addrtype; psa->sin_port = htons(nServerPort); + LeaveCriticalSection( &cs_gethostbyname ); return TRUE; }

1 0

Hans Leidekker : wininet: Don' t send a handle closing callback for session handles created with InternetOpenUrl .
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 9d55252d41f2c6b578c76716c1d113588d700c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d55252d41f2c6b578c76716c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:46:34 2008 +0200 wininet: Don't send a handle closing callback for session handles created with InternetOpenUrl. --- dlls/wininet/internet.c | 10 +++++++--- dlls/wininet/tests/http.c | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d4734a4..a7a28c1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -181,9 +181,13 @@ BOOL WININET_Release( LPWININETHANDLEHEADER info ) TRACE( "closing connection %p\n", info); info->vtbl->CloseConnection( info ); } - INTERNET_SendCallback(info, info->dwContext, - INTERNET_STATUS_HANDLE_CLOSING, &info->hInternet, - sizeof(HINTERNET)); + /* Don't send a callback if this is a session handle created with InternetOpenUrl */ + if (info->htype != WH_HHTTPSESSION || !(info->dwInternalFlags & INET_OPENURL)) + { + INTERNET_SendCallback(info, info->dwContext, + INTERNET_STATUS_HANDLE_CLOSING, &info->hInternet, + sizeof(HINTERNET)); + } TRACE( "destroying object %p\n", info); if ( info->htype != WH_HINIT ) list_remove( &info->entry ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ccaf324..cd2aba2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1809,18 +1809,25 @@ struct context static void WINAPI cb(HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID info, DWORD size) { + INTERNET_ASYNC_RESULT *result = info; + struct context *ctx = (struct context *)context; + trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); if (status == INTERNET_STATUS_REQUEST_COMPLETE) { - INTERNET_ASYNC_RESULT *result = info; - struct context *ctx = (struct context *)context; - trace("request handle: 0x%08lx\n", result->dwResult); - ctx->req = (HINTERNET)result->dwResult; SetEvent(ctx->event); } + if (status == INTERNET_STATUS_HANDLE_CLOSING) + { + DWORD type = INTERNET_HANDLE_TYPE_CONNECT_HTTP, size = sizeof(type); + + if (InternetQueryOption(handle, INTERNET_OPTION_HANDLE_TYPE, &type, &size)) + ok(type != INTERNET_HANDLE_TYPE_CONNECT_HTTP, "unexpected callback\n"); + SetEvent(ctx->event); + } } static void test_open_url_async(void) @@ -1857,9 +1864,12 @@ static void test_open_url_async(void) ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "HttpQueryInfo failed\n"); ok(size > 0, "expected size > 0\n"); - CloseHandle(ctx.event); + ResetEvent(ctx.event); InternetCloseHandle(ctx.req); + WaitForSingleObject(ctx.event, INFINITE); + InternetCloseHandle(ses); + CloseHandle(ctx.event); } #define STATUS_STRING(status) \

1 0

Hans Leidekker : wininet: Return success from the InternetSetOption( INTERNET_OPTION_DISABLE_AUTODIAL) stub.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: a6dc4a9a442f7fcbe36d33eb71c7efda7c7f7b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc4a9a442f7fcbe36d33eb7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 31 21:47:01 2008 +0200 wininet: Return success from the InternetSetOption(INTERNET_OPTION_DISABLE_AUTODIAL) stub. --- dlls/wininet/internet.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a7a28c1..1ae8cce 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2323,6 +2323,9 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_SECURITY_FLAGS: FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n"); break; + case INTERNET_OPTION_DISABLE_AUTODIAL: + FIXME("Option INTERNET_OPTION_DISABLE_AUTODIAL; STUB\n"); + break; case 86: FIXME("86\n"); break;

1 0

Austin English : README: A few more updates.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: 1b81ee33be1a20ad5267ff4fba168cec5f4a39c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b81ee33be1a20ad5267ff4fb… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 30 11:44:24 2008 -0500 README: A few more updates. --- README | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README b/README index 46a4b1e..baa4929 100644 --- a/README +++ b/README @@ -29,8 +29,8 @@ especially the wealth of information found at http://www.winehq.org. To compile and run Wine, you must have one of the following: Linux version 2.0.36 or above - FreeBSD 6.2 or later - Solaris x86 2.5 or later + FreeBSD 7.0 or later + Solaris x86 9 or later NetBSD-current Mac OS X 10.4 or later @@ -44,12 +44,9 @@ Linux info: it's best to have a current kernel such as 2.4.x or 2.6.x. FreeBSD info: - Wine should build on FreeBSD 5.x, but versions before FreeBSD 7.0 will - generally not work properly. FreeBSD 6.3 has patches available to allow - Wine to run. See <http://wiki.freebsd.org/Wine> for more information. - - More information can be found in the FreeBSD ports tree at - <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>. + Wine will generally not work properly on versions before FreeBSD + 7.0. FreeBSD 6.3 has patches available to allow Wine to run. See + <http://wiki.freebsd.org/Wine> for more information. Solaris info: You will most likely need to build Wine with the GNU toolchain @@ -112,7 +109,7 @@ file). Then do a "make clean", and patch the release with: bunzip2 -c patch-file | patch -p1 where "patch-file" is the name of the patch file (something like -wine-0.9.x.diff.bz2). You can then re-run "./configure", and then +wine-1.0.x.diff.bz2). You can then re-run "./configure", and then run "make depend && make". @@ -135,16 +132,16 @@ Support area at http://www.winehq.org/ for configuration hints. When invoking Wine, you may specify the entire path to the executable, or a filename only. -For example: to run Solitaire: +For example: to run Notepad: - wine sol (using the search Path as specified in - wine sol.exe the config file to locate the file) + wine notepad (using the search Path as specified in + wine notepad.exe the config file to locate the file) - wine c:\\windows\\sol.exe (using DOS filename syntax) + wine c:\\windows\\notepad.exe (using DOS filename syntax) - wine ~/.wine/drive_c/windows/sol.exe (using Unix filename syntax) + wine ~/.wine/drive_c/windows/notepad.exe (using Unix filename syntax) - wine sol.exe /parameter1 -parameter2 parameter3 + wine notepad.exe /parameter1 -parameter2 parameter3 (calling program with parameters) Wine is not yet complete, so several programs may crash. In that crash

1 0

Simon Richter : winebuild: Fix branch mnemonic on ppc.
by Alexandre Julliard June 2, 2008

June 2, 2008

Module: wine Branch: master Commit: d1e277fb70ad512059db7a5fac39104388ea1fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e277fb70ad512059db7a5fa… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Sat May 31 10:49:49 2008 +0200 winebuild: Fix branch mnemonic on ppc. --- tools/winebuild/spec32.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 32a8299..5038579 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -368,7 +368,18 @@ void BuildSpec32File( DLLSPEC *spec ) else { output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tjmp 1f\n" ); + switch(target_cpu) + { + case CPU_x86: + case CPU_x86_64: + case CPU_ALPHA: + case CPU_SPARC: + output( "\tjmp 1f\n" ); + break; + case CPU_POWERPC: + output( "\tb 1f\n" ); + break; + } output( "__wine_spec_pe_header:\n" ); output( "\t.skip %u\n", 65536 + page_size ); output( "1:\n" );

1 0