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

Dmitry Timoshkov : gdi32: Implement EMFDRV_SelectPalette.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 2820682202886cb1fc438ab55b3c39f13baef9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2820682202886cb1fc438ab55… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 7 20:35:04 2008 +0900 gdi32: Implement EMFDRV_SelectPalette. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 55 ++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index f1c81a2..c00c653 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -122,6 +122,7 @@ extern HBRUSH EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH handle ) DECLSPEC_HIDDEN extern BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, HANDLE gdiFont ) DECLSPEC_HIDDEN; extern HPEN EMFDRV_SelectPen( PHYSDEV dev, HPEN handle ) DECLSPEC_HIDDEN; +extern HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; extern COLORREF EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetBkMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index dafac60..de135d2 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -114,7 +114,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_SelectBrush, /* pSelectBrush */ EMFDRV_SelectClipPath, /* pSelectClipPath */ EMFDRV_SelectFont, /* pSelectFont */ - NULL, /* pSelectPalette */ + EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ EMFDRV_SetArcDirection, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index c7ecd54..54c34bf 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -465,6 +465,61 @@ HPEN EMFDRV_SelectPen(PHYSDEV dev, HPEN hPen ) /****************************************************************** + * EMFDRV_CreatePalette + */ +static DWORD EMFDRV_CreatePalette(PHYSDEV dev, HPALETTE hPal) +{ + WORD i; + struct { + EMRCREATEPALETTE hdr; + PALETTEENTRY entry[255]; + } pal; + + memset( &pal, 0, sizeof(pal) ); + + if (!GetObjectW( hPal, sizeof(pal.hdr.lgpl) + sizeof(pal.entry), &pal.hdr.lgpl )) + return 0; + + for (i = 0; i < pal.hdr.lgpl.palNumEntries; i++) + pal.hdr.lgpl.palPalEntry[i].peFlags = 0; + + pal.hdr.emr.iType = EMR_CREATEPALETTE; + pal.hdr.emr.nSize = sizeof(pal.hdr) + pal.hdr.lgpl.palNumEntries * sizeof(PALETTEENTRY); + pal.hdr.ihPal = EMFDRV_AddHandle( dev, hPal ); + + if (!EMFDRV_WriteRecord( dev, &pal.hdr.emr )) + pal.hdr.ihPal = 0; + return pal.hdr.ihPal; +} + +/****************************************************************** + * EMFDRV_SelectPalette + */ +HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) +{ + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; + EMRSELECTPALETTE emr; + DWORD index; + + if (hPal == GetStockObject( DEFAULT_PALETTE )) + index = DEFAULT_PALETTE | 0x80000000; + goto found; + + if ((index = EMFDRV_FindObject( dev, hPal )) != 0) + goto found; + + if (!(index = EMFDRV_CreatePalette( dev, hPal ))) return 0; + GDI_hdc_using_object( hPal, physDev->hdc ); + +found: + emr.emr.iType = EMR_SELECTPALETTE; + emr.emr.nSize = sizeof(emr); + emr.ihPal = index; + return EMFDRV_WriteRecord( dev, &emr.emr ) ? hPal : 0; +} + + +/****************************************************************** * EMFDRV_GdiComment */ BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer)

1 0

Dmitry Timoshkov : gdi32: Set offPalEntries member of EMREOF to what XP sets it to.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 4efbf36cd5f98b0065cb528183e9d947d148ac80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4efbf36cd5f98b0065cb52818… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 7 20:34:12 2008 +0900 gdi32: Set offPalEntries member of EMREOF to what XP sets it to. --- dlls/gdi32/enhmfdrv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 7e68847..dafac60 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -457,7 +457,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ emr.emr.iType = EMR_EOF; emr.emr.nSize = sizeof(emr); emr.nPalEntries = 0; - emr.offPalEntries = 0; + emr.offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); emr.nSizeLast = emr.emr.nSize; EMFDRV_WriteRecord( dc->physDev, &emr.emr );

1 0

Vitaliy Margolen : dinput: Ignore events from extra joystick buttons.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 9227e25660c80524ae9688a77cc7b93f97806d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9227e25660c80524ae9688a77… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue May 6 10:28:12 2008 -0600 dinput: Ignore events from extra joystick buttons. --- dlls/dinput/joystick_linux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index a151390..9dead0a 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -698,6 +698,8 @@ static void joy_polldev(JoystickImpl *This) { jse.type,jse.number,jse.value); if (jse.type & JS_EVENT_BUTTON) { + if (jse.number >= This->devcaps.dwButtons) return; + inst_id = DIDFT_MAKEINSTANCE(jse.number) | DIDFT_PSHBUTTON; This->js.rgbButtons[jse.number] = value = jse.value ? 0x80 : 0x00; }

1 0

Hans Leidekker : wininet: Deal with bogus accept types array passed into HttpOpenRequestA.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 493b6915caf78f180dfa244ab8a27f17be724c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493b6915caf78f180dfa244ab… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed May 7 13:19:37 2008 +0200 wininet: Deal with bogus accept types array passed into HttpOpenRequestA. --- dlls/wininet/http.c | 44 +++++++++++++++++++++++++++++--------------- dlls/wininet/tests/http.c | 26 ++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7f336f4..3cafcae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -964,9 +964,10 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, { LPWSTR szVerb = NULL, szObjectName = NULL; LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL; - INT len; - INT acceptTypesCount; + INT len, acceptTypesCount; HINTERNET rc = FALSE; + LPCSTR *types; + TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, debugstr_a(lpszVerb), debugstr_a(lpszObjectName), debugstr_a(lpszVersion), debugstr_a(lpszReferrer), lpszAcceptTypes, @@ -1008,24 +1009,37 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, MultiByteToWideChar(CP_ACP, 0, lpszReferrer, -1, szReferrer, len ); } - acceptTypesCount = 0; if (lpszAcceptTypes) { - /* find out how many there are */ - while (lpszAcceptTypes[acceptTypesCount] && *lpszAcceptTypes[acceptTypesCount]) - acceptTypesCount++; + acceptTypesCount = 0; + types = lpszAcceptTypes; + while (*types) + { + /* find out how many there are */ + if (((ULONG_PTR)*types >> 16) && **types) + { + TRACE("accept type: %s\n", debugstr_a(*types)); + acceptTypesCount++; + } + types++; + } szAcceptTypes = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * (acceptTypesCount+1)); + if (!szAcceptTypes) goto end; + acceptTypesCount = 0; - while (lpszAcceptTypes[acceptTypesCount] && *lpszAcceptTypes[acceptTypesCount]) + types = lpszAcceptTypes; + while (*types) { - len = MultiByteToWideChar(CP_ACP, 0, lpszAcceptTypes[acceptTypesCount], - -1, NULL, 0 ); - szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!szAcceptTypes[acceptTypesCount] ) - goto end; - MultiByteToWideChar(CP_ACP, 0, lpszAcceptTypes[acceptTypesCount], - -1, szAcceptTypes[acceptTypesCount], len ); - acceptTypesCount++; + if (((ULONG_PTR)*types >> 16) && **types) + { + len = MultiByteToWideChar(CP_ACP, 0, *types, -1, NULL, 0 ); + szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!szAcceptTypes[acceptTypesCount]) goto end; + + MultiByteToWideChar(CP_ACP, 0, *types, -1, szAcceptTypes[acceptTypesCount], len); + acceptTypesCount++; + } + types++; } szAcceptTypes[acceptTypesCount] = NULL; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f1a67ca..705fcac 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1746,6 +1746,31 @@ static void test_user_agent_header(void) InternetCloseHandle(ses); } +static void test_bogus_accept_types_array(void) +{ + HINTERNET ses, con, req; + static const char *types[] = { (const char *)6240, "*/*", "%p", "", "*/*", NULL }; + DWORD size; + char buffer[32]; + BOOL ret; + + ses = InternetOpen("MERONG(0.9/;p)", INTERNET_OPEN_TYPE_DIRECT, "", "", 0); + con = InternetConnect(ses, "www.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + req = HttpOpenRequest(con, "POST", "/post/post_action.php", "HTTP/1.0", "", types, INTERNET_FLAG_FORMS_SUBMIT, 0); + + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + + buffer[0] = 0; + size = sizeof(buffer); + ret = HttpQueryInfo(req, HTTP_QUERY_ACCEPT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(!strcmp(buffer, "*/*, %p, */*"), "got '%s' expected '*/*, %%p, */*'\n", buffer); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + #define STATUS_STRING(status) \ memcpy(status_string[status], #status, sizeof(CHAR) * \ (strlen(#status) < MAX_STATUS_NAME ? \ @@ -1821,4 +1846,5 @@ START_TEST(http) HttpHeaders_test(); test_http_connection(); test_user_agent_header(); + test_bogus_accept_types_array(); }

1 0

Alexandre Julliard : winedos: Print better diagnostics when a DOS app fails to start.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 2dc9ed3006dde794113c490ba15e06af551c8788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc9ed3006dde794113c490ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 7 17:33:50 2008 +0200 winedos: Print better diagnostics when a DOS app fails to start. --- dlls/kernel32/wowthunk.c | 2 +- dlls/winedos/dosmem.c | 2 -- dlls/winedos/dosvm.c | 13 +++++++------ dlls/winedos/module.c | 20 +++++++++++++++++--- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/wowthunk.c b/dlls/kernel32/wowthunk.c index 791f7cf..e86c582 100644 --- a/dlls/kernel32/wowthunk.c +++ b/dlls/kernel32/wowthunk.c @@ -593,7 +593,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, __wine_pop_frame( &frame ); if (errno != 0) /* enter_vm86 will fall with ENOSYS on x64 kernels */ { - ERR("__wine_enter_vm86 failed (errno=%d)\n", errno); + WARN("__wine_enter_vm86 failed (errno=%d)\n", errno); if (errno == ENOSYS) SetLastError(ERROR_NOT_SUPPORTED); else diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index 876a3e7..76bf10c 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -511,8 +511,6 @@ BOOL DOSMEM_MapDosLayout(void) ERR( "Need full access to the first megabyte for DOS mode\n" ); ExitProcess(1); } - MESSAGE( "Warning: unprotecting memory to allow real-mode calls.\n" - " NULL pointer accesses will no longer be caught.\n" ); /* copy the BIOS and ISR area down */ memcpy( DOSMEM_dosmem, DOSMEM_sysmem, 0x400 + 0x100 ); DOSMEM_sysmem = DOSMEM_dosmem; diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index 7defba1..4a86855 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -569,15 +569,16 @@ static LONG WINAPI exception_handler(EXCEPTION_POINTERS *eptr) return EXCEPTION_CONTINUE_SEARCH; } -int WINAPI DOSVM_Enter( CONTEXT86 *context ) +INT WINAPI DOSVM_Enter( CONTEXT86 *context ) { + INT ret = 0; if (!ISV86(context)) ERR( "Called with protected mode context!\n" ); __TRY { - WOWCallback16Ex( 0, WCB16_REGS, 0, NULL, (DWORD *)context ); - TRACE_(module)( "vm86 returned: %s\n", strerror(errno) ); + if (!WOWCallback16Ex( 0, WCB16_REGS, 0, NULL, (DWORD *)context )) ret = -1; + TRACE_(module)( "ret %d err %u\n", ret, GetLastError() ); } __EXCEPT(exception_handler) { @@ -585,7 +586,7 @@ int WINAPI DOSVM_Enter( CONTEXT86 *context ) } __ENDTRY - return 0; + return ret; } /*********************************************************************** @@ -645,8 +646,8 @@ void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val) */ INT WINAPI DOSVM_Enter( CONTEXT86 *context ) { - ERR_(module)("DOS realmode not supported on this architecture!\n"); - return -1; + SetLastError( ERROR_NOT_SUPPORTED ); + return -1; } /*********************************************************************** diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index ade7732..ac35e85 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -614,7 +614,7 @@ void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg ) static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) { CONTEXT context; - DWORD ret; + INT ret; dosvm_pid = getpid(); @@ -628,9 +628,23 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) context.EFlags = V86_FLAG | VIF_MASK; DOSVM_SetTimer(0x10000); ret = DOSVM_Enter( &context ); - + if (ret == -1) + { + /* fetch the app name from the environment */ + PDB16 *psp = PTR_REAL_TO_LIN( DOSVM_psp, 0 ); + char *env = PTR_REAL_TO_LIN( psp->environment, 0 ); + while (*env) env += strlen(env) + 1; + env += 1 + sizeof(WORD); + + if (GetLastError() == ERROR_NOT_SUPPORTED) + MESSAGE( "wine: Cannot start DOS application %s\n" + " because vm86 mode is not supported on this platform.\n", + debugstr_a(env) ); + else + FIXME( "vm86 mode failed error %u\n", GetLastError() ); + } dosvm_pid = 0; - return ret; + return ret != 0; } static BOOL MZ_InitTask(void)

1 0

Rob Shearman : winetest: Detect if an unhandled exception occurred in a child process and print an appropriate message .
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: ce42c95a1c8a651ef0cfa0ba9d3eedea3a159391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce42c95a1c8a651ef0cfa0ba9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 7 11:10:51 2008 +0100 winetest: Detect if an unhandled exception occurred in a child process and print an appropriate message. Avoid getting caught incrementing the failure count in this case, as it could take a very long time to complete. --- include/wine/test.h | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 72cd84c..1c91077 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -352,10 +352,18 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code) { - fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); - while (exit_code-- > 0) - InterlockedIncrement(&failures); + if (exit_code > 255) + { + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + InterlockedIncrement( &failures ); + } + else + { + fprintf( stdout, "%s: %u failures in child process\n", + current_test->name, exit_code ); + while (exit_code-- > 0) + InterlockedIncrement(&failures); + } } }

1 0

Rob Shearman : rpcrt4: Add better traces for the server test.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 02c66c2312d9bf98d0fc0d5d4ce56b8564718026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c66c2312d9bf98d0fc0d5d4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 7 11:11:09 2008 +0100 rpcrt4: Add better traces for the server test. Handle failure to use one or more protocol sequences more gracefully, as ncacn_np servers aren't support on Win9x and ncacn_ip_tcp fails on some machines. --- dlls/rpcrt4/tests/server.c | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 41f3bb2..5cc9d42 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1239,22 +1239,38 @@ server(void) static unsigned char port[] = PORT; static unsigned char np[] = "ncacn_np"; static unsigned char pipe[] = PIPE; + RPC_STATUS status, iptcp_status, np_status; - ok(RPC_S_OK == RpcServerUseProtseqEp(iptcp, 20, port, NULL), "RpcServerUseProtseqEp\n"); - ok(RPC_S_OK == RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL), "RpcServerRegisterIf\n"); - ok(RPC_S_OK == RpcServerListen(1, 20, TRUE), "RpcServerListen\n"); + iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); + ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %ld\n", iptcp_status); + np_status = RpcServerUseProtseqEp(np, 0, pipe, NULL); + ok(np_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %ld\n", np_status); + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %ld\n", status); + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_OK, "RpcServerListen failed with status %ld\n", status); stop_event = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(stop_event != NULL, "CreateEvent failed\n"); + ok(stop_event != NULL, "CreateEvent failed with error %d\n", GetLastError()); - run_client("tcp_basic"); + if (iptcp_status == RPC_S_OK) + run_client("tcp_basic"); + else + skip("tcp_basic tests skipped due to earlier failure\n"); - ok(RPC_S_OK == RpcServerUseProtseqEp(np, 0, pipe, NULL), "RpcServerUseProtseqEp\n"); - run_client("np_basic"); + if (np_status == RPC_S_OK) + run_client("np_basic"); + else + { + skip("np_basic tests skipped due to earlier failure\n"); + /* np client is what signals stop_event, so bail out if we didn't run do it */ + return; + } ok(WAIT_OBJECT_0 == WaitForSingleObject(stop_event, 60000), "WaitForSingleObject\n"); + status = RpcMgmtWaitServerListen(); todo_wine { - ok(RPC_S_OK == RpcMgmtWaitServerListen(), "RpcMgmtWaitServerListening\n"); + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %ld\n", status); } }

1 0

Kai Blin : secur32: Fix ntlm tests on Vista.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: 3da466a9f75076f618a5440805cd211a98c7b628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3da466a9f75076f618a544080… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed May 7 12:35:06 2008 +0200 secur32: Fix ntlm tests on Vista. --- dlls/secur32/tests/ntlm.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index f30f65e..b1f6c3f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -869,8 +869,8 @@ static void testAuth(ULONG data_rep, BOOL fake) ok(sec_status == SEC_E_OK, "pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned %s\n", getSecError(sec_status)); - ok(ctxt_sizes.cbMaxToken == 1904, - "cbMaxToken should be 1904 but is %lu\n", + ok((ctxt_sizes.cbMaxToken == 1904) || (ctxt_sizes.cbMaxToken == 2888), + "cbMaxToken should be 1904 or 2888 but is %lu\n", ctxt_sizes.cbMaxToken); ok(ctxt_sizes.cbMaxSignature == 16, "cbMaxSignature should be 16 but is %lu\n", @@ -1039,6 +1039,12 @@ static void testSignSeal(void) getSecError(sec_status)); sec_status = pEncryptMessage(client.ctxt, 0, &crypt, 0); + if (sec_status == SEC_E_UNSUPPORTED_FUNCTION) + { + skip("Encrypt message returned SEC_E_UNSUPPORTED_FUNCTION. " + "Expected on Vista.\n"); + goto end; + } ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status));

1 0

Vitaliy Margolen : dinput: Remove redundant variable.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: b07ff6ec868caad17ff52db6f3026aad8b01f560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07ff6ec868caad17ff52db6f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat May 3 14:19:52 2008 -0600 dinput: Remove redundant variable. --- dlls/dinput/joystick_linux.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index df5d77b..bfb8ba0 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -93,7 +93,6 @@ struct JoystickImpl LONG deadzone; int *axis_map; int axes; - int buttons; POINTL povs[4]; }; @@ -428,9 +427,9 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } #endif #ifdef JSIOCGBUTTONS - if (ioctl(newDevice->joyfd,JSIOCGBUTTONS,&newDevice->buttons) < 0) { + if (ioctl(newDevice->joyfd, JSIOCGBUTTONS, &newDevice->devcaps.dwButtons) < 0) { WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defauting to 2\n", newDevice->dev, strerror(errno)); - newDevice->buttons = 2; + newDevice->devcaps.dwButtons = 2; } #endif @@ -441,10 +440,10 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->axes = 16; } - if (newDevice->buttons > 128) + if (newDevice->devcaps.dwButtons > 128) { - WARN("Can't support %d buttons. Clamping down to 128\n", newDevice->buttons); - newDevice->buttons = 128; + WARN("Can't support %d buttons. Clamping down to 128\n", newDevice->devcaps.dwButtons); + newDevice->devcaps.dwButtons = 128; } newDevice->base.lpVtbl = jvt; @@ -456,7 +455,6 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di /* setup_dinput_options may change these */ newDevice->deadzone = 0; - newDevice->devcaps.dwButtons = newDevice->buttons; /* do any user specified configuration */ hr = setup_dinput_options(newDevice); @@ -467,7 +465,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto FAILED; memcpy(df, &c_dfDIJoystick2, c_dfDIJoystick2.dwSize); - df->dwNumObjs = newDevice->devcaps.dwAxes + newDevice->devcaps.dwPOVs + newDevice->buttons; + df->dwNumObjs = newDevice->devcaps.dwAxes + newDevice->devcaps.dwPOVs + newDevice->devcaps.dwButtons; if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto FAILED; for (i = 0; i < newDevice->axes; i++) @@ -483,7 +481,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di i++; /* POV takes 2 axes */ } } - for (i = 0; i < newDevice->buttons; i++) + for (i = 0; i < newDevice->devcaps.dwButtons; i++) { memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i + 12], df->dwObjSize); df->rgodf[idx ].pguid = &GUID_Button;

1 0

Vitaliy Margolen : dinput: Limit number of axes in a different way - map all extra axes to -1.
by Alexandre Julliard May 7, 2008

May 7, 2008

Module: wine Branch: master Commit: bdbc2783a1b23b80658c74167986cf8cf9538187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbc2783a1b23b80658c74167… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat May 3 14:19:57 2008 -0600 dinput: Limit number of axes in a different way - map all extra axes to -1. We can't stop device from sending us extra axes so have to keep axes mapping around for them. --- dlls/dinput/joystick_linux.c | 102 +++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 55 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index bfb8ba0..a151390 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -289,70 +289,65 @@ static HRESULT setup_dinput_options(JoystickImpl * device) if (!device->axis_map) return DIERR_OUTOFMEMORY; if (!get_config_key( hkey, appkey, device->name, buffer, MAX_PATH )) { + static const char *axis_names[] = {"X", "Y", "Z", "Rx", "Ry", "Rz", + "Slider1", "Slider2", + "POV1", "POV2", "POV3", "POV4"}; const char *delim = ","; char * ptr; TRACE("\"%s\" = \"%s\"\n", device->name, buffer); if ((ptr = strtok(buffer, delim)) != NULL) { do { - if (strcmp(ptr, "X") == 0) { - device->axis_map[tokens] = 0; - axis++; - } else if (strcmp(ptr, "Y") == 0) { - device->axis_map[tokens] = 1; - axis++; - } else if (strcmp(ptr, "Z") == 0) { - device->axis_map[tokens] = 2; - axis++; - } else if (strcmp(ptr, "Rx") == 0) { - device->axis_map[tokens] = 3; - axis++; - } else if (strcmp(ptr, "Ry") == 0) { - device->axis_map[tokens] = 4; - axis++; - } else if (strcmp(ptr, "Rz") == 0) { - device->axis_map[tokens] = 5; - axis++; - } else if (strcmp(ptr, "Slider1") == 0) { - device->axis_map[tokens] = 6; - axis++; - } else if (strcmp(ptr, "Slider2") == 0) { - device->axis_map[tokens] = 7; - axis++; - } else if (strcmp(ptr, "POV1") == 0) { - device->axis_map[tokens++] = 8; - device->axis_map[tokens] = 8; - pov++; - } else if (strcmp(ptr, "POV2") == 0) { - device->axis_map[tokens++] = 9; - device->axis_map[tokens] = 9; - pov++; - } else if (strcmp(ptr, "POV3") == 0) { - device->axis_map[tokens++] = 10; - device->axis_map[tokens] = 10; - pov++; - } else if (strcmp(ptr, "POV4") == 0) { - device->axis_map[tokens++] = 11; - device->axis_map[tokens] = 11; - pov++; - } else { - ERR("invalid joystick axis type: %s\n", ptr); - device->axis_map[tokens] = tokens; - axis++; + int i; + + for (i = 0; i < sizeof(axis_names) / sizeof(axis_names[0]); i++) + if (!strcmp(ptr, axis_names[i])) + { + if (!strncmp(ptr, "POV", 3)) + { + if (pov >= 4) + { + WARN("Only 4 POVs supported - ignoring extra\n"); + i = -1; + } + else + { + /* Pov takes two axes */ + device->axis_map[tokens++] = i; + pov++; + } + } + else + { + if (axis >= 8) + { + FIXME("Only 8 Axes supported - ignoring extra\n"); + i = -1; + } + else + axis++; + } + break; + } + + if (i == sizeof(axis_names) / sizeof(axis_names[0])) + { + ERR("invalid joystick axis type: \"%s\"\n", ptr); + i = -1; } + device->axis_map[tokens] = i; tokens++; } while ((ptr = strtok(NULL, delim)) != NULL); - if (tokens != device->devcaps.dwAxes) { + if (tokens != device->axes) { ERR("not all joystick axes mapped: %d axes(%d,%d), %d arguments\n", device->axes, axis, pov,tokens); while (tokens < device->axes) { - device->axis_map[tokens] = tokens; + device->axis_map[tokens] = -1; tokens++; } } } - } else { @@ -360,11 +355,13 @@ static HRESULT setup_dinput_options(JoystickImpl * device) { if (tokens < 8) device->axis_map[tokens] = axis++; - else + else if (tokens < 16) { device->axis_map[tokens++] = 8 + pov; device->axis_map[tokens ] = 8 + pov++; } + else + device->axis_map[tokens] = -1; } } device->devcaps.dwAxes = axis; @@ -433,13 +430,6 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di } #endif - if (newDevice->axes > 16) - { - /* There are 24 more axes for velocity that we can use */ - FIXME("Can't support %d axes. Clamping down to 16\n", newDevice->axes); - newDevice->axes = 16; - } - if (newDevice->devcaps.dwButtons > 128) { WARN("Can't support %d buttons. Clamping down to 128\n", newDevice->devcaps.dwButtons); @@ -472,6 +462,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di { int wine_obj = newDevice->axis_map[i]; + if (wine_obj < 0) continue; + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[wine_obj], df->dwObjSize); if (wine_obj < 8) df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS;

1 0