October 2006 - Wine-commits

Marcus Meissner : ntdll: Added debug registers test case.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 3a6d53e5d09da1d09211985947344b426860cdf3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a6d53e5d09da1d09211985… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 30 15:09:55 2006 +0200 ntdll: Added debug registers test case. --- dlls/ntdll/tests/exception.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 64e683b..1d00816 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -37,6 +37,7 @@ #include "wine/test.h" #ifdef __i386__ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); +static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); /* Test various instruction combinations that cause a protection fault on the i386, * and check what the resulting exception looks like. @@ -227,11 +228,65 @@ static void test_prot_fault(void) pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; } +static DWORD dreg_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + context->Eip += 2; /* Skips the popl (%eax) */ + context->Dr0 = 0; + context->Dr1 = 0; + context->Dr2 = 0; + context->Dr3 = 0; + context->Dr6 = 0; + context->Dr7 = 0x155; + return ExceptionContinueExecution; +} + +static BYTE code[5] = { + 0x31, 0xc0, /* xor %eax,%eax */ + 0x8f, 0x00, /* popl (%eax) - cause exception */ + 0xc3 /* ret */ +}; + +static void test_debug_regs(void) +{ + CONTEXT ctx; + NTSTATUS res; + struct + { + EXCEPTION_REGISTRATION_RECORD frame; + } exc_frame; + void (*func)(void) = (void*)code; + + pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + if (!pNtCurrentTeb) + { + trace( "NtCurrentTeb not found, skipping tests\n" ); + return; + } + pNtGetContextThread = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtGetContextThread" ); + if (!pNtGetContextThread) + { + trace( "NtGetContextThread not found, skipping tests\n" ); + return; + } + + exc_frame.frame.Handler = dreg_handler; + exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + func(); + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + res = pNtGetContextThread(GetCurrentThread(), &ctx); + ok (res == STATUS_SUCCESS,"NtGetContextThread failed with %lx", res); + ok(ctx.Dr7 == 0x155,"failed to set debugregister 7 to 0x155"); +} + #endif /* __i386__ */ START_TEST(exception) { #ifdef __i386__ test_prot_fault(); + test_debug_regs(); #endif }

1 0

Byeong-Sik Jeon : gdi32: Improve get_nearest_charset().
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 4cb637dc22cafa90ee84ab8a6773cbd96d68a983 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cb637dc22cafa90ee84ab8… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Mon Oct 2 06:42:50 2006 +0900 gdi32: Improve get_nearest_charset(). --- dlls/gdi/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 33d9808..f4b77a0 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1914,7 +1914,7 @@ static int get_nearest_charset(Face *fac *cp = acp; if(TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE)) - if(csi.fs.fsCsb[0] & face->fs.fsCsb[0]) + if(csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) return csi.ciCharset; for(i = 0; i < 32; i++) {

1 0

Dmitry Timoshkov : user/tests: Flush events before running mouse tests.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 8588562f0d23b84bdc1eeebfe3b6c6dfaf265bc1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8588562f0d23b84bdc1eeeb… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Oct 1 23:20:16 2006 +0900 user/tests: Flush events before running mouse tests. --- dlls/user/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 42c6ed5..7ad9aea 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2524,6 +2524,7 @@ static void test_mouse_input(HWND hwnd) ShowWindow(popup, SW_SHOW); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_events(); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);

1 0

Andrew Talbot : tapi32: Cast-qual warnings fix.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: b2d8e49695a16ddee5cbfee2b5065647e184f275 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2d8e49695a16ddee5cbfee… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Oct 1 16:19:53 2006 +0100 tapi32: Cast-qual warnings fix. --- dlls/tapi32/line.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 97e118a..ee73df1 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -665,18 +665,18 @@ DWORD WINAPI lineGetTranslateCapsA(HLINE char buf[10]; numlocations = 1; length += sizeof(LINELOCATIONENTRY) + 20 ; - RegSetValueExA( hsubkey, "AreaCode", 0, REG_SZ, (LPBYTE)"010", 4); + RegSetValueExA( hsubkey, "AreaCode", 0, REG_SZ, (const BYTE *)"010", 4); GetLocaleInfoA( LOCALE_SYSTEM_DEFAULT, LOCALE_ICOUNTRY, buf, 8); dwval = atoi(buf); RegSetValueExA( hsubkey, "Country", 0, REG_DWORD, (LPBYTE)&dwval, sizeof(DWORD)); - RegSetValueExA( hsubkey, "DisableCallWaiting", 0, REG_SZ, (LPBYTE)"", 1); + RegSetValueExA( hsubkey, "DisableCallWaiting", 0, REG_SZ, (const BYTE *)"", 1); dwval = 1; RegSetValueExA( hsubkey, "Flags", 0, REG_DWORD, (LPBYTE)&dwval, sizeof(DWORD)); - RegSetValueExA( hsubkey, "LongDistanceAccess", 0, REG_SZ, (LPBYTE)"", 1); - RegSetValueExA( hsubkey, "Name", 0, REG_SZ, (LPBYTE)"New Location", 13); - RegSetValueExA( hsubkey, "OutsideAccess", 0, REG_SZ, (LPBYTE)"", 1); + RegSetValueExA( hsubkey, "LongDistanceAccess", 0, REG_SZ, (const BYTE *)"", 1); + RegSetValueExA( hsubkey, "Name", 0, REG_SZ, (const BYTE *)"New Location", 13); + RegSetValueExA( hsubkey, "OutsideAccess", 0, REG_SZ, (const BYTE *)"", 1); RegCloseKey(hsubkey); dwval = 1; RegSetValueExA( hkLocations, "CurrentID", 0, REG_DWORD, @@ -723,13 +723,13 @@ DWORD WINAPI lineGetTranslateCapsA(HLINE DWORD dwval; numcards = 1; length += sizeof(LINECARDENTRY) + 22 ; - RegSetValueExA( hsubkey, "Name", 0, REG_SZ, (LPBYTE)"None (Direct Call)", 19); + RegSetValueExA( hsubkey, "Name", 0, REG_SZ, (const BYTE *)"None (Direct Call)", 19); dwval = 1; RegSetValueExA( hsubkey, "Flags", 0, REG_DWORD, (LPBYTE)&dwval, sizeof(DWORD)); - RegSetValueExA( hsubkey, "InternationalRule", 0, REG_SZ, (LPBYTE)"", 1); - RegSetValueExA( hsubkey, "LDRule", 0, REG_SZ, (LPBYTE)"", 1); - RegSetValueExA( hsubkey, "LocalRule", 0, REG_SZ, (LPBYTE)"", 1); + RegSetValueExA( hsubkey, "InternationalRule", 0, REG_SZ, (const BYTE *)"", 1); + RegSetValueExA( hsubkey, "LDRule", 0, REG_SZ, (const BYTE *)"", 1); + RegSetValueExA( hsubkey, "LocalRule", 0, REG_SZ, (const BYTE *)"", 1); RegCloseKey(hsubkey); dwval = 2; RegSetValueExA( hkCards, "NextID", 0, REG_DWORD, (LPBYTE)&dwval,

1 0

Dmitry Timoshkov : ws2_32: Use a symbolic name instead of hand-made value.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 888c930f2d0fb6707ceee1a5571db5077274de79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=888c930f2d0fb6707ceee1a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 2 00:15:59 2006 +0900 ws2_32: Use a symbolic name instead of hand-made value. --- dlls/ws2_32/socket.c | 4 ++-- include/winsock.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 637642c..2cd230b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2258,7 +2258,7 @@ #endif break; default: - WARN("\tunsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode); + FIXME("unsupported WS_IOCTL cmd (%08lx)\n", dwIoControlCode); release_sock_fd( s, fd ); WSASetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; @@ -2318,7 +2318,7 @@ int WINAPI WS_ioctlsocket(SOCKET s, long newcmd=SIOCATMARK; break; - case WS__IOW('f',125,u_long): + case WS_FIOASYNC: WARN("Warning: WS1.1 shouldn't be using async I/O\n"); SetLastError(WSAEINVAL); return SOCKET_ERROR; diff --git a/include/winsock.h b/include/winsock.h index 32827ed..e95ab2f 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -750,10 +750,20 @@ #endif #ifndef USE_WS_PREFIX #define FIONREAD _IOR('f', 127, u_long) #define FIONBIO _IOW('f', 126, u_long) +#define FIOASYNC _IOW('f', 125, u_long) +#define SIOCSHIWAT _IOW('s', 0, u_long) +#define SIOCGHIWAT _IOR('s', 1, u_long) +#define SIOCSLOWAT _IOW('s', 2, u_long) +#define SIOCGLOWAT _IOR('s', 3, u_long) #define SIOCATMARK _IOR('s', 7, u_long) #else #define WS_FIONREAD WS__IOR('f', 127, u_long) #define WS_FIONBIO WS__IOW('f', 126, u_long) +#define WS_FIOASYNC WS__IOW('f', 125, u_long) +#define WS_SIOCSHIWAT WS__IOW('s', 0, u_long) +#define WS_SIOCGHIWAT WS__IOR('s', 1, u_long) +#define WS_SIOCSLOWAT WS__IOW('s', 2, u_long) +#define WS_SIOCGLOWAT WS__IOR('s', 3, u_long) #define WS_SIOCATMARK WS__IOR('s', 7, u_long) #endif

1 0

Dmitry Timoshkov : ws2_32: Add a comment to ioctlsocket about 'bogus' ioctl 0x667e.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 0d5bcdaedaa749a252772f6b0270e77c368bff3c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d5bcdaedaa749a252772f6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 2 00:27:38 2006 +0900 ws2_32: Add a comment to ioctlsocket about 'bogus' ioctl 0x667e. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2cd230b..c752b39 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2332,6 +2332,9 @@ int WINAPI WS_ioctlsocket(SOCKET s, long default: /* Netscape tries hard to use bogus ioctl 0x667e */ + /* FIXME: 0x667e above is ('f' << 8) | 126, and is a low word of + * FIONBIO (_IOW('f', 126, u_long)), how that should be handled? + */ WARN("\tunknown WS_IOCTL cmd (%08lx)\n", cmd); break; }

1 0

Alexandre Julliard : winsock: Make sure to include sys/types.h in all cases .
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 6910043d6e31239a7af6ed4b50f5eabfde4b906f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6910043d6e31239a7af6ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 2 11:57:54 2006 +0200 winsock: Make sure to include sys/types.h in all cases. --- include/winsock.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 14ce99a..32827ed 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -43,6 +43,7 @@ # ifdef FD_CLR * All we can do is disable all these symbols so that they are not used * inadvertantly. */ +# include <sys/types.h> # undef FD_SETSIZE # undef FD_CLR # undef FD_SET

1 0

Alexander Nicolaysen Sørnes : Updated Norwegian Bokmål translations .
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 5387119050c75e976575def6a60931d2e815ebb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5387119050c75e976575def… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Sep 30 21:18:02 2006 +0200 Updated Norwegian Bokmål translations. --- dlls/devenum/devenum.rc | 9 +++++++ dlls/winspool.drv/No.rc | 39 +++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + programs/cmdlgtst/No.rc | 52 ++++++++++++++++++++++++++++++++--------- programs/regedit/No.rc | 16 +++++++++++++ 5 files changed, 105 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5387119050c75e97657…

1 0

Ivan Gyurdiev : wined3d: Remove unused field in shader opcode_arg.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 01d9eac0be864d3174e213590f369e0983f30f80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01d9eac0be864d3174e2135… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Oct 1 08:07:53 2006 -0400 wined3d: Remove unused field in shader opcode_arg. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d2ee681..9312b3b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1412,7 +1412,6 @@ typedef struct SHADER_OPCODE { } SHADER_OPCODE; typedef struct SHADER_OPCODE_ARG { - IWineD3DStateBlock* stateBlock; IWineD3DBaseShader* shader; shader_reg_maps* reg_maps; CONST SHADER_OPCODE* opcode;

1 0

Stefan Leichter : oleaut32/tests: Print each 64-bit integers as two 32 bit integers.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: a94bd8afdd7dc89b899d1dd46aa315472baad4f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a94bd8afdd7dc89b899d1dd… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Sep 30 20:31:07 2006 +0200 oleaut32/tests: Print each 64-bit integers as two 32 bit integers. --- dlls/oleaut32/tests/vartest.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 45c5972..e914054 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1239,14 +1239,16 @@ #define EXPECT_I8(high,low) EXPECT_OK { ok(V_I8(&vOut) == ((((LONG64)(high))<<32)|(low)), "Expected i8 = %lx%08lx, got %lx%08lx\n", \ (LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); } #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ - ok(V_UI8(&vOut) == val, "Expected ui8 = %lld, got %lld\n", (ULONG64)val, V_UI8(&vOut)); } + ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%lx%08lx, got 0x%lx%08lx\n", \ + (DWORD)((ULONG64)val >> 32), (DWORD)(ULONG64)val, (DWORD)(V_UI8(&vOut) >> 32), (DWORD)V_UI8(&vOut)); } #define EXPECT_R4(val) EXPECT_OK { EXPECT_TYPE(VT_R4); \ ok(V_R4(&vOut) == val, "Expected r4 = %f, got %f\n", val, V_R4(&vOut)); } #define EXPECT_R8(val) EXPECT_OK { EXPECT_TYPE(VT_R8); \ ok(V_R8(&vOut) == val, "Expected r8 = %g, got %g\n", val, V_R8(&vOut)); } #define CY_MULTIPLIER 10000 #define EXPECT_CY(val) EXPECT_OK { EXPECT_TYPE(VT_CY); \ - ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = %lld, got %lld\n", (LONG64)val, V_CY(&vOut).int64); } + ok(V_CY(&vOut).int64 == (LONG64)(val * CY_MULTIPLIER), "Expected r8 = 0x%lx%08lx, got 0x%lx%08lx\n", \ + (DWORD)((LONG64)val >> 23), (DWORD)(LONG64)val, (DWORD)(V_CY(&vOut).int64 >>32), (DWORD)V_CY(&vOut).int64); } static void test_VarNumFromParseNum(void) { @@ -2780,7 +2782,8 @@ static void test_VarInt(void) pcy->int64 = -11000; hres = pVarInt(&v,&vDst); ok(hres == S_OK && V_VT(&vDst) == VT_CY && V_CY(&vDst).int64 == -20000, - "VarInt: VT_CY wrong, hres=0x%lX %lld\n", hres,V_CY(&vDst).int64); + "VarInt: VT_CY wrong, hres=0x%lX 0x%lx%08lx\n", + hres, (DWORD)(V_CY(&vDst).int64 >> 32), (DWORD)V_CY(&vDst).int64); } static HRESULT (WINAPI *pVarNeg)(LPVARIANT,LPVARIANT); @@ -7486,7 +7489,8 @@ static void test_VarIdiv(void) "VARIDIV: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type %s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == 5000, - "VARIDIV: CY value %lld, expected %d\n", V_I8(&result), 5000); + "VARIDIV: CY value 0x%lx%08lx, expected 0x%x\n", + (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), 5000); hres = VarIdiv(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_I4, @@ -7514,7 +7518,8 @@ static void test_VarIdiv(void) "VARIDIV: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type%s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == 1, - "VARIDIV: DECIMAL value %lld, expected %d\n", V_I8(&result), 1); + "VARIDIV: DECIMAL value 0x%lx%08lx, expected %d\n", + (DWORD)(V_I8(&result) >> 32), (DWORD)V_I8(&result), 1); /* Check for division by zero */ V_VT(&left) = VT_INT; @@ -8038,7 +8043,8 @@ static void test_VarImp(void) "VARIMP: expected coerced hres 0x%lX type VT_I8, got hres 0x%lX type%s!\n", S_OK, hres, vtstr(V_VT(&result))); ok(hres == S_OK && V_I8(&result) == -3, - "VARIMP: DECIMAL value %lld, expected %d\n", V_I8(&result), -3); + "VARIMP: DECIMAL value 0x%lx%08lx, expected %d\n", + (DWORD)(V_I8(&result) >>32), (DWORD)V_I8(&result), -3); SysFreeString(false_str); SysFreeString(true_str);

1 0