August 2007 - Wine-Commits - list.winehq.org

Francois Gouget : bcrypt: Add a skeleton bcrypt.h header and use it.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: 5fcce569ceca651cdf7e62c2853796a29af420fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fcce569ceca651cdf7e62c28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:31:09 2007 +0200 bcrypt: Add a skeleton bcrypt.h header and use it. --- include/Makefile.in | 1 + include/bcrypt.h | 43 +++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 2 +- 3 files changed, 45 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index bc48cfe..4607006 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -78,6 +78,7 @@ SRCDIR_INCLUDES = \ axextend.idl \ basetsd.h \ basetyps.h \ + bcrypt.h \ cderr.h \ cfgmgr32.h \ cguid.h \ diff --git a/include/bcrypt.h b/include/bcrypt.h new file mode 100644 index 0000000..a3d7fe0 --- /dev/null +++ b/include/bcrypt.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2007 Francois Gouget + * + * This library 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. + * + * This library 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. + * + * 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 + */ + +#ifndef __WINE_BCRYPT_H +#define __WINE_BCRYPT_H + +#ifndef WINAPI +#define WINAPI __stdcall +#endif + +#ifndef IN +#define IN +#endif + +#ifndef OUT +#define OUT +#endif + +#ifndef OPTIONAL +#define OPTIONAL +#endif + +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + +#endif /* __WINE_BCRYPT_H */ diff --git a/include/wincrypt.h b/include/wincrypt.h index 93e9459..3213b4a 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -24,7 +24,7 @@ extern "C" { #endif -/* FIXME: #include <bcrypt.h> */ +#include <bcrypt.h> /* FIXME: #include <ncrypt.h> */ /* some typedefs for function parameters */

1 0

Francois Gouget : server: Fix the crashed process exit code when the debugger exits without detaching . Add a conformance test.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: b6aa247093affa7eb0e34a96dcd803597d4d5145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6aa247093affa7eb0e34a96d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:35:54 2007 +0200 server: Fix the crashed process exit code when the debugger exits without detaching. Add a conformance test. --- dlls/kernel32/tests/debugger.c | 51 ++++++++++++++++++++++++++++++--------- server/debugger.c | 2 +- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 19ab840..4328232 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -25,6 +25,10 @@ #include <winreg.h> #include "wine/test.h" +#ifndef STATUS_DEBUGGER_INACTIVE +#define STATUS_DEBUGGER_INACTIVE ((NTSTATUS) 0xC0000354) +#endif + static int myARGC; static char** myARGV; @@ -113,6 +117,8 @@ typedef struct DWORD pid; BOOL debug_rc; DWORD debug_err; + BOOL attach_rc; + DWORD attach_err; } debugger_blackbox_t; static void doDebugger(int argc, char** argv) @@ -124,8 +130,18 @@ static void doDebugger(int argc, char** argv) blackbox.argc=argc; logfile=(argc >= 4 ? argv[3] : NULL); blackbox.pid=(argc >= 5 ? atol(argv[4]) : 0); + + if (strstr(myARGV[2], "attach")) + { + blackbox.attach_rc=DebugActiveProcess(blackbox.pid); + if (!blackbox.attach_rc) + blackbox.attach_err=GetLastError(); + } + else + blackbox.attach_rc=TRUE; + debug_event=(argc >= 6 ? (HANDLE)atol(argv[5]) : NULL); - if (debug_event && strcmp(myARGV[2], "dbgnoevent") != 0) + if (debug_event && strstr(myARGV[2], "event")) { blackbox.debug_rc=SetEvent(debug_event); if (!blackbox.debug_rc) @@ -135,7 +151,7 @@ static void doDebugger(int argc, char** argv) blackbox.debug_rc=TRUE; get_events(logfile, &start_event, &done_event); - if (strcmp(myARGV[2], "dbgnoevent") != 0) + if (strstr(myARGV[2], "order")) { trace("debugger: waiting for the start signal...\n"); WaitForSingleObject(start_event, INFINITE); @@ -149,7 +165,7 @@ static void doDebugger(int argc, char** argv) ExitProcess(0xdeadbeef); } -static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) +static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) { DWORD ret; HANDLE start_event, done_event; @@ -167,8 +183,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) get_file_name(dbglog); get_events(dbglog, &start_event, &done_event); - cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(debugger)+1+strlen(dbglog)+34+1); - sprintf(cmd, "%s debugger %s %s %%ld %%ld", argv0, debugger, dbglog); + cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(dbgtasks)+1+strlen(dbglog)+34+1); + sprintf(cmd, "%s debugger %s %s %%ld %%ld", argv0, dbgtasks, dbglog); ret=RegSetValueExA(hkey, "debugger", 0, REG_SZ, (BYTE*)cmd, strlen(cmd)+1); ok(ret == ERROR_SUCCESS, "unable to set AeDebug/debugger: ret=%d\n", ret); HeapFree(GetProcessHeap(), 0, cmd); @@ -190,11 +206,22 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) trace("waiting for child exit...\n"); ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); ok(GetExitCodeProcess(info.hProcess, &exit_code), "GetExitCodeProcess failed: err=%d\n", GetLastError()); - ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); + if (strstr(dbgtasks, "code2")) + { + /* If, after attaching to the debuggee, the debugger exits without + * detaching, then the debuggee gets a special exit code. + */ + ok(exit_code == 0xffffffff || /* Win 9x */ + exit_code == 0x80 || /* NT4 */ + exit_code == STATUS_DEBUGGER_INACTIVE, /* Win >= XP */ + "wrong exit code : %08x\n", exit_code); + } + else + ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x instead of STATUS_ACCESS_VIOLATION\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */ - if (strcmp(debugger, "dbgnoevent") != 0) + if (strstr(dbgtasks, "order")) ok(SetEvent(start_event), "SetEvent(start_event) failed\n"); trace("waiting for the debugger...\n"); @@ -206,6 +233,7 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* debugger) ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid); ok(dbg_blackbox.debug_rc, "debugger: SetEvent(debug_event) failed err=%d\n", dbg_blackbox.debug_err); + ok(dbg_blackbox.attach_rc, "DebugActiveProcess(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.attach_err); assert(DeleteFileA(dbglog) != 0); assert(DeleteFileA(childlog) != 0); @@ -296,8 +324,9 @@ static void test_ExitCode(void) strstr((char*)debugger_val, "winedbg --auto")) crash_and_winedbg(hkey, test_exe); - crash_and_debug(hkey, test_exe, "dbgevent"); - crash_and_debug(hkey, test_exe, "dbgnoevent"); + crash_and_debug(hkey, test_exe, "dbg,none"); + crash_and_debug(hkey, test_exe, "dbg,event,order"); + crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (disposition == REG_CREATED_NEW_KEY) { @@ -333,9 +362,7 @@ START_TEST(debugger) { doCrash(myARGC, myARGV); } - else if (myARGC >= 3 && - (strcmp(myARGV[2], "dbgevent") == 0 || - strcmp(myARGV[2], "dbgnoevent") == 0)) + else if (myARGC >= 3 && strncmp(myARGV[2], "dbg,", 4) == 0) { doDebugger(myARGC, myARGV); } diff --git a/server/debugger.c b/server/debugger.c index ee8ef10..4d0ac3d 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -542,7 +542,7 @@ void debug_exit_thread( struct thread *thread ) if (thread->debug_ctx->kill_on_exit) { /* kill all debugged processes */ - kill_debugged_processes( thread, thread->exit_code ); + kill_debugged_processes( thread, STATUS_DEBUGGER_INACTIVE ); } else {

1 0

Stefan Leichter : dmstyle: Remove 'recursive registry key delete' function.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: 645f349bd2bb1f0ef601302f48ee4b8cd69e4010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645f349bd2bb1f0ef601302f4… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 31 00:00:00 2007 +0200 dmstyle: Remove 'recursive registry key delete' function. --- dlls/dmstyle/regsvr.c | 76 +++++------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmstyle/regsvr.c b/dlls/dmstyle/regsvr.c index b0d6d20..2fe4fdd 100644 --- a/dlls/dmstyle/regsvr.c +++ b/dlls/dmstyle/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Francois Gouget : winedbg: Detach from the debuggee before exiting.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: 6d1f9316157ed80877ce40bb46eccc66c8101756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1f9316157ed80877ce40bb4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:30:42 2007 +0200 winedbg: Detach from the debuggee before exiting. --- programs/winedbg/winedbg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index d42a8e0..24522eb 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -604,7 +604,7 @@ int main(int argc, char** argv) parser_handle(hFile); while (dbg_process_list) - dbg_process_list->process_io->close_process(dbg_process_list, TRUE); + dbg_process_list->process_io->close_process(dbg_process_list, FALSE); dbg_save_internal_vars();

1 0

Francois Gouget : winedbg: 'winedbg --auto' and 'winedbg --minidump' should detach when done so as to not mess up the crashed process exit code .
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: 9271fcc86d668a3d25bad3f98dcb1cefc20da88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9271fcc86d668a3d25bad3f98… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 31 02:34:24 2007 +0200 winedbg: 'winedbg --auto' and 'winedbg --minidump' should detach when done so as to not mess up the crashed process exit code. --- dlls/kernel32/tests/debugger.c | 2 +- programs/winedbg/tgt_active.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 54aae65..19ab840 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -237,7 +237,7 @@ static void crash_and_winedbg(HKEY hkey, const char* argv0) trace("waiting for child exit...\n"); ok(WaitForSingleObject(info.hProcess, 60000) == WAIT_OBJECT_0, "Timed out waiting for the child to crash\n"); ok(GetExitCodeProcess(info.hProcess, &exit_code), "GetExitCodeProcess failed: err=%d\n", GetLastError()); - todo_wine ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); + ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x\n", exit_code); CloseHandle(info.hProcess); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 348895d..42bc9d6 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -893,7 +893,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) if (ds != start_ok) return ds; hFile = parser_generate_command_file("echo Modules:", "info share", "echo Threads:", "info threads", - NULL); + "detach", NULL); } else if (!strcmp(argv[0], "--minidump")) { @@ -942,7 +942,7 @@ enum dbg_start dbg_active_auto(int argc, char* argv[]) /* FIXME: should generate unix name as well */ dbg_printf("Capturing program state in %s\n", tmp + 9); } - hFile = parser_generate_command_file(tmp, NULL); + hFile = parser_generate_command_file(tmp, "detach", NULL); } else return start_error_parse; if (hFile == INVALID_HANDLE_VALUE) return start_error_parse;

1 0

Stefan Dösinger : wined3d: Raise the 1x pixelshader max value to the d3d minimum.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: 75f9bf43be46a3f9ee37b04312c8e799001fa90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f9bf43be46a3f9ee37b0431… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 29 20:16:13 2007 +0200 wined3d: Raise the 1x pixelshader max value to the d3d minimum. --- dlls/wined3d/directx.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5bf0ae8..e199f36 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2204,12 +2204,23 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); else *pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); - /* FIXME: The following line is card dependent. -1.0 to 1.0 is a safe default clamp range for now */ - *pCaps->PixelShader1xMaxValue = 1.0; + /* FIXME: The following line is card dependent. -8.0 to 8.0 is the + * Direct3D minimum requirement. + * + * Both GL_ARB_fragment_program and GLSL require a "maximum representable magnitude" + * of colors to be 2^10, and 2^32 for other floats. Should we use 1024 here? + * + * The problem is that the refrast clamps temporary results in the shader to + * [-MaxValue;+MaxValue]. If the card's max value is bigger than the one we advertize here, + * then applications may miss the clamping behavior. On the other hand, if it is smaller, + * the shader will generate incorrect results too. Unfortunately, GL deliberately doesn't + * offer a way to query this. + */ + *pCaps->PixelShader1xMaxValue = 8.0; TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (GLSL)\n"); } else if (ps_selected_mode == SHADER_ARB) { *pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); - *pCaps->PixelShader1xMaxValue = 1.0; + *pCaps->PixelShader1xMaxValue = 8.0; TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } else { *pCaps->PixelShaderVersion = 0;

1 0

Stefan Dösinger : d3d: Add a test for double surface locking.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: d0fdb1ea7e9f952e5a60851518db511f32c0a7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fdb1ea7e9f952e5a6085151… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 24 23:51:14 2007 +0200 d3d: Add a test for double surface locking. --- dlls/d3d8/tests/surface.c | 22 ++++++++++++++++++++++ dlls/d3d9/tests/surface.c | 23 +++++++++++++++++++++++ dlls/ddraw/surface.c | 12 +++++++++++- dlls/ddraw/tests/dsurface.c | 27 +++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 71dce2f..2225960 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -192,6 +192,28 @@ static void test_lockrect_invalid(IDirect3DDevice8 *device) rect->right, rect->bottom, D3DERR_INVALIDCALL); } + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect NULL\n", hr); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Double LockRect returned 0x%08x for rect NULL\n", hr); + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &valid[0], 0); + ok(hr == D3D_OK, "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" + ", expected D3D_OK (0x%08x)\n", hr, valid[0].left, valid[0].top, + valid[0].right, valid[0].bottom, D3D_OK); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &valid[0], 0); + ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, valid[0].left, valid[0].top, + valid[0].right, valid[0].bottom,D3DERR_INVALIDCALL); + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, &valid[1], 0); + ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, valid[1].left, valid[1].top, + valid[1].right, valid[1].bottom, D3DERR_INVALIDCALL); + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + IDirect3DSurface8_Release(surface); } diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index c84e933..a7fef00 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -238,6 +238,7 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) BYTE *base; HRESULT hr; + const RECT test_rect_2 = { 0, 0, 8, 8 }; const RECT test_data[] = { {60, 60, 68, 68}, /* Valid */ {60, 60, 60, 68}, /* 0 height */ @@ -286,6 +287,28 @@ static void test_lockrect_invalid(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); } + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x) for rect NULL\n", hr); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Double LockRect for rect NULL returned 0x%08x\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0], 0); + ok(hr == D3D_OK, "LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" + ", expected D3D_OK (0x%08x)\n", hr, test_data[0].left, test_data[0].top, + test_data[0].right, test_data[0].bottom, D3D_OK); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_data[0], 0); + ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_data[0].left, test_data[0].top, + test_data[0].right, test_data[0].bottom, D3DERR_INVALIDCALL); + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &test_rect_2, 0); + ok(hr == D3DERR_INVALIDCALL, "Double LockRect failed (0x%08x) for rect [%d, %d]->[%d, %d]" + ", expected D3DERR_INVALIDCALL (0x%08x)\n", hr, test_rect_2.left, test_rect_2.top, + test_rect_2.right, test_rect_2.bottom, D3DERR_INVALIDCALL); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "UnlockRect failed (0x%08x)\n", hr); + IDirect3DSurface9_Release(surface); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5dc823e..a5a0b21 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -613,7 +613,17 @@ IDirectDrawSurfaceImpl_Lock(IDirectDrawSurface7 *iface, if(hr != D3D_OK) { LeaveCriticalSection(&ddraw_cs); - return hr; + switch(hr) + { + /* D3D8 and D3D9 return the general D3DERR_INVALIDCALL error, but ddraw has a more + * specific error. But since IWineD3DSurface::LockRect returns that error in this + * only occasion, keep d3d8 and d3d9 free from the return value override. There are + * many different places where d3d8/9 would have to catch the DDERR_SURFACEBUSY, it + * is much easier to do it in one place in ddraw + */ + case WINED3DERR_INVALIDCALL: return DDERR_SURFACEBUSY; + default: return hr; + } } /* Override the memory area. The pitch should be set already. Strangely windows diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b2cd033..6c223f4 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1630,6 +1630,33 @@ static void test_lockrect_invalid(void) rect->right, rect->bottom, DDERR_INVALIDPARAMS); } + hr = IDirectDrawSurface_Lock(surface, NULL, &locked_desc, DDLOCK_WAIT, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_Lock(rect = NULL) failed (0x%08x)\n", hr); + hr = IDirectDrawSurface_Lock(surface, NULL, &locked_desc, DDLOCK_WAIT, NULL); + ok(hr == DDERR_SURFACEBUSY, "Double lock(rect = NULL) returned 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirectDrawSurface_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed (0x%08x)\n", hr); + } + hr = IDirectDrawSurface_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed (0x%08x)\n", hr); + + memset(&locked_desc, 0, sizeof(locked_desc)); + locked_desc.dwSize = sizeof(locked_desc); + hr = IDirectDrawSurface_Lock(surface, &valid[0], &locked_desc, DDLOCK_WAIT, NULL); + ok(hr == DD_OK, "IDirectDrawSurface_Lock(rect = [%d, %d]->[%d, %d]) failed (0x%08x)\n", + valid[0].left, valid[0].top, valid[0].right, valid[0].bottom, hr); + hr = IDirectDrawSurface_Lock(surface, &valid[0], &locked_desc, DDLOCK_WAIT, NULL); + ok(hr == DDERR_SURFACEBUSY, "Double lock(rect = [%d, %d]->[%d, %d]) failed (0x%08x)\n", + valid[0].left, valid[0].top, valid[0].right, valid[0].bottom, hr); + + /* Locking a different rectangle returns DD_OK, but it seems to break the surface. + * Afterwards unlocking the surface fails(NULL rectangle, and both locked rectangles + */ + + hr = IDirectDrawSurface_Unlock(surface, NULL); + ok(hr == DD_OK, "Unlock returned (0x%08x)\n", hr); + IDirectDrawSurface_Release(surface); } }

1 0

Stefan Dösinger : wined3d: Take the format into account when finding the clear value.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: bb213f67a359fe9bbba9d19189e201818b90a2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb213f67a359fe9bbba9d1918… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Aug 27 22:01:06 2007 +0200 wined3d: Take the format into account when finding the clear value. --- dlls/wined3d/surface.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2d3aa1..49c2218 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3281,15 +3281,36 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * static HRESULT WINAPI IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx) { IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; + float depth; + + if (Flags & WINEDDBLT_DEPTHFILL) { + switch(This->resource.format) { + case WINED3DFMT_D16: + depth = (float) DDBltFx->u5.dwFillDepth / (float) 0x0000ffff; + break; + case WINED3DFMT_D15S1: + depth = (float) DDBltFx->u5.dwFillDepth / (float) 0x0000fffe; + break; + case WINED3DFMT_D24S8: + case WINED3DFMT_D24X8: + depth = (float) DDBltFx->u5.dwFillDepth / (float) 0x00ffffff; + break; + case WINED3DFMT_D32: + depth = (float) DDBltFx->u5.dwFillDepth / (float) 0xffffffff; + break; + default: + depth = 0.0; + ERR("Unexpected format for depth fill: %s\n", debug_d3dformat(This->resource.format)); + } - if (Flags & WINEDDBLT_DEPTHFILL) return IWineD3DDevice_Clear((IWineD3DDevice *) myDevice, DestRect == NULL ? 0 : 1, (WINED3DRECT *) DestRect, WINED3DCLEAR_ZBUFFER, 0x00000000, - (float) DDBltFx->u5.dwFillDepth / (float) MAXDWORD, + depth, 0x00000000); + } FIXME("(%p): Unsupp depthstencil blit\n", This); return WINED3DERR_INVALIDCALL;

1 0

Stefan Dösinger : wined3d: The temp vars are tmp0 and tmp1.
by Alexandre Julliard Aug. 31, 2007

Aug. 31, 2007

Module: wine Branch: master Commit: 33ecb1db1a414f5951236abcb9c3cc4aedf371f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ecb1db1a414f5951236abcb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Aug 28 11:54:44 2007 +0200 wined3d: The temp vars are tmp0 and tmp1. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9233d4b..305ab27 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1836,7 +1836,7 @@ void pshader_glsl_texm3x3(SHADER_OPCODE_ARG* arg) { shader_glsl_append_dst(arg->buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); - shader_addline(arg->buffer, "vec4(tmp.xy, dot(T%u.xyz, %s), 1.0)%s);\n", reg, src0_param.param_str, dst_mask); + shader_addline(arg->buffer, "vec4(tmp0.xy, dot(T%u.xyz, %s), 1.0)%s);\n", reg, src0_param.param_str, dst_mask); current_state->current_row = 0; }

1 0

lostwages/templates/en download.template
by Jeremy Newman Aug. 30, 2007

Aug. 30, 2007

ChangeSet ID: 31355 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/08/30 17:06:51 Modified files: templates/en : download.template Log message: Sven Paschukat <Sven.Paschukat(a)t-online.de> Changed maintainer of Mandriva packages and added download notes Patch: http://cvs.winehq.org/patch.py?id=31355 Old revision New revision Changes Path 1.94 1.95 +3 -2 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.94 lostwages/templates/en/download.template:1.95 --- lostwages/templates/en/download.template:1.94 30 Aug 2007 22: 6:51 -0000 +++ lostwages/templates/en/download.template 30 Aug 2007 22: 6:51 -0000 @@ -49,8 +49,9 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a></b> - binary .rpms for Mandrakelinux 10.0, 10.1, Mandriva Linux 2005 Limited Edition and Mandriva 2006</td> - <td><a href="mailto:ivanleo(a)gmail.com">Ivan Leo Puoti</a></td> + binary .rpms for Mandriva Linux 2006 and 2007. Download the 2007.1 package if your Mandriva is a 2007.1 + release, eg. 2007 Spring. Download the 2007.0 package if your Mandriva is the first 2007 release.</td> + <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr> <tr bgcolor="#ffffff">

1 0