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

Mikołaj Zalewski : comctl32: rebar tests: Support different window border width.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 6156154409f94aabf33c12d7d4ff040c25637b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6156154409f94aabf33c12d7d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Mar 1 13:42:37 2007 +0100 comctl32: rebar tests: Support different window border width. --- dlls/comctl32/tests/rebar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 640091a..e769420 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -790,7 +790,8 @@ START_TEST(rebar) wc.lpfnWndProc = MyWndProc; RegisterClassA(&wc); hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, 680, 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), + CW_USEDEFAULT, CW_USEDEFAULT, 672+2*GetSystemMetrics(SM_CXSIZEFRAME), + 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), NULL, NULL, GetModuleHandleA(NULL), 0); GetClientRect(hMainWnd, &rc); ShowWindow(hMainWnd, SW_SHOW);

1 0

Rob Shearman : schannel: Add new schannel dll that mostly forwards to secur32.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 361c6f207c237920546a0341b33c2a4464be4c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361c6f207c237920546a0341b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 1 12:17:59 2007 +0000 schannel: Add new schannel dll that mostly forwards to secur32. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/schannel/Makefile.in | 13 +++++++++++++ dlls/schannel/schannel.spec | 37 +++++++++++++++++++++++++++++++++++++ dlls/schannel/schannel_main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 97 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index bc1d654..d4e743a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -336,6 +336,7 @@ ALL_MAKEFILES = \ dlls/rsaenh/Makefile \ dlls/rsaenh/tests/Makefile \ dlls/sane.ds/Makefile \ + dlls/schannel/Makefile \ dlls/secur32/Makefile \ dlls/secur32/tests/Makefile \ dlls/security/Makefile \ @@ -670,6 +671,7 @@ dlls/rsabase/tests/Makefile: dlls/rsabase/tests/Makefile.in dlls/Maketest.rules dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules +dlls/schannel/Makefile: dlls/schannel/Makefile.in dlls/Makedll.rules dlls/secur32/Makefile: dlls/secur32/Makefile.in dlls/Makedll.rules dlls/secur32/tests/Makefile: dlls/secur32/tests/Makefile.in dlls/Maketest.rules dlls/security/Makefile: dlls/security/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index c7023cf..18faa4e 100755 --- a/configure +++ b/configure @@ -20803,6 +20803,8 @@ ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" ac_config_files="$ac_config_files dlls/sane.ds/Makefile" +ac_config_files="$ac_config_files dlls/schannel/Makefile" + ac_config_files="$ac_config_files dlls/secur32/Makefile" ac_config_files="$ac_config_files dlls/secur32/tests/Makefile" @@ -21831,6 +21833,7 @@ do "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; + "dlls/schannel/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/schannel/Makefile" ;; "dlls/secur32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/secur32/Makefile" ;; "dlls/secur32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/secur32/tests/Makefile" ;; "dlls/security/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/security/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7c27c34..59257fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1706,6 +1706,7 @@ AC_CONFIG_FILES([dlls/rsabase/tests/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile]) AC_CONFIG_FILES([dlls/sane.ds/Makefile]) +AC_CONFIG_FILES([dlls/schannel/Makefile]) AC_CONFIG_FILES([dlls/secur32/Makefile]) AC_CONFIG_FILES([dlls/secur32/tests/Makefile]) AC_CONFIG_FILES([dlls/security/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 95c98d3..4c47aae 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -149,6 +149,7 @@ BASEDIRS = \ rsabase \ rsaenh \ sane.ds \ + schannel \ secur32 \ security \ sensapi \ diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in new file mode 100644 index 0000000..bc67151 --- /dev/null +++ b/dlls/schannel/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = schannel.dll +IMPORTS = secur32 kernel32 + +C_SRCS = \ + schannel_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/schannel/schannel.spec b/dlls/schannel/schannel.spec new file mode 100644 index 0000000..7dd12fa --- /dev/null +++ b/dlls/schannel/schannel.spec @@ -0,0 +1,37 @@ +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) secur32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleW +@ stdcall ApplyControlToken(ptr ptr) secur32.ApplyControlToken +@ stub CloseSslPerformanceData +@ stub CollectSslPerformanceData +@ stdcall CompleteAuthToken(ptr ptr) secur32.CompleteAuthToken +@ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext +@ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW +@ stdcall FreeContextBuffer(ptr) secur32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) secur32.FreeCredentialsHandle +@ stdcall ImpersonateSecurityContext(ptr) secur32.ImpersonateSecurityContext +@ stdcall InitSecurityInterfaceA() secur32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() secur32.InitSecurityInterfaceW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextW +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature +@ stub OpenSslPerformanceData +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage +@ stub SpLsaModeInitialize +@ stub SpUserModeInitialize +@ stub SslCrackCertificate +@ stub SslEmptyCacheA +@ stub SslEmptyCacheW +@ stub SslFreeCertificate +@ stub SslGenerateKeyPair +@ stub SslGenerateRandomBits +@ stub SslGetMaximumKeySize +@ stub SslLoadCertificate +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature diff --git a/dlls/schannel/schannel_main.c b/dlls/schannel/schannel_main.c new file mode 100644 index 0000000..9889c5d --- /dev/null +++ b/dlls/schannel/schannel_main.c @@ -0,0 +1,40 @@ +/* + * SSL/TLS Security Library + * + * Copyright 2007 Rob Shearman, for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hinstDLL); + + return TRUE; +}

1 0

Rob Shearman : secur32: SealMessage and UnsealMessage are aliases of EncryptMessage and DecryptMessage respectively .
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 12f2f09a6c53c94c1decb7ff15b8ece26c4117b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f2f09a6c53c94c1decb7ff1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 1 12:14:09 2007 +0000 secur32: SealMessage and UnsealMessage are aliases of EncryptMessage and DecryptMessage respectively. --- dlls/secur32/secur32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 6dc8e05..5e73003 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -61,7 +61,7 @@ @ stub SaslIdentifyPackageW @ stub SaslInitializeSecurityContextA @ stub SaslInitializeSecurityContextW -@ stub SealMessage +@ stdcall SealMessage(ptr long ptr long) EncryptMessage @ stub SecCacheSspiPackages @ stub SecGetLocaleSpecificEncryptionRules @ stub SecpFreeMemory @@ -69,5 +69,5 @@ @ stub SecpTranslateNameEx @ stdcall TranslateNameA(str long long ptr ptr) @ stdcall TranslateNameW(wstr long long ptr ptr) -@ stub UnsealMessage +@ stdcall UnsealMessage(ptr ptr long ptr) DecryptMessage @ stdcall VerifySignature(ptr ptr long ptr)

1 0

Alexandre Julliard : makedep: Fixed string comparison against the source tree path
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 4fff18b5349bed42f2a7719407c932b28c11953a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fff18b5349bed42f2a771940… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 15:21:39 2007 +0100 makedep: Fixed string comparison against the source tree path (reported by Kai Blin). --- tools/makedep.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a983e4b..e96cdf6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -945,8 +945,8 @@ int main( int argc, char *argv[] ) if (path->name[0] != '/') continue; if (top_src_dir) { - if (!strncmp( path->name, top_src_dir, strlen(top_src_dir) )) continue; - if (path->name[strlen(top_src_dir)] == '/') continue; + if (!strncmp( path->name, top_src_dir, strlen(top_src_dir) ) && + path->name[strlen(top_src_dir)] == '/') continue; } list_remove( &path->entry ); free( path );

1 0

Alessandro Pignotti : dplay: Directplay should initialize session Guid, with conformance tests.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: d1331e62ca52a43753b23121b5e66398145b2981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1331e62ca52a43753b23121b… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Tue Feb 27 17:27:43 2007 +0100 dplay: Directplay should initialize session Guid, with conformance tests. --- .gitignore | 4 ++ Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/dplayx/dplay.c | 6 ++- dlls/dplayx/tests/Makefile.in | 14 ++++++ dlls/dplayx/tests/dplayx.c | 89 +++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 10 files changed, 123 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 21f12e3..772db5f 100644 --- a/.gitignore +++ b/.gitignore @@ -213,6 +213,9 @@ dlls/dnsapi/tests/testlist.c dlls/dplay/libdplay.def dlls/dplay/version.res dlls/dplayx/libdplayx.def +dlls/dplayx/tests/*.ok +dlls/dplayx/tests/dplayx_crosstest.exe +dlls/dplayx/tests/testlist.c dlls/dplayx/version.res dlls/dpnet/libdpnet.def dlls/dpnet/version.res @@ -803,6 +806,7 @@ programs/winetest/d3d9_test.exe programs/winetest/ddraw_test.exe programs/winetest/dinput_test.exe programs/winetest/dnsapi_test.exe +programs/winetest/dplayx_test.exe programs/winetest/dsound_test.exe programs/winetest/gdi32_test.exe programs/winetest/hlink_test.exe diff --git a/Makefile.in b/Makefile.in index 86fa213..bc1d654 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,6 +216,7 @@ ALL_MAKEFILES = \ dlls/dnsapi/tests/Makefile \ dlls/dplay/Makefile \ dlls/dplayx/Makefile \ + dlls/dplayx/tests/Makefile \ dlls/dpnet/Makefile \ dlls/dpnhpast/Makefile \ dlls/dsound/Makefile \ @@ -549,6 +550,7 @@ dlls/dnsapi/Makefile: dlls/dnsapi/Makefile.in dlls/Makedll.rules dlls/dnsapi/tests/Makefile: dlls/dnsapi/tests/Makefile.in dlls/Maketest.rules dlls/dplay/Makefile: dlls/dplay/Makefile.in dlls/Makedll.rules dlls/dplayx/Makefile: dlls/dplayx/Makefile.in dlls/Makedll.rules +dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 67f50c2..c7023cf 100755 --- a/configure +++ b/configure @@ -20563,6 +20563,8 @@ ac_config_files="$ac_config_files dlls/dplay/Makefile" ac_config_files="$ac_config_files dlls/dplayx/Makefile" +ac_config_files="$ac_config_files dlls/dplayx/tests/Makefile" + ac_config_files="$ac_config_files dlls/dpnet/Makefile" ac_config_files="$ac_config_files dlls/dpnhpast/Makefile" @@ -21709,6 +21711,7 @@ do "dlls/dnsapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dnsapi/tests/Makefile" ;; "dlls/dplay/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dplay/Makefile" ;; "dlls/dplayx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dplayx/Makefile" ;; + "dlls/dplayx/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dplayx/tests/Makefile" ;; "dlls/dpnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnet/Makefile" ;; "dlls/dpnhpast/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnhpast/Makefile" ;; "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; diff --git a/configure.ac b/configure.ac index f363868..7c27c34 100644 --- a/configure.ac +++ b/configure.ac @@ -1586,6 +1586,7 @@ AC_CONFIG_FILES([dlls/dnsapi/Makefile]) AC_CONFIG_FILES([dlls/dnsapi/tests/Makefile]) AC_CONFIG_FILES([dlls/dplay/Makefile]) AC_CONFIG_FILES([dlls/dplayx/Makefile]) +AC_CONFIG_FILES([dlls/dplayx/tests/Makefile]) AC_CONFIG_FILES([dlls/dpnet/Makefile]) AC_CONFIG_FILES([dlls/dpnhpast/Makefile]) AC_CONFIG_FILES([dlls/dsound/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2e3cafc..95c98d3 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -233,6 +233,7 @@ TESTSUBDIRS = \ ddraw/tests \ dinput/tests \ dnsapi/tests \ + dplayx/tests \ dsound/tests \ gdi32/tests \ hlink/tests \ diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index f5c630a..3ca90db 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3244,7 +3244,11 @@ static HRESULT WINAPI DP_SetSessionDesc HeapFree( GetProcessHeap(), 0, This->dp2->lpSessionDesc ); This->dp2->lpSessionDesc = lpTempSessDesc; - + if( bInitial ) + { + /*Initializing session GUID*/ + CoCreateGuid( &(This->dp2->lpSessionDesc->guidInstance) ); + } /* Set the new */ DP_CopySessionDesc( This->dp2->lpSessionDesc, lpSessDesc, bAnsi ); diff --git a/dlls/dplayx/tests/Makefile.in b/dlls/dplayx/tests/Makefile.in new file mode 100644 index 0000000..82a9064 --- /dev/null +++ b/dlls/dplayx/tests/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = dplayx.dll +IMPORTS = ole32 kernel32 +EXTRALIBS = -ldxguid + +CTESTS = \ + dplayx.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c new file mode 100644 index 0000000..6568f13 --- /dev/null +++ b/dlls/dplayx/tests/dplayx.c @@ -0,0 +1,89 @@ +/* DirectPlay Conformance Tests + * + * Copyright 2007 - Alessandro Pignotti + * + * 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 + */ + +#include "wine/test.h" +#include <dplay.h> + +static BOOL validSP = FALSE; /*This global variable is needed until wine has a working service provider + implementation*/ + +static BOOL CALLBACK EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnection, + DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, LPVOID lpContext) +{ + HRESULT hr; + + if(IsEqualGUID(lpguidSP,&DPSPGUID_TCPIP)) + { + /*I'm forcing TCP/IP Sevice provider*/ + hr = IDirectPlayX_InitializeConnection((LPDIRECTPLAY4) lpContext, lpConnection, 0); + todo_wine ok( SUCCEEDED( hr ), "It's not possible to initialize TCP/IP service provider\n"); + if( SUCCEEDED( hr )) + validSP = TRUE; + return FALSE; + } + return TRUE; +} + +static void test_session_guid(LPDIRECTPLAY4 pDP) +{ + GUID appGuid; + GUID zeroGuid; + DPSESSIONDESC2 sessionDesc; + LPDPSESSIONDESC2 newSession; + DWORD sessionSize; + static char name[] = "DPlay conformance test"; + + CoCreateGuid( &appGuid ); + IDirectPlayX_EnumConnections(pDP, &appGuid, EnumConnectionsCallback, pDP, 0); + if( validSP ) + { + memset(&sessionDesc, 0, sizeof( DPSESSIONDESC2 )); + memset(&zeroGuid, 0, 16); + + sessionDesc.dwSize = sizeof( DPSESSIONDESC2 ); + memcpy(&sessionDesc.guidApplication, &appGuid, 16); + sessionDesc.dwFlags = DPSESSION_CLIENTSERVER; + sessionDesc.lpszSessionNameA = name; + sessionDesc.dwMaxPlayers = 10; + sessionDesc.dwCurrentPlayers = 0; + IDirectPlayX_Open(pDP, &sessionDesc, DPOPEN_CREATE); + /* I read the sessiondesc from directplay in a fresh memory location, + because directplay does not touch the original struct, but saves + internally a version with the session guid set*/ + IDirectPlayX_GetSessionDesc(pDP, NULL, &sessionSize); + newSession=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sessionSize); + IDirectPlayX_GetSessionDesc(pDP, newSession, &sessionSize); + todo_wine ok( !IsEqualGUID(&newSession->guidInstance, &zeroGuid), "Session guid not initialized"); + HeapFree(GetProcessHeap(), 0, newSession); + } +} + + +START_TEST(dplayx) +{ + LPDIRECTPLAY4 pDP; + + CoInitialize( NULL ); + CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_ALL, &IID_IDirectPlay4A, (VOID**)&pDP); + + test_session_guid( pDP ); + + IDirectPlayX_Release( pDP ); + CoUninitialize(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index f35b768..056d636 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -36,6 +36,7 @@ TESTBINS = \ ddraw_test.exe \ dinput_test.exe \ dnsapi_test.exe \ + dplayx_test.exe \ dsound_test.exe \ gdi32_test.exe \ hlink_test.exe \ @@ -109,6 +110,8 @@ dinput_test.exe: $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) cp $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) $@ && $(STRIP) $@ dnsapi_test.exe: $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) cp $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ +dplayx_test.exe: $(DLLDIR)/dplayx/tests/dplayx_test.exe$(DLLEXT) + cp $(DLLDIR)/dplayx/tests/dplayx_test.exe$(DLLEXT) $@ && $(STRIP) $@ dsound_test.exe: $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) cp $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) $@ && $(STRIP) $@ gdi32_test.exe: $(DLLDIR)/gdi32/tests/gdi32_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 423eb1a..2401ac1 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -159,6 +159,7 @@ d3d9_test.exe TESTRES "d3d9_test.exe" ddraw_test.exe TESTRES "ddraw_test.exe" dinput_test.exe TESTRES "dinput_test.exe" dnsapi_test.exe TESTRES "dnsapi_test.exe" +dplayx_test.exe TESTRES "dplayx_test.exe" dsound_test.exe TESTRES "dsound_test.exe" gdi32_test.exe TESTRES "gdi32_test.exe" hlink_test.exe TESTRES "hlink_test.exe"

1 0

Alexander Nicolaysen Sørnes : wordpad: Add text alignment buttons.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 5c9edfd4be83c22521c3fda1a50aaa144cfda17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9edfd4be83c22521c3fda1a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Feb 27 15:09:24 2007 +0100 wordpad: Add text alignment buttons. --- programs/wordpad/rsrc.rc | 85 +++++++++++++++++++++++++++---------------- programs/wordpad/wordpad.c | 18 ++++++++- 2 files changed, 69 insertions(+), 34 deletions(-) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index a4c57e5..b8e3f54 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -42,38 +42,59 @@ END /* BINRES toolbar.bmp */ IDB_TOOLBAR BITMAP "toolbar.bmp" /* { - '42 4D F6 01 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 30 00 00 00 10 00 00 00 01 00 04 00 00 00' - '00 00 80 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '00 00 00 00 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 80' - '00 00 00 88 88 88 88 88 00 00 08 88 88 88 88 88' - '80 00 00 08 88 88 88 80 08 88 80 08 88 88 88 88' - '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 80' - '08 88 80 08 88 88 88 88 88 08 88 88 88 88 88 88' - '08 88 88 80 88 88 88 80 08 88 80 08 88 88 88 88' - '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 80' - '08 88 80 08 88 88 88 88 88 80 88 88 88 88 88 88' - '08 88 88 80 88 88 88 80 00 00 00 88 88 88 88 88' - '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 80' - '08 88 80 08 88 88 88 88 88 80 88 88 88 88 88 88' - '08 88 88 80 88 88 88 80 08 88 80 08 88 88 88 88' - '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 80' - '08 88 80 08 88 88 88 88 88 88 08 88 88 88 88 88' - '08 88 88 80 88 88 88 80 00 00 00 88 88 88 88 88' - '88 00 00 08 88 88 88 88 08 88 88 80 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' - '88 88 88 88 88 88' + '42 4d 3e 03 00 00 00 00 00 00 3e 00 00 00 28 00' + '00 00 60 00 00 00 10 00 00 00 01 00 04 00 00 00' + '00 00 00 03 00 00 12 0b 00 00 12 0b 00 00 02 00' + '00 00 02 00 00 00 c0 c0 c0 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '11 11 11 11 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 11 11 11 11 11 10 00 00 11' + '11 11 11 11 11 00 00 00 01 11 11 11 11 00 00 01' + '11 11 11 00 00 00 00 00 11 11 10 00 00 00 00 00' + '01 11 11 10 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' + '10 00 00 01 00 00 00 11 11 11 10 00 00 00 00 00' + '01 11 11 10 00 00 00 11 11 11 11 11 11 00 00 01' + '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' + '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' + '10 00 00 01 00 00 00 11 11 11 11 11 11 00 00 00' + '11 11 11 11 00 00 00 00 00 11 11 11 11 00 00 01' + '10 00 01 10 00 00 00 00 00 01 00 00 00 00 00 00' + '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '11 11 11 00 00 00 00 00 00 01 00 00 00 00 00 00' + '10 00 00 01 00 00 00 11 11 11 11 10 00 00 00 11' + '11 11 11 11 11 00 00 00 00 00 01 11 11 00 00 01' + '10 00 01 10 00 00 00 00 00 01 00 00 00 00 00 00' + '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '10 00 01 10 00 00 00 00 00 00 10 00 00 00 00 00' + '10 00 00 01 00 00 00 11 11 11 11 11 11 00 00 00' + '11 11 11 11 00 00 00 01 11 11 11 11 11 00 00 01' + '10 00 01 10 00 00 00 00 00 00 10 00 00 00 00 00' + '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' + '11 11 11 00 00 00 00 00 00 11 11 10 00 00 00 00' + '10 00 00 01 00 00 00 11 11 11 11 00 00 00 00 00' + '01 11 11 10 00 00 00 00 00 11 11 11 11 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 11 11 11 11 11 11 00 00 11' + '11 11 11 11 11 00 00 11 11 11 11 11 11 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00' + } */ #include "De.rc" diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2c650e0..bd0aeae 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -292,13 +292,13 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, IDC_TOOLBAR, - 3, hInstance, IDB_TOOLBAR, + 6, hInstance, IDB_TOOLBAR, NULL, 0, 24, 24, 16, 16, sizeof(TBBUTTON)); ab.hInst = HINST_COMMCTRL; ab.nID = IDB_STD_SMALL_COLOR; - nStdBitmaps = SendMessage(hToolBarWnd, TB_ADDBITMAP, 3, (LPARAM)&ab); + nStdBitmaps = SendMessage(hToolBarWnd, TB_ADDBITMAP, 6, (LPARAM)&ab); AddButton(hToolBarWnd, nStdBitmaps+STD_FILENEW, ID_FILE_NEW); AddButton(hToolBarWnd, nStdBitmaps+STD_FILEOPEN, ID_FILE_OPEN); AddButton(hToolBarWnd, nStdBitmaps+STD_FILESAVE, ID_FILE_SAVE); @@ -317,6 +317,10 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) AddButton(hToolBarWnd, 0, ID_FORMAT_BOLD); AddButton(hToolBarWnd, 1, ID_FORMAT_ITALIC); AddButton(hToolBarWnd, 2, ID_FORMAT_UNDERLINE); + AddSeparator(hToolBarWnd); + AddButton(hToolBarWnd, 3, ID_ALIGN_LEFT); + AddButton(hToolBarWnd, 4, ID_ALIGN_CENTER); + AddButton(hToolBarWnd, 5, ID_ALIGN_RIGHT); SendMessage(hToolBarWnd, TB_ADDSTRING, 0, (LPARAM)"Exit\0"); SendMessage(hToolBarWnd, TB_AUTOSIZE, 0, 0); @@ -361,10 +365,14 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) HWND hwndToolBar = GetDlgItem(hwndReBar, IDC_TOOLBAR); int from, to; CHARFORMAT2W fmt; + PARAFORMAT2 pf; ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); + ZeroMemory(&pf, sizeof(pf)); + pf.cbSize = sizeof(pf); + SendMessage(hwndEditor, EM_GETCHARFORMAT, TRUE, (LPARAM)&fmt); SendMessage(hwndEditor, EM_GETSEL, (WPARAM)&from, (LPARAM)&to); @@ -380,6 +388,12 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessage(hwndToolBar, TB_INDETERMINATE, ID_FORMAT_ITALIC, !(fmt.dwMask & CFM_ITALIC)); SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_FORMAT_UNDERLINE, (fmt.dwMask & CFM_UNDERLINE) && (fmt.dwEffects & CFE_UNDERLINE)); SendMessage(hwndToolBar, TB_INDETERMINATE, ID_FORMAT_UNDERLINE, !(fmt.dwMask & CFM_UNDERLINE)); + + SendMessage(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_ALIGN_LEFT, (pf.wAlignment == PFA_LEFT)); + SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_ALIGN_CENTER, (pf.wAlignment == PFA_CENTER)); + SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_ALIGN_RIGHT, (pf.wAlignment == PFA_RIGHT)); + return 0; }

1 0

Bang Jun-Young : notepad: Fully revise Korean translation.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 3386459a3705bed05e7b8eb51ec3cdc469a5ed58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3386459a3705bed05e7b8eb51… Author: Bang Jun-Young <junyoung(a)mogua.com> Date: Tue Feb 27 13:35:53 2007 +0900 notepad: Fully revise Korean translation. --- programs/notepad/Ko.rc | 101 ++++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 51 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 44fe84b..2966d6a 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -4,7 +4,7 @@ * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2005 YunSong Hwang + * Copyright 2007 Bang Jun-Young <junyoung(a)mogua.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,49 +21,49 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "��(&F)" { - MENUITEM "�� (&N)\tCtrl+N", CMD_NEW - MENUITEM "��(&O)...\tCtrl+O", CMD_OPEN - MENUITEM "��(&S)\tCtrl+S", CMD_SAVE - MENUITEM "�ٸ� �̸�� (&A)...", CMD_SAVE_AS + MENUITEM "�� (&N)\tCtrl+N", CMD_NEW + MENUITEM "��(&O)...\tCtrl+O", CMD_OPEN + MENUITEM "��(&S)\tCtrl+S", CMD_SAVE + MENUITEM "�ٸ� �̸�� (&A)...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "��Ʈ(&P)...\tCtrl+P", CMD_PRINT - MENUITEM "�� (&T)...", CMD_PAGE_SETUP - MENUITEM "��Ʈ ��(&R)...", CMD_PRINTER_SETUP + MENUITEM "�μ�(&P)...\tCtrl+P", CMD_PRINT + MENUITEM "�� (&T)...", CMD_PAGE_SETUP + MENUITEM "�� (&R)...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "��(&X)", CMD_EXIT + MENUITEM "��(&X)", CMD_EXIT } POPUP "��(&E)" { - MENUITEM "�ǵ��(&U)\tCtrl+Z", CMD_UNDO + MENUITEM "�� (&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "�߶󳻱�(&T)\tCtrl+X", CMD_CUT - MENUITEM "��(&C)\tCtrl+C", CMD_COPY - MENUITEM "�ٿ��ֱ�(&P)\tCtrl+V", CMD_PASTE - MENUITEM "��(&D)\tDel", CMD_DELETE + MENUITEM "��(&C)\tCtrl+C", CMD_COPY + MENUITEM "�ٿ��ֱ�(&P)\tCtrl+V", CMD_PASTE + MENUITEM "��(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "�� (&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "�ð�/��¥(&T)\tF5", CMD_TIME_DATE + MENUITEM "�� (&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "�ð�/��¥(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "�� ѱ��(&W)", CMD_WRAP - MENUITEM "�۲�(&F)...", CMD_FONT + MENUITEM "�ڵ� �� ٲ�(&W)", CMD_WRAP + MENUITEM "�۲�(&F)...", CMD_FONT } POPUP "ã��(&S)" { - MENUITEM "ã��(&S)...\tCtrl+F", CMD_SEARCH - MENUITEM "�ٽ� ã��(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "ã��(&S)...\tCtrl+F", CMD_SEARCH + MENUITEM "�� ã��(&N)\tF3", CMD_SEARCH_NEXT } POPUP "��(&H)" { - MENUITEM "��(&C)", CMD_HELP_CONTENTS - MENUITEM "ã��(&S)...", CMD_HELP_SEARCH - MENUITEM "�� (&H)", CMD_HELP_ON_HELP + MENUITEM "�׸�(&C)", CMD_HELP_CONTENTS + MENUITEM "ã��(&S)...", CMD_HELP_SEARCH + MENUITEM "�� (&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR POPUP "��(&O)" { - MENUITEM "��۱�(&L)...", CMD_LICENSE - MENUITEM "�� (&N)...", CMD_NO_WARRANTY - MENUITEM "Wine ��(&A)...", CMD_ABOUT_WINE + MENUITEM "��̼��(&L)...", CMD_LICENSE + MENUITEM "��(&N)...", CMD_NO_WARRANTY + MENUITEM "Wine ��(&A)...", CMD_ABOUT_WINE } } } @@ -75,9 +75,9 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "�� " { -LTEXT "�Ӹ��(&H):", 0x140, 10, 07, 40, 15 +LTEXT "�Ӹ��(&H):", 0x140, 10, 07, 40, 15 EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "��(&F):", 0x142, 10, 24, 40, 15 +LTEXT "�ٴڱ�(&F):", 0x142, 10, 24, 40, 15 EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP GROUPBOX "��(&M):", 0x144, 10, 43,160, 45 @@ -87,49 +87,48 @@ LTEXT "��(&T):", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "��(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "�Ʒ��(&B):", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "�Ʒ�(&B):", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "Ȯ��", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "��(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "Ȯ��", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "��(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Page &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "&s ��" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ STRING_NOTEPAD, "�޸��" -STRING_ERROR, "��" +STRING_ERROR, "��" STRING_WARNING, "��" STRING_INFO, "��" -STRING_UNTITLED, "��" +STRING_UNTITLED, "�� " STRING_ALL_FILES, "�� (*.*)" -STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" +STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" -STRING_TOOLARGE, "�� '%s' �� ޸�� ⿡�� ʹ� Ů�ϴ�.\n \ +STRING_TOOLARGE, "%s �� ʹ� Ŀ�� ޸��δ� �� ϴ�.\n \ �ٸ� ��⸦ ��Ͻʽÿ�." -STRING_NOTEXT, "��  ��ڵ� �Է�� ʾҽ��ϴ�. \ -\n�ƹ��ų� �Է��ϰ� �ٽ� �õ��Ͻʽÿ�" -STRING_DOESNOTEXIST, "�� '%s'\n�� ʽ��ϴ�.\n\n \ -�� ڽ��ϱ�?" -STRING_NOTSAVED, "��'%s'\n�� ϴ�.\n\n \ -�� ٲ� �� ϰڽ��ϱ�?" -STRING_NOTFOUND, "'%s' could not be found." -STRING_OUT_OF_MEMORY, "�� ۾�� ġ�⿡�� ޸𸮰� ��մϴ�. \ -\n �ϳ�� Ǯ�׸�� ݾƼ� �� ޸𸮷�� ÷��ֽʽÿ�." +STRING_NOTEXT, "�Է�� ϴ�.\ +\n�� Է�� õ��Ͻʽÿ�" +STRING_DOESNOTEXIST, "%s\n�� ϴ�.\n\n \ +�� ðڽ��ϱ�?" +STRING_NOTSAVED, "%s\n�� Ǿ��ϴ�.\n\n \ +�� Ͻðڽ��ϱ�?" +STRING_NOTFOUND, "%s ��ڿ�� ã�� ϴ�." +STRING_OUT_OF_MEMORY, "�� ۾�� Ϸ��ϴ� �� ʿ�� ޸𸮰� ��մϴ�.\ +\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�.\n" } - -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT { IDS_LICENSE_CAPTION, "��̼��" IDS_LICENSE, @@ -145,7 +144,7 @@ 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" -IDS_WARRANTY_CAPTION, "�� " +IDS_WARRANTY_CAPTION, "��" IDS_WARRANTY, "This library is distributed in the hope that it will be useful, \ but WITHOUT ANY WARRANTY; without even the implied warranty of \

1 0

Alexandre Julliard : wine/test: Print the official name of the test in summary.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 67a0e31da78e9f04185da781be8c94fe50943f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a0e31da78e9f04185da781b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 14:48:20 2007 +0100 wine/test: Print the official name of the test in summary. --- include/wine/test.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f4557ab..ea79475 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -389,7 +389,7 @@ static int run_test( const char *name ) if (winetest_debug) { fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - name, successes + failures + todo_successes + todo_failures, + test->name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped );

1 0

Aric Stewart : winex11.drv: Make sure keyboard state is up to date before processing GetAsyncKeyState.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 4f944f7f01102218f5b7fde24bf140d56b39dae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f944f7f01102218f5b7fde24… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 27 20:28:28 2007 +0900 winex11.drv: Make sure keyboard state is up to date before processing GetAsyncKeyState. --- dlls/winex11.drv/keyboard.c | 8 ++++++-- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index c025a38..7fbbca8 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1835,8 +1835,12 @@ void X11DRV_InitKeyboard(void) */ SHORT X11DRV_GetAsyncKeyState(INT key) { - SHORT retval = ((key_state_table[key] & 0x40) ? 0x0001 : 0) | - ((key_state_table[key] & 0x80) ? 0x8000 : 0); + SHORT retval; + + X11DRV_MsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_KEY, 0 ); + + retval = ((key_state_table[key] & 0x40) ? 0x0001 : 0) | + ((key_state_table[key] & 0x80) ? 0x8000 : 0); key_state_table[key] &= ~0x40; TRACE_(key)("(%x) -> %x\n", key, retval); return retval; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8f2c984..8012d3b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -673,6 +673,8 @@ extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWO DWORD dwExtraInfo, UINT injected_flags ); extern void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, DWORD data, DWORD time, DWORD extra_info, UINT injected_flags ); +extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, + DWORD mask, DWORD flags ); typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg );

1 0

tools/winetest dissect
by Jeremy Newman March 1, 2007

March 1, 2007

ChangeSet ID: 30939 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/03/01 12:30:28 Modified files: winetest : dissect Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Cater for multiple 'tests executed' lines Patch: http://cvs.winehq.org/patch.py?id=30939 Old revision New revision Changes Path 1.20 1.21 +23 -10 tools/winetest/dissect Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.20 tools/winetest/dissect:1.21 --- tools/winetest/dissect:1.20 1 Mar 2007 18:30:28 -0000 +++ tools/winetest/dissect 1 Mar 2007 18:30:28 -0000 @@ -143,7 +143,10 @@ if ($wine) { /Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); +my ($lines,$total, $todo, $failed); $unit = undef; # state machine starts +$total = $todo = $failed = 0; +$lines = 0; while (<IN>) { if (!defined $unit) { # new test next if /^\s*$/; @@ -151,17 +154,25 @@ while (<IN>) { or mydie "no start line:$.: $_"; ($unit,$test,$source,$rev) = ($1,$2,$3,$4); open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n"; + } elsif (s/^(.*$test.*: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { + $lines++; + $total += $2; + $todo += $3; + $failed += $4; + print OUT; + } elsif (s/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/$1/) { + $lines++; + $total += $2; + $todo += $3; + $failed += $4; + print OUT; } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { - chomp; # current test failed - $result = "failed $1 -"; - goto FINISH; - } elsif (s/^($test: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { - <IN>; # current test finished - $result = "$2 $3 $4"; - goto FINISH; - } elsif (s/^($test: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/$1/) { - <IN>; # current test finished - $result = "$2 $3 $4"; + chomp; # current test ended + if ($lines==0) { + $result = "failed $1 -"; + } else { + $result = "$total $todo $failed"; + } FINISH: print SUM "- $unit $test $result $source $rev\n"; print OUT; @@ -172,6 +183,8 @@ while (<IN>) { mydie "can't rename $tmpfile to $testfile: $!\n"; } $unit = undef; + $total = $todo = $failed = 0; + $lines = 0; } else { # current test output print OUT; }

1 0