December 2006 - Wine-Commits

Jan Zerebecki : wined3d: Add err for failure case in CheckDepthStencilMatch .
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 9c58bce158f21fd8211e561c05c5bf7b680ea71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c58bce158f21fd8211e561c0… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Nov 23 19:59:30 2006 +0100 wined3d: Add err for failure case in CheckDepthStencilMatch. --- dlls/wined3d/directx.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d7782a..dd50ecf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1510,9 +1510,8 @@ static HRESULT WINAPI IWineD3DImpl_Check } } XFree(cfgs); - cfgs = NULL; } else { - /* If there's a current context then we cannot create a fake one so pass everything */ + ERR_(d3d_caps)("returning WINED3D_OK even so CreateFakeGLContext or glXGetFBConfigs failed\n"); hr = WINED3D_OK; }

1 0

Jan Zerebecki : wined3d: Add warn trace for INVALIDCALL case in CheckDeviceType.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 0d66f794d1586a8972435d1d115fa10838a2d73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d66f794d1586a8972435d1d1… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Nov 23 19:56:31 2006 +0100 wined3d: Add warn trace for INVALIDCALL case in CheckDeviceType. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c46af63..0413520 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1577,6 +1577,7 @@ static HRESULT WINAPI IWineD3DImpl_Check Windowed); if (Adapter >= IWineD3D_GetAdapterCount(iface)) { + WARN_(d3d_caps)("Adapter >= IWineD3D_GetAdapterCount(iface), returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; }

1 0

Jan Zerebecki : wined3d: Rearrange code in CheckDeviceType.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 3d6ffee02121331b366494aa46536f62c7cda677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ffee02121331b366494aa4… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Nov 23 19:57:54 2006 +0100 wined3d: Rearrange code in CheckDeviceType. --- dlls/wined3d/directx.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0413520..1184e64 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1568,6 +1568,12 @@ static HRESULT WINAPI IWineD3DImpl_Check WINED3DFORMAT DisplayFormat, WINED3DFORMAT BackBufferFormat, BOOL Windowed) { IWineD3DImpl *This = (IWineD3DImpl *)iface; + GLXFBConfig* cfgs = NULL; + int nCfgs = 0; + int it; + HRESULT hr = WINED3DERR_NOTAVAILABLE; + WineD3D_Context* ctx; + TRACE_(d3d_caps)("(%p)-> (STUB) (Adptr:%d, CheckType:(%x,%s), DispFmt:(%x,%s), BackBuf:(%x,%s), Win?%d): stub\n", This, Adapter, @@ -1581,29 +1587,24 @@ static HRESULT WINAPI IWineD3DImpl_Check return WINED3DERR_INVALIDCALL; } - { - GLXFBConfig* cfgs = NULL; - int nCfgs = 0; - int it; - HRESULT hr = WINED3DERR_NOTAVAILABLE; - - WineD3D_Context* ctx = WineD3D_CreateFakeGLContext(); - if (NULL != ctx) { - cfgs = glXGetFBConfigs(ctx->display, DefaultScreen(ctx->display), &nCfgs); - for (it = 0; it < nCfgs; ++it) { - if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx->display, cfgs[it], DisplayFormat)) { - hr = WINED3D_OK; - break ; - } - } - XFree(cfgs); - - WineD3D_ReleaseFakeGLContext(ctx); - return hr; + ctx = WineD3D_CreateFakeGLContext(); + if (NULL != ctx) { + cfgs = glXGetFBConfigs(ctx->display, DefaultScreen(ctx->display), &nCfgs); + for (it = 0; it < nCfgs; ++it) { + if (IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt(ctx->display, cfgs[it], DisplayFormat)) { + hr = WINED3D_OK; + TRACE_(d3d_caps)("OK\n"); + break ; + } } + XFree(cfgs); + WineD3D_ReleaseFakeGLContext(ctx); } - return WINED3DERR_NOTAVAILABLE; + if(hr != WINED3D_OK) + TRACE_(d3d_caps)("returning something different from WINED3D_OK\n"); + + return hr; } static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType,

1 0

Jan Zerebecki : wined3d: Avoid XFree on NULL in CheckDeviceType.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 107536749368fb9dcb678d8cf721a15a83515130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107536749368fb9dcb678d8cf… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Nov 23 19:58:13 2006 +0100 wined3d: Avoid XFree on NULL in CheckDeviceType. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1184e64..59cf1b0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1597,7 +1597,7 @@ static HRESULT WINAPI IWineD3DImpl_Check break ; } } - XFree(cfgs); + if(cfgs) XFree(cfgs); WineD3D_ReleaseFakeGLContext(ctx); }

1 0

Jan Zerebecki : wined3d: Fix CreateFakeGLContext to work with a foreign context.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: ee44a19966fec922ab2273449e2ba25d2a975cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44a19966fec922ab2273449… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Nov 23 19:58:41 2006 +0100 wined3d: Fix CreateFakeGLContext to work with a foreign context. --- dlls/wined3d/directx.c | 248 +++++++++++++++++++++++------------------------- 1 files changed, 119 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee44a19966fec922ab227…

1 0

Roderick Colenbrander : Remove glut32.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 3e2ed5e4e569db552d3a814c073c94e971499253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e2ed5e4e569db552d3a814c0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Dec 4 14:39:04 2006 +0100 Remove glut32. --- Makefile.in | 2 - configure | 94 +---- configure.ac | 7 - dlls/.gitignore | 1 - dlls/Makefile.in | 8 +- dlls/glut32/Makefile.in | 15 - dlls/glut32/glut.c | 1088 ----------------------------------------------- dlls/glut32/glut32.spec | 117 ----- dlls/make_dlls | 1 - 9 files changed, 3 insertions(+), 1330 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e2ed5e4e569db552d3a8…

1 0

Alexandre Julliard : kernel32: Store the LC_MESSAGES value under the " Locale" value.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 28c539643627b0115810f1117c35f634fc767f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c539643627b0115810f1117… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 18:00:55 2006 +0100 kernel32: Store the LC_MESSAGES value under the "Locale" value. Some apps depend on the value. Reported by Karsten Elfenbein. --- dlls/kernel32/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bc7db75..042ea7b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -633,8 +633,8 @@ void LOCALE_InitRegistry(void) static const WCHAR acpW[] = {'A','C','P',0}; static const WCHAR oemcpW[] = {'O','E','M','C','P',0}; static const WCHAR maccpW[] = {'M','A','C','C','P',0}; + static const WCHAR localeW[] = {'L','o','c','a','l','e',0}; static const WCHAR lc_ctypeW[] = { 'L','C','_','C','T','Y','P','E',0 }; - static const WCHAR lc_messagesW[] = { 'L','C','_','M','E','S','S','A','G','E','S',0 }; static const WCHAR lc_monetaryW[] = { 'L','C','_','M','O','N','E','T','A','R','Y',0 }; static const WCHAR lc_numericW[] = { 'L','C','_','N','U','M','E','R','I','C',0 }; static const WCHAR lc_timeW[] = { 'L','C','_','T','I','M','E',0 }; @@ -688,7 +688,7 @@ void LOCALE_InitRegistry(void) if (!(hkey = create_registry_key())) return; /* don't do anything if we can't create the registry key */ - locale_update_registry( hkey, lc_messagesW, lcid_LC_MESSAGES, lc_messages_values, + locale_update_registry( hkey, localeW, lcid_LC_MESSAGES, lc_messages_values, sizeof(lc_messages_values)/sizeof(lc_messages_values[0]) ); locale_update_registry( hkey, lc_monetaryW, lcid_LC_MONETARY, lc_monetary_values, sizeof(lc_monetary_values)/sizeof(lc_monetary_values[0]) );

1 0

Alexandre Julliard : server: Explicitly shutdown destroyed sockets to force pending poll() calls to return.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 24b64534e592e47e5cac70e497a98c0ddbc3941b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b64534e592e47e5cac70e49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 18:02:02 2006 +0100 server: Explicitly shutdown destroyed sockets to force pending poll() calls to return. --- server/sock.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index a98057f..7c96f5f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -583,7 +583,12 @@ static void sock_destroy( struct object async_terminate_queue( &sock->write_q, STATUS_CANCELLED ); } if (sock->event) release_object( sock->event ); - if (sock->fd) release_object( sock->fd ); + if (sock->fd) + { + /* shut the socket down to force pending poll() calls in the client to return */ + shutdown( get_unix_fd(sock->fd), SHUT_RDWR ); + release_object( sock->fd ); + } } /* create a new and unconnected socket */

1 0

Damjan Jovanovic : ws2_32: Added tests for closesocket cancelling pending I /O operations.
by Alexandre Julliard Dec. 5, 2006

Dec. 5, 2006

Module: wine Branch: master Commit: 526e1353e68e91b8485b2896455966f64076a696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526e1353e68e91b8485b28964… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Dec 4 08:01:19 2006 +0200 ws2_32: Added tests for closesocket cancelling pending I/O operations. --- dlls/ws2_32/tests/sock.c | 88 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 45b858c..45331e9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1399,15 +1399,96 @@ static void test_select(void) ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); WaitForSingleObject (server_ready, INFINITE); - Sleep(2000); + Sleep(200); ret = closesocket(fdRead); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); - WaitForSingleObject (thread_handle, TEST_TIMEOUT * 1000); - todo_wine { + WaitForSingleObject (thread_handle, 1000); ok ( (thread_params.ReadKilled), "closesocket did not wakeup select\n"); + +} + +static DWORD WINAPI AcceptKillThread(select_thread_params *par) +{ + struct sockaddr_in address; + int len = sizeof(address); + SOCKET client_socket; + + SetEvent(server_ready); + client_socket = accept(par->s, (struct sockaddr*) &address, &len); + if (client_socket != INVALID_SOCKET) + closesocket(client_socket); + par->ReadKilled = (client_socket == INVALID_SOCKET); + return 0; +} + +static void test_accept(void) +{ + int ret; + SOCKET server_socket = INVALID_SOCKET; + struct sockaddr_in address; + select_thread_params thread_params; + HANDLE thread_handle = NULL; + + server_socket = socket(AF_INET, SOCK_STREAM, 0); + if (server_socket == INVALID_SOCKET) + { + trace("error creating server socket: %d\n", WSAGetLastError()); + goto done; + } + + memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + ret = bind(server_socket, (struct sockaddr*) &address, sizeof(address)); + if (ret != 0) + { + trace("error binding server socket: %d\n", WSAGetLastError()); + goto done; + } + + ret = listen(server_socket, 1); + if (ret != 0) + { + trace("error making server socket listen: %d\n", WSAGetLastError()); + goto done; + } + + server_ready = CreateEventW(NULL, TRUE, FALSE, NULL); + if (server_ready == INVALID_HANDLE_VALUE) + { + trace("error creating event: %d\n", GetLastError()); + goto done; } + thread_params.s = server_socket; + thread_params.ReadKilled = FALSE; + thread_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) AcceptKillThread, + &thread_params, 0, NULL); + if (thread_handle == NULL) + { + trace("error creating thread: %d\n", GetLastError()); + goto done; + } + + WaitForSingleObject(server_ready, INFINITE); + Sleep(200); + ret = closesocket(server_socket); + if (ret != 0) + { + trace("closesocket failed: %d\n", WSAGetLastError()); + goto done; + } + + WaitForSingleObject(thread_handle, 1000); + ok(thread_params.ReadKilled, "closesocket did not wakeup accept\n"); + +done: + if (thread_handle != NULL) + CloseHandle(thread_handle); + if (server_ready != INVALID_HANDLE_VALUE) + CloseHandle(server_ready); + if (server_socket != INVALID_SOCKET) + closesocket(server_socket); } static void test_extendedSocketOptions() @@ -1513,6 +1594,7 @@ START_TEST( sock ) test_WSAStringToAddressW(); test_select(); + test_accept(); Exit(); }

1 0

Eric Pouech : winedbg: Dwarf can emit REGREL symbol information, so handle it.
by Alexandre Julliard Dec. 4, 2006

Dec. 4, 2006

Module: wine Branch: master Commit: a274689b09f0a74a723680bb9da2a60b094faf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a274689b09f0a74a723680bb9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 2 17:43:34 2006 +0100 winedbg: Dwarf can emit REGREL symbol information, so handle it. Factorize a bit more some symbol handling code. --- programs/winedbg/symbol.c | 126 ++++++++++++++++++++------------------------ 1 files changed, 57 insertions(+), 69 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 3b144b1..55e35ee 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -65,6 +65,45 @@ static BOOL symbol_get_debug_start(const return FALSE; } +static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG base, + struct dbg_lvalue* lvalue, char* buffer, size_t sz) +{ + if (buffer) buffer[0] = '\0'; + if (sym->Flags & SYMFLAG_REGISTER) + { + DWORD* pval; + + if (!memory_get_register(sym->Register, &pval, buffer, sz)) + return FALSE; + lvalue->cookie = DLV_HOST; + lvalue->addr.Offset = (DWORD_PTR)pval; + } + else if (sym->Flags & SYMFLAG_REGREL) + { + DWORD* pval; + + if (!memory_get_register(sym->Register, &pval, buffer, sz)) + return FALSE; + lvalue->cookie = DLV_TARGET; + lvalue->addr.Offset = (ULONG)((ULONG64)*pval + sym->Address); + } + else if (sym->Flags & SYMFLAG_LOCAL) + { + lvalue->cookie = DLV_TARGET; + lvalue->addr.Offset = base + sym->Address; + } + else + { + lvalue->cookie = DLV_TARGET; + lvalue->addr.Offset = sym->Address; + } + lvalue->addr.Mode = AddrModeFlat; + lvalue->type.module = sym->ModBase; + lvalue->type.id = sym->TypeIndex; + + return TRUE; +} + struct sgv_data { #define NUMDBGV 100 @@ -85,34 +124,13 @@ struct sgv_data static BOOL CALLBACK sgv_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) { struct sgv_data* sgv = (struct sgv_data*)ctx; - ULONG64 addr; - unsigned cookie = DLV_TARGET, insp; + unsigned insp; + char tmp[32]; - if (sym->Flags & SYMFLAG_REGISTER) - { - char tmp[32]; - DWORD* val; - if (!memory_get_register(sym->Register, &val, tmp, sizeof(tmp))) - { - dbg_printf(" %s (register): %s\n", sym->Name, tmp); - return TRUE; - } - addr = (ULONG64)(DWORD_PTR)val; - cookie = DLV_HOST; - } - else if (sym->Flags & SYMFLAG_LOCAL) /* covers both local & parameters */ - { - addr = sgv->frame_offset + sym->Address; - } - else if (sym->Flags & SYMFLAG_THUNK) + if (sym->Flags & SYMFLAG_THUNK) { if (!sgv->do_thunks) return TRUE; sgv->num_thunks++; - addr = sym->Address; - } - else - { - addr = sym->Address; } if (sgv->num >= NUMDBGV) @@ -139,11 +157,11 @@ static BOOL CALLBACK sgv_cb(SYMBOL_INFO* memmove(&sgv->syms[insp + 1], &sgv->syms[insp], sizeof(sgv->syms[0]) * sgv->num_thunks); } - sgv->syms[insp].lvalue.cookie = cookie; - sgv->syms[insp].lvalue.addr.Mode = AddrModeFlat; - sgv->syms[insp].lvalue.addr.Offset = addr; - sgv->syms[insp].lvalue.type.module = sym->ModBase; - sgv->syms[insp].lvalue.type.id = sym->TypeIndex; + if (!fill_sym_lvalue(sym, sgv->frame_offset, &sgv->syms[insp].lvalue, tmp, sizeof(tmp))) + { + dbg_printf("%s: %s\n", sym->Name, tmp); + return TRUE; + } sgv->syms[insp].flags = sym->Flags; sgv->syms[insp].sym_info = sym->info; sgv->num++; @@ -545,54 +563,24 @@ void symbol_print_local(const SYMBOL_INF BOOL detailed) { struct dbg_lvalue lvalue; - BOOL valtodo = FALSE; char buffer[64]; dbg_printf("%s=", sym->Name); - if (sym->Flags & SYMFLAG_REGISTER) - { - DWORD* pval; - - if (memory_get_register(sym->Register, &pval, buffer + 13, sizeof(buffer) - 13)) - { - lvalue.cookie = DLV_HOST; - lvalue.addr.Mode = AddrModeFlat; - lvalue.addr.Offset = (DWORD_PTR)pval; - valtodo = TRUE; - memcpy(buffer, " in register ", 13); - } - else - { - dbg_printf(buffer + 13); - buffer[0] = '\0'; - } - } - else if (sym->Flags & SYMFLAG_LOCAL) - { - lvalue.cookie = DLV_TARGET; - lvalue.addr.Mode = AddrModeFlat; - lvalue.addr.Offset = base + sym->Address; - valtodo = TRUE; - buffer[0] = '\0'; - } - else - { - dbg_printf("<unexpected symbol flags %lx>\n", sym->Flags); - buffer[0] = '\0'; - } - - if (valtodo) + if (fill_sym_lvalue(sym, base, &lvalue, buffer, sizeof(buffer))) { - lvalue.type.module = sym->ModBase; - lvalue.type.id = sym->TypeIndex; print_value(&lvalue, 'x', 1); + if (detailed) + dbg_printf(" (%s%s)", + (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", + buffer); } - - if (detailed) + else { - dbg_printf(" (%s%s)", - (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", buffer); + dbg_printf(buffer); + if (detailed) + dbg_printf(" (%s)", + (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local"); } }

1 0