September 2010 - Wine-Commits

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard Sept. 2, 2010

Sept. 2, 2010

Module: wine Branch: master Commit: a8841eb1ddb12da177b86db8970267eeebe0b648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8841eb1ddb12da177b86db89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 1 18:41:06 2010 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/directx.c | 193 +++++++++++++++++++++++++----------------------- 1 files changed, 102 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8841eb1ddb12da177b86…

1 0

Aric Stewart : imm32: Test cases for HIMCs and threads.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: cc945706a4933cda0d204ba07a13e93fccb66d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc945706a4933cda0d204ba07… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 31 13:35:58 2010 -0500 imm32: Test cases for HIMCs and threads. --- dlls/imm32/tests/imm32.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index e35ef89..06b12f3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -345,6 +345,81 @@ static void test_ImmAssociateContextEx(void) ImmReleaseContext(hwnd,imc); } +typedef struct _igc_threadinfo { + HWND hwnd; + HANDLE event; + HIMC himc; +} igc_threadinfo; + + +static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) +{ + HIMC h1,h2; + HWND hwnd2; + igc_threadinfo *info= (igc_threadinfo*)lpParam; + info->hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + h1 = ImmGetContext(hwnd); + todo_wine ok(info->himc == h1, "hwnd context changed in new thread\n"); + h2 = ImmGetContext(info->hwnd); + todo_wine ok(h2 != h1, "new hwnd in new thread should have different context\n"); + info->himc = h2; + ImmReleaseContext(hwnd,h1); + + hwnd2 = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + h1 = ImmGetContext(hwnd2); + + ok(h1 == h2, "Windows in same thread should have same default context\n"); + ImmReleaseContext(hwnd2,h1); + ImmReleaseContext(info->hwnd,h2); + DestroyWindow(hwnd2); + + SetEvent(info->event); + Sleep(INFINITE); + return 1; +} + +static void test_ImmThreads(void) +{ + HIMC himc, otherHimc, h1; + igc_threadinfo threadinfo; + HANDLE hThread; + DWORD dwThreadId; + + himc = ImmGetContext(hwnd); + threadinfo.event = CreateEvent(NULL, TRUE, FALSE, NULL); + threadinfo.himc = himc; + hThread = CreateThread(NULL, 0, ImmGetContextThreadFunc, &threadinfo, 0, &dwThreadId ); + WaitForSingleObject(threadinfo.event, INFINITE); + + otherHimc = ImmGetContext(threadinfo.hwnd); + + todo_wine ok(himc != otherHimc, "Windows from other threads should have different himc\n"); + todo_wine ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); + + if (0) /* FIXME: Causes wine to hang */ + { + h1 = ImmAssociateContext(hwnd,otherHimc); + ok(h1 == NULL, "Should fail to be able to Associate a default context from a different thread\n"); + h1 = ImmGetContext(hwnd); + ok(h1 == himc, "Context for window should remain unchanged\n"); + ImmReleaseContext(hwnd,h1); + } + + ImmReleaseContext(threadinfo.hwnd,otherHimc); + ImmReleaseContext(hwnd,himc); + + DestroyWindow(threadinfo.hwnd); + TerminateThread(hThread, 1); + + himc = ImmGetContext(GetDesktopWindow()); + todo_wine ok(himc == NULL, "Should not be able to get himc from other process window\n"); +} + START_TEST(imm32) { if (init()) { @@ -353,6 +428,7 @@ START_TEST(imm32) { test_ImmSetCompositionString(); test_ImmIME(); test_ImmAssociateContextEx(); + test_ImmThreads(); } cleanup(); }

1 0

Alexandre Julliard : oleaut32/tests: Fix a pointer cast warning.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 70103aadc8f41fd8485929253a31b222d6c209a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70103aadc8f41fd8485929253… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 1 13:01:42 2010 +0200 oleaut32/tests: Fix a pointer cast warning. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 03d47db..c817b5f 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -219,7 +219,7 @@ test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) if (handle) { BITMAP bmp; - GetObject((HGDIOBJ)handle, sizeof(BITMAP), &bmp); + GetObject(UlongToHandle(handle), sizeof(BITMAP), &bmp); todo_wine ok(bmp.bmBits != 0, "not a dib\n"); }

1 0

Piotr Caban : msvcp90: Fix 64-bit compilation warnings.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: cc4972e3288a787607bcbf667a4079bb474203f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4972e3288a787607bcbf667… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 1 12:22:36 2010 +0200 msvcp90: Fix 64-bit compilation warnings. --- dlls/msvcp90/string.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3c71ab8..15ff025 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -596,7 +596,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_erase, 12) basic_string_char* __thiscall MSVCP_basic_string_char_erase( basic_string_char *this, size_t pos, size_t len) { - TRACE("%p %d %d\n", this, pos, len); + TRACE("%p %lu %lu\n", this, (unsigned long)pos, (unsigned long)len); if(pos > this->size) { MSVCP__String_base_Xran(); @@ -623,7 +623,7 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_substr( basic_string_char *this, const basic_string_char *assign, size_t pos, size_t len) { - TRACE("%p %p %d %d\n", this, assign, pos, len); + TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); if(assign->size < pos) { MSVCP__String_base_Xran(); @@ -661,7 +661,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_cstr_len, 12) basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr_len( basic_string_char *this, const char *str, size_t len) { - TRACE("%p %s %d\n", this, debugstr_a(str), len); + TRACE("%p %s %lu\n", this, debugstr_a(str), (unsigned long)len); if(basic_string_char_inside(this, str)) return MSVCP_basic_string_char_assign_substr(this, this, @@ -842,7 +842,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_erase, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_erase( basic_string_wchar *this, size_t pos, size_t len) { - TRACE("%p %d %d\n", this, pos, len); + TRACE("%p %lu %lu\n", this, (unsigned long)pos, (unsigned long)len); if(pos > this->size) { MSVCP__String_base_Xran(); @@ -869,7 +869,7 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_substr( basic_string_wchar *this, const basic_string_wchar *assign, size_t pos, size_t len) { - TRACE("%p %p %d %d\n", this, assign, pos, len); + TRACE("%p %p %lu %lu\n", this, assign, (unsigned long)pos, (unsigned long)len); if(assign->size < pos) { MSVCP__String_base_Xran(); @@ -907,7 +907,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_cstr_len, 12) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( basic_string_wchar *this, const wchar_t *str, size_t len) { - TRACE("%p %s %d\n", this, debugstr_w(str), len); + TRACE("%p %s %lu\n", this, debugstr_w(str), (unsigned long)len); if(basic_string_wchar_inside(this, str)) return MSVCP_basic_string_wchar_assign_substr(this, this,

1 0

Alexandre Julliard : rpcrt4: Retrieve the stack argument pointer in a more portable way in NdrMesProcEncodeDecode .
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 0abc475365b9842b5e9d704aec0ee251af4f190e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abc475365b9842b5e9d704ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 1 12:31:22 2010 +0200 rpcrt4: Retrieve the stack argument pointer in a more portable way in NdrMesProcEncodeDecode. --- dlls/rpcrt4/ndr_es.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 52200dc..9a56939 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -332,6 +332,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu /* the value to return to the client from the remote procedure */ LONG_PTR RetVal = 0; const RPC_CLIENT_INTERFACE *client_interface; + __ms_va_list args; TRACE("Handle %p, pStubDesc %p, pFormat %p, ...\n", Handle, pStubDesc, pFormat); @@ -396,11 +397,9 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); /* needed for conformance of top-level objects */ -#ifdef __i386__ - pEsMsg->StubMsg.StackTop = *(unsigned char **)(&pFormat+1); -#else -# warning Stack not retrieved for your CPU architecture -#endif + __ms_va_start( args, pFormat ); + pEsMsg->StubMsg.StackTop = va_arg( args, unsigned char * ); + __ms_va_end( args ); switch (pEsMsg->Operation) {

1 0

Dmitry Timoshkov : user32: Add a bunch of GetWindowPlacement() tests, fix some simple cases.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 38b8805c0c0ab766ecc60795af97bd47b87e5a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b8805c0c0ab766ecc60795a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 1 20:58:06 2010 +0900 user32: Add a bunch of GetWindowPlacement() tests, fix some simple cases. --- dlls/user32/tests/msg.c | 252 ++++++++++++++++++++++++++++++++++++----------- dlls/user32/winpos.c | 16 +++- 2 files changed, 210 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38b8805c0c0ab766ecc60…

1 0

Alexandre Julliard : winecfg: Fix a pointer cast warning.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 92edc06e16f666a343d50b1e9dafbdff2d9f07c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92edc06e16f666a343d50b1e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 1 13:03:28 2010 +0200 winecfg: Fix a pointer cast warning. --- programs/winecfg/about.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c index d6b2a7d..650603a 100644 --- a/programs/winecfg/about.c +++ b/programs/winecfg/about.c @@ -170,7 +170,7 @@ AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetTextColor((HDC)wParam, 0x0000007F); case IDC_ABT_PANEL_TEXT: case IDC_ABT_LICENSE_TEXT: - return (BOOL)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); + return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_WINDOW)); } break; }

1 0

Octavian Voicu : wined3d: Add missing ckey, fx, and pal directdraw caps.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: f9cdd5097fc5bb2cbfcc4e0c9ce2b39496b48f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9cdd5097fc5bb2cbfcc4e0c9… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Sep 1 16:44:11 2010 +0300 wined3d: Add missing ckey, fx, and pal directdraw caps. --- dlls/wined3d/directx.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3beb024..f94d149 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4259,7 +4259,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; - DWORD ckey_caps, blit_caps, fx_caps; + DWORD ckey_caps, blit_caps, fx_caps, pal_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4786,6 +4786,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_ALIGNBOUNDARYSRC; + pal_caps = WINEDDPCAPS_8BIT | + WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ pCaps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | @@ -4796,6 +4798,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDCAPS2_PRIMARYGAMMA | WINEDDCAPS2_WIDESURFACES | WINEDDCAPS2_CANRENDERWINDOWED; + pCaps->DirectDrawCaps.CKeyCaps = ckey_caps; + pCaps->DirectDrawCaps.FXCaps = fx_caps; + pCaps->DirectDrawCaps.PalCaps = pal_caps; pCaps->DirectDrawCaps.SVBCaps = blit_caps; pCaps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; pCaps->DirectDrawCaps.SVBFXCaps = fx_caps;

1 0

Alexandre Julliard : rpcrt4: Remove a couple of unused local variables.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 95ea3527385aed7d9f0e0dc7fce755407d28acf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ea3527385aed7d9f0e0dc7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 1 12:39:01 2010 +0200 rpcrt4: Remove a couple of unused local variables. --- dlls/rpcrt4/rpc_binding.c | 5 +---- dlls/rpcrt4/rpc_server.c | 13 +++---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index d83f53b..685b569 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -798,13 +798,10 @@ RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) */ RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { - RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); - for (c=0; c<(*BindingVector)->Count; c++) { - status = RpcBindingFree(&(*BindingVector)->BindingH[c]); - } + for (c=0; c<(*BindingVector)->Count; c++) RpcBindingFree(&(*BindingVector)->BindingH[c]); HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 7f3f0c2..0ffc085 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -503,29 +503,22 @@ static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSAGE* msg, unsigned char *auth_data, ULONG auth_length) { - RPC_STATUS status; - msg->Handle = (RPC_BINDING_HANDLE)conn->server_binding; switch (hdr->common.ptype) { case PKT_BIND: TRACE("got bind packet\n"); - - status = process_bind_packet(conn, &hdr->bind, msg, auth_data, - auth_length); + process_bind_packet(conn, &hdr->bind, msg, auth_data, auth_length); break; case PKT_REQUEST: TRACE("got request packet\n"); - - status = process_request_packet(conn, &hdr->request, msg); + process_request_packet(conn, &hdr->request, msg); break; case PKT_AUTH3: TRACE("got auth3 packet\n"); - - status = process_auth3_packet(conn, &hdr->common, msg, auth_data, - auth_length); + process_auth3_packet(conn, &hdr->common, msg, auth_data, auth_length); break; default: FIXME("unhandled packet type %u\n", hdr->common.ptype);

1 0

Eric Pouech : kernel32: Properly handle bare console on input.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: e4d090277b3f4f76b39e55480e5d1387798dbabe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d090277b3f4f76b39e55480… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:24 2010 +0200 kernel32: Properly handle bare console on input. --- dlls/kernel32/console.c | 252 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 237 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4d090277b3f4f76b39e5…

1 0