April 2008 - wine-commits

James Hawkins : kernel32: Skip the screen buffer tests if codepage 866 is not available.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 430a46fdf73d1299d385da479efb650271203f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=430a46fdf73d1299d385da479… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 20 02:26:12 2008 -0500 kernel32: Skip the screen buffer tests if codepage 866 is not available. --- dlls/kernel32/tests/console.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6204fa5..bccb02f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -600,6 +600,12 @@ static void testScreenBuffer(HANDLE hConOut) BOOL ret; DWORD oldcp; + if (!IsValidCodePage(866)) + { + skip("Codepage 866 not available\n"); + return; + } + /* In the beginning set output codepage to 866 */ oldcp = GetConsoleOutputCP(); ok(SetConsoleOutputCP(866), "Cannot set output codepage to 866\n");

1 0

Maarten Lankhorst : dsound: Skip the sound checks on the primary module and change its driver module to "".
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6c4d9448a9d25b693693912bcb3ab0cf4274d7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4d9448a9d25b693693912bc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 19 22:01:36 2008 -0700 dsound: Skip the sound checks on the primary module and change its driver module to "". --- dlls/dsound/dsound_main.c | 9 ++++----- dlls/dsound/tests/dsound.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index d7c50b8..31078cb 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -311,8 +311,8 @@ HRESULT WINAPI DirectSoundEnumerateA( err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); if (err == DS_OK) { TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n", - "Primary Sound Driver",desc.szDrvname,lpContext); - if (lpDSEnumCallback(NULL, "Primary Sound Driver", desc.szDrvname, lpContext) == FALSE) + "Primary Sound Driver","",lpContext); + if (lpDSEnumCallback(NULL, "Primary Sound Driver", "", lpContext) == FALSE) return DS_OK; } } @@ -367,6 +367,7 @@ HRESULT WINAPI DirectSoundEnumerateW( devs = waveOutGetNumDevs(); if (devs > 0) { if (GetDeviceID(&DSDEVID_DefaultPlayback, &guid) == DS_OK) { + static const WCHAR empty[] = { 0 }; for (wod = 0; wod < devs; ++wod) { if (IsEqualGUID( &guid, &DSOUND_renderer_guids[wod] ) ) { err = mmErr(waveOutMessage((HWAVEOUT)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); @@ -375,9 +376,7 @@ HRESULT WINAPI DirectSoundEnumerateW( "Primary Sound Driver",desc.szDrvname,lpContext); MultiByteToWideChar( CP_ACP, 0, "Primary Sound Driver", -1, wDesc, sizeof(wDesc)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, - wName, sizeof(wName)/sizeof(WCHAR) ); - if (lpDSEnumCallback(NULL, wDesc, wName, lpContext) == FALSE) + if (lpDSEnumCallback(NULL, wDesc, empty, lpContext) == FALSE) return DS_OK; } } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index eaeb606..3a1bd18 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1002,11 +1002,21 @@ EXIT: return rc; } +static unsigned int number; + static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext) { HRESULT rc; trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); + + /* Don't test the primary device */ + if (!number++) + { + ok (!lpcstrModule[0], "lpcstrModule(%s) != NULL\n", lpcstrModule); + return 1; + } + rc = test_dsound(lpGuid); if (rc == DSERR_NODRIVER) trace(" No Driver\n");

1 0

James Hawkins : crypt32: Remove tests for properties not present on all systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 99d3e4c92dd2afd18dc7ca70444415e64ed65566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d3e4c92dd2afd18dc7ca704… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 22:04:29 2008 -0500 crypt32: Remove tests for properties not present on all systems. --- dlls/crypt32/tests/cert.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0ab9334..3fce85e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -475,14 +475,6 @@ static void testCertProperties(void) /* Check a few other implicit properties */ checkHash(bigCert, sizeof(bigCert), CALG_MD5, context, CERT_MD5_HASH_PROP_ID); - checkHash( - context->pCertInfo->Subject.pbData, - context->pCertInfo->Subject.cbData, - CALG_MD5, context, CERT_SUBJECT_NAME_MD5_HASH_PROP_ID); - checkHash( - context->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, - context->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, - CALG_MD5, context, CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID); /* Test key contexts and handles and such */ size = 0; @@ -1775,7 +1767,7 @@ static void testSignAndEncodeCert(void) algID.pszObjId = oid_rsa_md5; ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); - ok(ret, "CryptSignAndEncodeCertificate failed: %08x\n", GetLastError()); + /* oid_rsa_md5 not present in some win2k */ if (ret) { LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size);

1 0

James Hawkins : advpack: Fix a few failing tests in win95.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b08f7fd80301f53443facf70db4e7aa5e1a63240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08f7fd80301f53443facf70d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Apr 19 00:01:56 2008 -0500 advpack: Fix a few failing tests in win95. --- dlls/advpack/tests/files.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 0f82fa8..530c3b2 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -402,8 +402,10 @@ static void test_ExtractFiles(void) /* extract all files in the cab to nonexistent destination directory */ hr = pExtractFiles("extract.cab", destFolder, 0, NULL, NULL, 0); - ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), - "Expected %d, got %d\n", HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || + hr == E_FAIL, /* win95 */ + "Expected %08x or %08x, got %08x\n", E_FAIL, + HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), hr); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); @@ -470,9 +472,19 @@ static void test_ExtractFiles(void) static void test_AdvInstallFile(void) { HRESULT hr; + HMODULE hmod; char CURR_DIR[MAX_PATH]; char destFolder[MAX_PATH]; + hmod = LoadLibrary("setupapi.dll"); + if (!hmod) + { + skip("setupapi.dll not present\n"); + return; + } + + FreeLibrary(hmod); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); lstrcpyA(destFolder, CURR_DIR);

1 0

James Hawkins : advapi32: Remove a test that fails on some systems.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 9f859b4519704a6484d479c8d04900230c4aee5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f859b4519704a6484d479c8d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 18 23:14:05 2008 -0500 advapi32: Remove a test that fails on some systems. --- dlls/advapi32/tests/crypt.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 63163dd..8ad2b6b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -873,7 +873,7 @@ static void test_set_provider_ex(void) static void test_machine_guid(void) { - char originalGuid[40], guid[40]; + char originalGuid[40]; LONG r; HKEY key; DWORD size; @@ -904,12 +904,7 @@ static void test_machine_guid(void) ret = pCryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); CryptReleaseContext(hCryptProv, 0); - /* Check that MachineGuid was created */ - size = sizeof(guid); - r = RegQueryValueExA(key, "MachineGuid", NULL, NULL, (BYTE *)guid, &size); - ok(!r, "expected to find MachineGuid: %d\n", r); - r = RegDeleteValueA(key, "MachineGuid"); - ok(!r, "RegDeleteValueA failed: %d\n", r); + if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, strlen(originalGuid)+1);

1 0

James Hawkins : advapi32: Fix a test that fails on some versions of win2k.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 3a4f271a6b943e72040645846fbf47c8cc72cfc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4f271a6b943e72040645846… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 18 23:21:14 2008 -0500 advapi32: Fix a test that fails on some versions of win2k. --- dlls/advapi32/tests/registry.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 474879e..5d86d9b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1102,11 +1102,17 @@ static void test_regconnectregistry( void) lstrcpynA(netwName+2, compName, MAX_COMPUTERNAME_LENGTH + 1); retl = RegConnectRegistryA( compName, HKEY_LOCAL_MACHINE, &hkey); - ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %d\n", retl); + ok( !retl || + retl == ERROR_DLL_INIT_FAILED || + retl == ERROR_BAD_NETPATH, /* some win2k */ + "RegConnectRegistryA failed err = %d\n", retl); if( !retl) RegCloseKey( hkey); retl = RegConnectRegistryA( netwName, HKEY_LOCAL_MACHINE, &hkey); - ok( !retl || retl == ERROR_DLL_INIT_FAILED, "RegConnectRegistryA failed err = %d\n", retl); + ok( !retl || + retl == ERROR_DLL_INIT_FAILED || + retl == ERROR_BAD_NETPATH, /* some win2k */ + "RegConnectRegistryA failed err = %d\n", retl); if( !retl) RegCloseKey( hkey); SetLastError(0xdeadbeef);

1 0

James Hawkins : advpack: Remove a test that fails inconsistently on several platforms.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a42f4b654ba405de59757230acb8cbb600f8ecd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42f4b654ba405de59757230a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 18 23:06:25 2008 -0500 advpack: Remove a test that fails inconsistently on several platforms. --- dlls/advpack/tests/files.c | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index e109a88..0f82fa8 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -103,36 +103,6 @@ static BOOL check_ini_file_attr(LPSTR filename) return ret; } -#define FIELD_LEN 16 - -static BOOL check_ini_contents(LPSTR filename, BOOL add) -{ - CHAR field[FIELD_LEN]; - BOOL ret = TRUE, match; - - GetPrivateProfileStringA("backup", "one", NULL, field, FIELD_LEN, filename); - match = !lstrcmpA(field, "-1,0,0,0,0,0,-1"); - if ((add && !match) || (!add && match)) { - trace("first test: got %s\n", field); - ret = FALSE; - } - - GetPrivateProfileStringA("backup", "two", NULL, field, FIELD_LEN, filename); - if (lstrcmpA(field, "-1,0,0,0,0,0,-1")) { - trace("second test: got %s\n", field); - ret = FALSE; - } - - GetPrivateProfileStringA("backup", "three", NULL, field, FIELD_LEN, filename); - match = !lstrcmpA(field, "-1,0,0,0,0,0,-1"); - if ((add && !match) || (!add && match)) { - trace("third test: got %s\n", field); - ret = FALSE; - } - - return ret; -} - static void test_AddDelBackupEntry(void) { HRESULT res; @@ -171,7 +141,6 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); - ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); ok(DeleteFileA(path), "Expected path to exist\n"); lstrcpyA(path, CURR_DIR); @@ -182,7 +151,6 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!check_ini_file_attr(path), "Expected ini file to not be hidden\n"); - ok(!check_ini_contents(path, TRUE), "Expected ini contents to not match\n"); ok(!DeleteFileA(path), "Expected path to not exist\n"); /* try an existent, relative backup directory */ @@ -190,7 +158,6 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); - ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); ok(DeleteFileA(path), "Expected path to exist\n"); RemoveDirectoryA("backup"); @@ -200,14 +167,12 @@ static void test_AddDelBackupEntry(void) /* try a NULL backup dir, INI is created in the windows directory */ res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %d\n", res); - ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); /* remove the entries with AADBE_DEL_ENTRY */ SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); ok(res == S_OK, "Expected S_OK, got %d\n", res); - ok(check_ini_contents(path, FALSE), "Expected ini contents to match\n"); ok(DeleteFileA(path), "Expected path to exist\n"); }

1 0

Paul Vriens : tools/wine.inf.in: Fix a typo.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 88f4705156b12cba14fb0b45399f6a4b9d9c2a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f4705156b12cba14fb0b453… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Apr 21 08:14:20 2008 +0200 tools/wine.inf.in: Fix a typo. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7f02284..e2057ad 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2681,7 +2681,7 @@ ErrorControl=1 [SpoolerService] Description="Loads files to memory for later printing" DisplayName="Print Spooler" -ServiceBinary="%11\spoolsv.exe" +ServiceBinary="%11%\spoolsv.exe" ServiceType=1 StartType=4 ErrorControl=1

1 0

Vitaliy Margolen : Update Russian translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c39329d13c3fdab48525990b5ab600abd7ad76ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39329d13c3fdab48525990b5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 20 19:27:47 2008 -0600 Update Russian translation. --- programs/cmdlgtst/Ru.rc | 28 ++++++++++++++++++++++++++++ programs/wineconsole/wineconsole_Ru.rc | 2 +- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/programs/cmdlgtst/Ru.rc b/programs/cmdlgtst/Ru.rc index 6419186..a438b24 100644 --- a/programs/cmdlgtst/Ru.rc +++ b/programs/cmdlgtst/Ru.rc @@ -179,6 +179,34 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } +PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION " " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 + PUSHBUTTON "��", IDCANCEL, 180, 24, 50, 14 + CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +} + File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� /�� " diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 7e1f2ec..0044538 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -129,8 +129,8 @@ CAPTION " FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 178, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 40, 50, 50, 14 PUSHBUTTON "��", IDCANCEL, 110, 50, 50, 14

1 0

Vitaliy Margolen : shdoclc: Add Russian translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8190afb7f779faed78c63337fdcc14fa61bddaf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8190afb7f779faed78c63337f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 20 19:27:34 2008 -0600 shdoclc: Add Russian translation. --- dlls/shdoclc/Ru.rc | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/rsrc.rc | 1 + 2 files changed, 248 insertions(+), 0 deletions(-) diff --git a/dlls/shdoclc/Ru.rc b/dlls/shdoclc/Ru.rc new file mode 100644 index 0000000..6b6a15e --- /dev/null +++ b/dlls/shdoclc/Ru.rc @@ -0,0 +1,247 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&b�� &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + +IDR_BROWSE_CONTEXT_MENU MENU +{ + POPUP "Default" + { + MENUITEM "&��", IDM_GOBACKWARD + MENUITEM "&��", IDM_GOFORWARD + MENUITEM SEPARATOR + MENUITEM "&�� ...", IDM_SAVEBACKGROUND + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "&�� ", IDM_COPYBACKGROUND + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "�� &�", IDM_SELECTALL + MENUITEM "��&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_CREATESHORTCUT + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM "&�� ",IDM_VIEWSOURCE + MENUITEM SEPARATOR + MENUITEM "&��", IDM_LANGUAGE + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_PRINT + MENUITEM "�&��", _IDM_REFRESH + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "��", IDM_PROPERTIES + } + + POPUP "Image" + { + MENUITEM "&�� ", IDM_FOLLOWLINKC + MENUITEM "�� ",IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_SHOWPICTURE + MENUITEM "&�� ...",IDM_SAVEPICTURE + MENUITEM "&�� E-mail...",IDM_MP_EMAILPICTURE + MENUITEM "&�� ...", IDM_MP_PRINTPICTURE + MENUITEM "&�� ", IDM_MP_MYPICS + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "��", IDM_PROPERTIES + } + + POPUP "Control" + { + MENUITEM "&��", IDM_UNDO + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "&��", IDM_PASTE + MENUITEM "�&��", IDM_DELETE + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "�� &�", IDM_SELECTALL + } + + POPUP "Table" + { + POPUP "&��" + { + MENUITEM "&��", IDM_CELLSELECT + MENUITEM "&��", IDM_ROWSELECT + MENUITEM "&��", IDM_COLUMNSELECT + MENUITEM "&��", IDM_TABLESELECT + } + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&�� ", IDM_CELLPROPERTIES + MENUITEM "�� &��", IDM_TABLEPROPERTIES + } + + POPUP "1DSite Select" + { + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "&��", IDM_PASTE + MENUITEM "�� &�", IDM_SELECTALL + MENUITEM "��&��", IDM_PRINT + MENUITEM SEPARATOR + } + + POPUP "Anchor" + { + MENUITEM "&��", IDM_FOLLOWLINKC + MENUITEM "�� &�� ",IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��",IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&��", IDM_PROPERTIES + } + + POPUP "Context Unknown" + { + MENUITEM SEPARATOR + } + + POPUP "DYNSRC Image" + { + MENUITEM "&�� ", IDM_FOLLOWLINKC + MENUITEM "�� &�� ", IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_SHOWPICTURE + MENUITEM "&�� ...",IDM_SAVEPICTURE + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "��", IDM_DYNSRCPLAY + MENUITEM "��", IDM_DYNSRCSTOP + MENUITEM "&��", IDM_PROPERTIES + } + + POPUP "ART Image" + { + MENUITEM "&�� ", IDM_FOLLOWLINKC + MENUITEM "�� &�� ", IDM_FOLLOWLINKN + MENUITEM "�� ...", IDM_SAVETARGET + MENUITEM "&�� ", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_SHOWPICTURE + MENUITEM "&�� ...",IDM_SAVEPICTURE + MENUITEM "�� ", IDM_SETWALLPAPER + MENUITEM "�� &�", IDM_SETDESKTOPITEM + MENUITEM SEPARATOR + MENUITEM "��&��", IDM_CUT + MENUITEM "&��", IDM_COPY + MENUITEM "�� &��", IDM_COPYSHORTCUT + MENUITEM "&��", IDM_PASTE + MENUITEM SEPARATOR + MENUITEM "�� &��", IDM_ADDFAVORITES + MENUITEM SEPARATOR + MENUITEM "��", IDM_IMGARTPLAY + MENUITEM "��", IDM_IMGARTSTOP + MENUITEM "��", IDM_IMGARTREWIND + MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "&��", IDM_PROPERTIES + } + + POPUP "Debug" + { + MENUITEM "Trace Tags", IDM_TRACETAGS + MENUITEM "Resource Failures", IDM_RESOURCEFAILURES + MENUITEM "Dump Tracking Info", IDM_DUMPTRACKINGINFO + MENUITEM "Debug Break", IDM_DEBUGBREAK + MENUITEM "Debug View", IDM_DEBUGVIEW + MENUITEM "Dump Tree", IDM_DUMPTREE + MENUITEM "Dump Lines", IDM_DUMPLINES + MENUITEM "Dump DisplayTree", IDM_DUMPDISPLAYTREE + MENUITEM "Dump FormatCaches", IDM_DUMPFORMATCACHES + MENUITEM "Dump LayoutRects", IDM_DUMPLAYOUTRECTS + MENUITEM "Memory Monitor", IDM_MEMORYMONITOR + MENUITEM "Performance Meters", IDM_PERFORMANCEMETERS + MENUITEM "Save HTML", IDM_SAVEHTML + MENUITEM SEPARATOR + MENUITEM "&Browse View", IDM_BROWSEMODE + MENUITEM "&Edit View", IDM_EDITMODE + } + + POPUP "Vertical Scrollbar" + { + MENUITEM "�� ", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "��", IDM_SCROLL_TOP + MENUITEM "��", IDM_SCROLL_BOTTOM + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_PAGEUP + MENUITEM "�� ", IDM_SCROLL_PAGEDOWN + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_UP + MENUITEM "�� ", IDM_SCROLL_DOWN + } + + POPUP "Horizontal Scrollbar" + { + MENUITEM "�� ", IDM_SCROLL_HERE + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_LEFTEDGE + MENUITEM "�� ", IDM_SCROLL_RIGHTEDGE + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_PAGELEFT + MENUITEM "�� ", IDM_SCROLL_PAGERIGHT + MENUITEM SEPARATOR + MENUITEM "�� ", IDM_SCROLL_LEFT + MENUITEM "�� ", IDM_SCROLL_RIGHT + } +} diff --git a/dlls/shdoclc/rsrc.rc b/dlls/shdoclc/rsrc.rc index 646b305..7b90dc5 100644 --- a/dlls/shdoclc/rsrc.rc +++ b/dlls/shdoclc/rsrc.rc @@ -32,6 +32,7 @@ #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Ru.rc" #include "Si.rc" #include "Sv.rc" #include "Tr.rc"

1 0

Alistair Leslie-Hughes : msxml3: Corrected IXMLDOMComment appendData with a broken xmlTextConcat function.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c3e9780d223786acf838f2824b19104b4bd707cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e9780d223786acf838f2824… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 20 00:09:58 2008 +1000 msxml3: Corrected IXMLDOMComment appendData with a broken xmlTextConcat function. --- dlls/msxml3/comment.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index c4d37f2..eb273b4 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -597,10 +597,32 @@ static HRESULT WINAPI domcomment_appendData( pContent = xmlChar_from_wchar( (WCHAR*)p ); if(pContent) { + /* Older versions of libxml < 2.6.27 didn't correctly support + xmlTextConcat on Comment nodes. Fallback to setting the + contents directly if xmlTextConcat fails. + + NOTE: if xmlTextConcat fails, pContent is destroyed. + */ if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else - hr = E_FAIL; + { + xmlChar *pNew; + pContent = xmlChar_from_wchar( (WCHAR*)p ); + if(pContent) + { + pNew = xmlStrcat(xmlNodeGetContent(pDOMNode->node), pContent); + if(pNew) + { + xmlNodeSetContent(pDOMNode->node, pNew); + hr = S_OK; + } + else + hr = E_FAIL; + } + else + hr = E_FAIL; + } } else hr = E_FAIL;

1 0

Alistair Leslie-Hughes : msxml3: Implement get_prefix.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 38634f0eb9ce3d346fd670b5b8543f4844da00c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38634f0eb9ce3d346fd670b5b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 18 21:23:22 2008 +1000 msxml3: Implement get_prefix. --- dlls/msxml3/node.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 092c360..246598d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1169,8 +1169,26 @@ static HRESULT WINAPI xmlnode_get_prefix( IXMLDOMNode *iface, BSTR* prefixString) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr = S_FALSE; + xmlNsPtr *pNSList; + + TRACE("%p %p\n", This, prefixString ); + + if(!prefixString) + return E_INVALIDARG; + + *prefixString = NULL; + + pNSList = xmlGetNsList(This->node->doc, This->node); + if(pNSList) + { + *prefixString = bstr_from_xmlChar( pNSList[0]->prefix ); + + hr = S_OK; + } + + return hr; } static HRESULT WINAPI xmlnode_get_baseName(

1 0

Alistair Leslie-Hughes : msxml3: Add tests for get_prefix and get_namespaceURI.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a430b37355b3f627b2d579f6e9eb92d8aa24421d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a430b37355b3f627b2d579f6e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 19 21:26:53 2008 +1000 msxml3: Add tests for get_prefix and get_namespaceURI. --- dlls/msxml3/tests/domdoc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 32d3b93..9d84435 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3204,6 +3204,65 @@ static void test_testTransforms(void) free_bstrs(); } +static void test_Namespaces(void) +{ + IXMLDOMDocument2 *doc = NULL; + IXMLDOMNode *pNode; + IXMLDOMNode *pNode2 = NULL; + VARIANT_BOOL bSucc; + HRESULT hr; + BSTR str; + static const CHAR szNamespacesXML[] = +"<?xml version=\"1.0\"?>\n" +"<root xmlns:WEB='http://www.winehq.org'>\n" +"<WEB:Site version=\"1.0\" />\n" +"</root>"; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szNamespacesXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE"); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root"), &pNode ); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_firstChild( pNode, &pNode2 ); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( pNode2 != NULL, "pNode2 == NULL\n"); + + /* Test get_prefix */ + hr = IXMLDOMNode_get_prefix(pNode2, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + /* NOTE: Need to test that arg2 gets cleared on Error. */ + + hr = IXMLDOMNode_get_prefix(pNode2, &str); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("WEB")), "incorrect prefix string\n"); + SysFreeString(str); + + /* Test get_namespaceURI */ + hr = IXMLDOMNode_get_namespaceURI(pNode2, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + /* NOTE: Need to test that arg2 gets cleared on Error. */ + + hr = IXMLDOMNode_get_namespaceURI(pNode2, &str); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("http://www.winehq.org")), "incorrect namespaceURI string\n"); + SysFreeString(str); + + IXMLDOMNode_Release(pNode2); + IXMLDOMNode_Release(pNode); + } + + IXMLDOMDocument2_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3227,6 +3286,7 @@ START_TEST(domdoc) test_nodeTypeTests(); test_DocumentSaveToDocument(); test_testTransforms(); + test_Namespaces(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : msxml3: Implement get_namespaceURI.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8842ccb63632ac856e34b210a470ead4137c1d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8842ccb63632ac856e34b210a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 18 21:29:59 2008 +1000 msxml3: Implement get_namespaceURI. --- dlls/msxml3/node.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7506460..092c360 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1143,8 +1143,26 @@ static HRESULT WINAPI xmlnode_get_namespaceURI( IXMLDOMNode *iface, BSTR* namespaceURI) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr = S_FALSE; + xmlNsPtr *pNSList; + + TRACE("%p %p\n", This, namespaceURI ); + + if(!namespaceURI) + return E_INVALIDARG; + + *namespaceURI = NULL; + + pNSList = xmlGetNsList(This->node->doc, This->node); + if(pNSList) + { + *namespaceURI = bstr_from_xmlChar( pNSList[0]->href ); + + hr = S_OK; + } + + return hr; } static HRESULT WINAPI xmlnode_get_prefix(

1 0

Alexandre Julliard : user32: Remove redundant LocalUnlock calls.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: fe4706940c0d43a2c4c294698ac6a3f2ace09c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4706940c0d43a2c4c294698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 11:58:20 2008 +0200 user32: Remove redundant LocalUnlock calls. --- dlls/user32/edit.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dba946b..6178b20 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4254,11 +4254,9 @@ static LRESULT EDIT_WM_Destroy(EDITSTATE *es) LINEDEF *pc, *pp; if (es->hloc32W) { - while (LocalUnlock(es->hloc32W)) ; LocalFree(es->hloc32W); } if (es->hloc32A) { - while (LocalUnlock(es->hloc32A)) ; LocalFree(es->hloc32A); } if (es->hloc16) {

1 0

Alexandre Julliard : gdi32: Return bitmask for 32-bit bitmaps too in GetDIBits.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: baceb8d07e0ae08a00aaaac39c15b14f872c9d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baceb8d07e0ae08a00aaaac39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 11:57:30 2008 +0200 gdi32: Return bitmask for 32-bit bitmaps too in GetDIBits. --- dlls/gdi32/dib.c | 18 +++++++++++++----- dlls/gdi32/tests/bitmap.c | 6 ++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index caf3e6c..de5a5a4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -640,19 +640,17 @@ INT WINAPI GetDIBits( DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel ); + info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; switch(bmp->bitmap.bmBitsPixel) { case 15: info->bmiHeader.biBitCount = 16; - info->bmiHeader.biCompression = BI_RGB; break; - case 16: - info->bmiHeader.biBitCount = 16; - info->bmiHeader.biCompression = BI_BITFIELDS; + case 24: + info->bmiHeader.biBitCount = 32; break; default: info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biCompression = BI_RGB; break; } info->bmiHeader.biXPelsPerMeter = 0; @@ -824,6 +822,16 @@ INT WINAPI GetDIBits( ((PDWORD)info->bmiColors)[2] = 0x001f; } break; + + case 24: + case 32: + if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)info->bmiColors)[0] = 0xff0000; + ((PDWORD)info->bmiColors)[1] = 0x00ff00; + ((PDWORD)info->bmiColors)[2] = 0x0000ff; + } + break; } if (bits && lines) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 15a463b..f7bfdfd 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1623,11 +1623,13 @@ static void test_GetDIBits_BI_BITFIELDS(void) /* Call GetDIBits to fill in bmiHeader. */ ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); ok(ret == 1, "GetDIBits failed\n"); - if (dibinfo->bmiHeader.biBitCount == 16 && - dibinfo->bmiHeader.biCompression == BI_BITFIELDS) + if (dibinfo->bmiHeader.biBitCount > 8) { DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); ok( !bitmasks[1], "green mask is set\n" ); ok( !bitmasks[2], "blue mask is set\n" );

1 0

Andrew Talbot : mcicda: Remove unused variable.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 22d2abbacb176c2186125fb3cdb36e6cbd75037f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d2abbacb176c2186125fb3c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:42 2008 +0100 mcicda: Remove unused variable. --- dlls/mcicda/mcicda.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 3273ecd..6e4a835 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -518,7 +518,6 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) { WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD idx; DWORD ret = 0; CDROM_SUB_Q_DATA_FORMAT fmt; SUB_Q_CHANNEL_DATA data; @@ -558,7 +557,6 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm TRACE("MCI_TRACK #%u LENGTH=??? !\n", lpParms->dwTrack); if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) return MCIERR_OUTOFRANGE; - idx = lpParms->dwTrack - toc.FirstTrack; lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - FRAME_OF_TOC(toc, lpParms->dwTrack); /* Windows returns one frame less than the total track length for the

1 0

Andrew Talbot : mciavi32: Remove unused variables.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6bb85256304caa0b028b4f350a6738e3ca8d80fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb85256304caa0b028b4f350… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:39 2008 +0100 mciavi32: Remove unused variables. --- dlls/mciavi32/mmoutput.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index d1ed699..8c8bdc2 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -599,8 +599,6 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) { void* pBitmapData; LPBITMAPINFO pBitmapInfo; - int nWidth; - int nHeight; if (!hDC || !wma->inbih) return TRUE; @@ -633,15 +631,9 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (wma->hic) { pBitmapData = wma->outdata; pBitmapInfo = (LPBITMAPINFO)wma->outbih; - - nWidth = wma->outbih->biWidth; - nHeight = wma->outbih->biHeight; } else { pBitmapData = wma->indata; pBitmapInfo = (LPBITMAPINFO)wma->inbih; - - nWidth = wma->inbih->biWidth; - nHeight = wma->inbih->biHeight; } StretchDIBits(hDC,

1 0

Andrew Talbot : mciseq: Remove unused variable.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 87532fdae6ff5b9f7b47d80fc40f518598c359a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87532fdae6ff5b9f7b47d80fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:47 2008 +0100 mciseq: Remove unused variable. --- dlls/mciseq/mcimidi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 171142d..b69f0ac 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1190,7 +1190,6 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar { int start, end; MIDIHDR midiHdr; - DWORD dwRet; WINE_MCIMIDI* wmm = MIDI_mciGetOpenDev(wDevID); TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); @@ -1216,7 +1215,7 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar midiHdr.dwBufferLength = 1024; midiHdr.dwUser = 0L; midiHdr.dwFlags = 0L; - dwRet = midiInPrepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); + midiInPrepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); TRACE("After MIDM_PREPARE\n"); wmm->dwStatus = MCI_MODE_RECORD; /* FIXME: there is no buffer added */ @@ -1224,12 +1223,12 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar TRACE("wmm->dwStatus=%p %d\n", &wmm->dwStatus, wmm->dwStatus); midiHdr.dwBytesRecorded = 0; - dwRet = midiInStart((HMIDIIN)wmm->hMidi); + midiInStart((HMIDIIN)wmm->hMidi); TRACE("midiInStart => dwBytesRecorded=%u\n", midiHdr.dwBytesRecorded); if (midiHdr.dwBytesRecorded == 0) break; } TRACE("Before MIDM_UNPREPARE\n"); - dwRet = midiInUnprepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); + midiInUnprepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); TRACE("After MIDM_UNPREPARE\n"); HeapFree(GetProcessHeap(), 0, midiHdr.lpData); midiHdr.lpData = NULL;

1 0

Andrew Talbot : kernel32: Remove unused variables.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7d2c11e3a481bf0fc13097ce0f167a0b616193de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2c11e3a481bf0fc13097ce0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:36 2008 +0100 kernel32: Remove unused variables. --- dlls/kernel32/local16.c | 3 +-- dlls/kernel32/ne_module.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index e250d84..48bc6c3 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -572,7 +572,7 @@ static HLOCAL16 LOCAL_FreeArena( WORD ds, WORD arena ) { char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALHEAPINFO *pInfo; - LOCALARENA *pArena, *pPrev, *pNext; + LOCALARENA *pArena, *pPrev; TRACE("%04x ds=%04x\n", arena, ds ); if (!(pInfo = LOCAL_GetHeap( ds ))) return arena; @@ -590,7 +590,6 @@ static HLOCAL16 LOCAL_FreeArena( WORD ds, WORD arena ) /* Check if we can merge with the previous block */ pPrev = ARENA_PTR( ptr, pArena->prev & ~3 ); - pNext = ARENA_PTR( ptr, pArena->next ); if ((pPrev->prev & 3) == LOCAL_ARENA_FREE) { arena = pArena->prev & ~3; diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 27a0abc..dae1a0d 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -998,10 +998,8 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons HMODULE16 hModule; HINSTANCE16 hInstance; OSVERSIONINFOW versionInfo; - const IMAGE_OS2_HEADER *ne_header; SIZE_T mapping_size = ~0UL; /* assume builtins don't contain invalid offsets... */ - ne_header = (const IMAGE_OS2_HEADER *)((const BYTE *)mz_header + mz_header->e_lfanew); hModule = build_module( mz_header, mapping_size, file_name ); if (hModule < 32) return hModule; pModule = GlobalLock16( hModule );

1 0

Alam Arias : include: Fix wingdi. h to define AW version of wglUseFontBitmaps and wglUseFontOutlines.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 09d460f422c612456451f79f02734d0c3ecf7ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d460f422c612456451f79f0… Author: Alam Arias <Alam.GBC(a)gmail.com> Date: Fri Apr 18 19:30:03 2008 -0400 include: Fix wingdi.h to define AW version of wglUseFontBitmaps and wglUseFontOutlines. --- include/wingdi.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index ea65928..14c307d 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3722,8 +3722,12 @@ WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); WINGDIAPI INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC); WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); -WINGDIAPI BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); -WINGDIAPI BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); +WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); +#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps) +WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) #ifdef __WINESRC__ /* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */

1 0

Reece Dunn : shlwapi/tests: Fix the return codes for Windows 2000 ( without IE6 installed).
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: cd16e22252710e6f81cde4c7d57275322c5f6598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd16e22252710e6f81cde4c7d… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Apr 18 21:03:29 2008 +0100 shlwapi/tests: Fix the return codes for Windows 2000 (without IE6 installed). --- dlls/shlwapi/tests/istream.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 527fa24..ef7191c 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -76,35 +76,40 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ret = stream->lpVtbl->Write(stream, NULL, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 5, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 3, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); @@ -114,7 +119,8 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); ret = IStream_Seek(stream, zero, 20, NULL); - ok(ret == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", ret); + ok(ret == E_INVALIDARG /* XP */ || ret == S_OK /* 2000 */, + "expected E_INVALIDARG or S_OK, got 0x%08x\n", ret); /* IStream::CopyTo */ @@ -166,7 +172,8 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) /* IStream::Stat */ ret = IStream_Stat(stream, NULL, 0); - ok(ret == STG_E_INVALIDPOINTER, "expected STG_E_INVALIDPOINTER, got 0x%08x\n", ret); + ok(ret == STG_E_INVALIDPOINTER /* XP */ || ret == E_NOTIMPL /* 2000 */, + "expected STG_E_INVALIDPOINTER or E_NOTIMPL, got 0x%08x\n", ret); /* IStream::Clone */

1 0

Jacek Caban : mshtml: Forward window IDispatch methods.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 951084abcf16766f8c5636738ffd614089acf793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=951084abcf16766f8c5636738… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 19 18:41:44 2008 +0200 mshtml: Forward window IDispatch methods. --- dlls/mshtml/htmlwindow.c | 57 +++++++++++---------------------------------- 1 files changed, 14 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 39d54d6..5ed5701 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -101,25 +101,15 @@ static HRESULT WINAPI HTMLWindow2_GetTypeInfoCount(IHTMLWindow2 *iface, UINT *pc { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - return S_OK; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLWindow2_GetTypeInfo(IHTMLWindow2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - HRESULT hres; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hres = get_typeinfo(IHTMLWindow2_tid, ppTInfo); - if(SUCCEEDED(hres)) - ITypeInfo_AddRef(*ppTInfo); - return hres; + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLWindow2_GetIDsOfNames(IHTMLWindow2 *iface, REFIID riid, @@ -127,17 +117,8 @@ static HRESULT WINAPI HTMLWindow2_GetIDsOfNames(IHTMLWindow2 *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - ITypeInfo *typeinfo; - HRESULT hres; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - hres = get_typeinfo(IHTMLWindow2_tid, &typeinfo); - if(SUCCEEDED(hres)) - hres = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - - return hres; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMember, @@ -145,18 +126,9 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - ITypeInfo *typeinfo; - HRESULT hres; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hres = get_typeinfo(IHTMLWindow2_tid, &typeinfo); - if(SUCCEEDED(hres)) - hres = ITypeInfo_Invoke(typeinfo, HTMLWINDOW2(This), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); - return hres; + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) @@ -794,16 +766,16 @@ static ULONG WINAPI HTMLWindow3_Release(IHTMLWindow3 *iface) static HRESULT WINAPI HTMLWindow3_GetTypeInfoCount(IHTMLWindow3 *iface, UINT *pctinfo) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLWindow3_GetTypeInfo(IHTMLWindow3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLWindow3_GetIDsOfNames(IHTMLWindow3 *iface, REFIID riid, @@ -811,9 +783,8 @@ static HRESULT WINAPI HTMLWindow3_GetIDsOfNames(IHTMLWindow3 *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMember, @@ -821,9 +792,9 @@ static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLWindow3_get_screenLeft(IHTMLWindow3 *iface, long *p)

1 0

Jacek Caban : mshtml: Added window IDispatchEx implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a5843056c5c77c522b803e8a6dcea01e725ec303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5843056c5c77c522b803e8a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 19 18:41:25 2008 +0200 mshtml: Added window IDispatchEx implementation. --- dlls/mshtml/dispex.c | 2 + dlls/mshtml/htmlwindow.c | 186 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 4 + 3 files changed, 189 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5cffe0a..06b495b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -51,7 +51,9 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, + &DIID_DispHTMLWindow2, &IID_IHTMLWindow2, + &IID_IHTMLWindow3, &IID_IOmNavigator }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e96e860..39d54d6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -33,10 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) - static struct list window_list = LIST_INIT(window_list); +#define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) + static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); @@ -49,6 +49,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(This); }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { TRACE("(%p)->(IID_IHTMLFramesCollection2 %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); @@ -942,6 +945,180 @@ static const IHTMLWindow3Vtbl HTMLWindow3Vtbl = { HTMLWindow3_showModelessDialog }; +#define DISPEX_THIS(iface) DEFINE_THIS(HTMLWindow, IDispatchEx, iface) + +static HRESULT WINAPI WindowDispEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI WindowDispEx_AddRef(IDispatchEx *iface) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI WindowDispEx_Release(IDispatchEx *iface) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI WindowDispEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); +} + +static HRESULT WINAPI WindowDispEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + /* FIXME: Use script dispatch */ + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + /* FIXME: Use script dispatch */ + + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + return IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); +} + +static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + return IDispatchEx_InvokeEx(DISPATCHEX(&This->dispex), id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); +} + +static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + + return IDispatchEx_DeleteMemberByName(DISPATCHEX(&This->dispex), bstrName, grfdex); +} + +static HRESULT WINAPI WindowDispEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x)\n", This, id); + + return IDispatchEx_DeleteMemberByDispID(DISPATCHEX(&This->dispex), id); +} + +static HRESULT WINAPI WindowDispEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + + return IDispatchEx_GetMemberProperties(DISPATCHEX(&This->dispex), id, grfdexFetch, pgrfdex); +} + +static HRESULT WINAPI WindowDispEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %p)\n", This, id, pbstrName); + + return IDispatchEx_GetMemberName(DISPATCHEX(&This->dispex), id, pbstrName); +} + +static HRESULT WINAPI WindowDispEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + + return IDispatchEx_GetNextDispID(DISPATCHEX(&This->dispex), grfdex, id, pid); +} + +static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%p)\n", This, ppunk); + + return IDispatchEx_GetNameSpaceParent(DISPATCHEX(&This->dispex), ppunk); +} + +#undef DISPEX_THIS + +static const IDispatchExVtbl WindowDispExVtbl = { + WindowDispEx_QueryInterface, + WindowDispEx_AddRef, + WindowDispEx_Release, + WindowDispEx_GetTypeInfoCount, + WindowDispEx_GetTypeInfo, + WindowDispEx_GetIDsOfNames, + WindowDispEx_Invoke, + WindowDispEx_GetDispID, + WindowDispEx_InvokeEx, + WindowDispEx_DeleteMemberByName, + WindowDispEx_DeleteMemberByDispID, + WindowDispEx_GetMemberProperties, + WindowDispEx_GetMemberName, + WindowDispEx_GetNextDispID, + WindowDispEx_GetNameSpaceParent +}; + +static dispex_static_data_t HTMLWindow_dispex = { + DispHTMLWindow2_tid, + NULL, + { + IHTMLWindow2_tid, + IHTMLWindow3_tid, + 0 + } +}; + static const char wineConfig_func[] = "window.__defineGetter__(\"external\",function() {\n" " return window.__wineWindow__.external;\n" @@ -1046,13 +1223,16 @@ void setup_nswindow(HTMLWindow *This) HTMLWindow *HTMLWindow_Create(HTMLDocument *doc) { - HTMLWindow *ret = heap_alloc_zero(sizeof(HTMLWindow)); + HTMLWindow *ret = heap_alloc(sizeof(HTMLWindow)); ret->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; ret->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; + ret->lpIDispatchExVtbl = &WindowDispExVtbl; ret->ref = 1; ret->doc = doc; + init_dispex(&ret->dispex, (IUnknown*)HTMLWINDOW2(ret), &HTMLWindow_dispex); + if(doc->nscontainer) { nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e0f28c7..8bca848 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -61,7 +61,9 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { NULL_tid, + DispHTMLWindow2_tid, IHTMLWindow2_tid, + IHTMLWindow3_tid, IOmNavigator_tid, LAST_tid } tid_t; @@ -85,8 +87,10 @@ typedef struct { void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); typedef struct { + DispatchEx dispex; const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; + const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref;

1 0

Jacek Caban : mshtml: Forward IOmNavigator' s IDispatch method to IDispatchEx implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 835b3eb0e81673d627a999bf57192e72d0d2032e URL: http://source.winehq.org/git/wine.git/?a=commit;h=835b3eb0e81673d627a999bf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 22:33:44 2008 +0200 mshtml: Forward IOmNavigator's IDispatch method to IDispatchEx implementation. --- dlls/mshtml/omnavigator.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 7f7e8c0..742df19 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -53,7 +53,7 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii *ppv = OMNAVIGATOR(This); }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = OMNAVIGATOR(This); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = DISPATCHEX(&This->dispex); @@ -105,8 +105,8 @@ static HRESULT WINAPI OmNavigator_GetTypeInfo(IOmNavigator *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI OmNavigator_GetIDsOfNames(IOmNavigator *iface, REFIID riid, @@ -114,9 +114,8 @@ static HRESULT WINAPI OmNavigator_GetIDsOfNames(IOmNavigator *iface, REFIID riid LCID lcid, DISPID *rgDispId) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI OmNavigator_Invoke(IOmNavigator *iface, DISPID dispIdMember, @@ -124,9 +123,9 @@ static HRESULT WINAPI OmNavigator_Invoke(IOmNavigator *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI OmNavigator_get_appCodeName(IOmNavigator *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IDispatchEx::GetIDsOfNames implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a0e0bf6b15c207ae7c1fc93497ec036e33e7a55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e0bf6b15c207ae7c1fc9349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 22:00:22 2008 +0200 mshtml: Added IDispatchEx::GetIDsOfNames implementation. --- dlls/mshtml/dispex.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 20b74f7..5cffe0a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -315,9 +315,19 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + UINT i; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + + for(i=0; i < cNames; i++) { + hres = IDispatchEx_GetDispID(DISPATCHEX(This), rgszNames[i], 0, rgDispId+i); + if(FAILED(hres)) + return hres; + } + + return S_OK; } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,

1 0

Jacek Caban : mshtml: Added IDispatchEx::Invoke implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 5c6ea438a00e6ad86926a5062f808517884758da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6ea438a00e6ad86926a5062… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 22:00:00 2008 +0200 mshtml: Added IDispatchEx::Invoke implementation. --- dlls/mshtml/dispex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 47a0443..20b74f7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -325,9 +325,12 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_InvokeEx(DISPATCHEX(This), dispIdMember, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)

1 0

Jacek Caban : mshtml: Added IDispatchEx::InvokeEx implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: de74e1aeb95285aea351ae8005f80c1b5350b9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de74e1aeb95285aea351ae800… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 21:59:46 2008 +0200 mshtml: Added IDispatchEx::InvokeEx implementation. --- dlls/mshtml/dispex.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 647b4d8..47a0443 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -374,8 +374,60 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - return E_NOTIMPL; + IUnknown *unk; + ITypeInfo *ti; + dispex_data_t *data; + UINT argerr=0; + int min, max, n; + HRESULT hres; + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + if(wFlags == DISPATCH_CONSTRUCT) { + FIXME("DISPATCH_CONSTRUCT not implemented\n"); + return E_NOTIMPL; + } + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + min = 0; + max = data->func_cnt-1; + + while(min <= max) { + n = (min+max)/2; + + if(data->funcs[n].id == id) + break; + + if(data->funcs[n].id < id) + min = n+1; + else + max = n-1; + } + + if(min > max) { + WARN("invalid id %x\n", id); + return DISP_E_UNKNOWNNAME; + } + + hres = get_typeinfo(data->funcs[n].tid, &ti); + if(FAILED(hres)) { + ERR("Could not get type info: %08x\n", hres); + return hres; + } + + hres = IUnknown_QueryInterface(This->outer, tid_ids[data->funcs[n].tid], (void**)&unk); + if(FAILED(hres)) { + ERR("Could not get iface: %08x\n", hres); + return E_FAIL; + } + + hres = ITypeInfo_Invoke(ti, unk, id, wFlags, pdp, pvarRes, pei, &argerr); + + IUnknown_Release(unk); + return hres; } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Jacek Caban : mshtml: Added IDispEx::GetDispID implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b81818e7ee209e49241f6d696cac6952a1ed89c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81818e7ee209e49241f6d696… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 19 12:55:24 2008 +0200 mshtml: Added IDispEx::GetDispID implementation. --- dlls/mshtml/dispex.c | 200 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 14 +++- dlls/mshtml/omnavigator.c | 11 ++- 3 files changed, 217 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7dc0063..647b4d8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,11 +31,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef struct { + DISPID id; + BSTR name; + tid_t tid; +} func_info_t; + +struct dispex_data_t { + DWORD func_cnt; + func_info_t *funcs; + func_info_t **name_table; + + struct list entry; +}; + static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; +static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { + &IID_NULL, &IID_IHTMLWindow2, + &IID_IOmNavigator }; HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) @@ -60,7 +77,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); return hres; } @@ -74,8 +91,21 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) void release_typelib(void) { + dispex_data_t *iter; unsigned i; + while(!list_empty(&dispex_data_list)) { + iter = LIST_ENTRY(list_head(&dispex_data_list), dispex_data_t, entry); + list_remove(&iter->entry); + + for(i=0; i < iter->func_cnt; i++) + SysFreeString(iter->funcs[i].name); + + heap_free(iter->funcs); + heap_free(iter->name_table); + heap_free(iter); + } + if(!typelib) return; @@ -86,6 +116,122 @@ void release_typelib(void) ITypeLib_Release(typelib); } +static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, DISPID id, ITypeInfo *dti) +{ + HRESULT hres; + + if(data->func_cnt && data->funcs[data->func_cnt-1].id == id) + return; + + if(data->func_cnt == *size) + data->funcs = heap_realloc(data->funcs, (*size <<= 1)*sizeof(func_info_t)); + + hres = ITypeInfo_GetDocumentation(dti, id, &data->funcs[data->func_cnt].name, NULL, NULL, NULL); + if(FAILED(hres)) + return; + + data->funcs[data->func_cnt].id = id; + data->funcs[data->func_cnt].tid = tid; + + data->func_cnt++; +} + +static int dispid_cmp(const void *p1, const void *p2) +{ + return ((func_info_t*)p1)->id - ((func_info_t*)p2)->id; +} + +static int func_name_cmp(const void *p1, const void *p2) +{ + return strcmpiW((*(func_info_t**)p1)->name, (*(func_info_t**)p2)->name); +} + +static dispex_data_t *preprocess_dispex_data(DispatchEx *This) +{ + const tid_t *tid = This->data->iface_tids; + FUNCDESC *funcdesc; + dispex_data_t *data; + DWORD size = 16, i; + ITypeInfo *ti, *dti; + HRESULT hres; + + TRACE("(%p)\n", This); + + hres = get_typeinfo(This->data->disp_tid, &dti); + if(FAILED(hres)) { + ERR("Could not get disp type info: %08x\n", hres); + return NULL; + } + + data = heap_alloc(sizeof(dispex_data_t)); + data->func_cnt = 0; + data->funcs = heap_alloc(size*sizeof(func_info_t)); + list_add_tail(&dispex_data_list, &data->entry); + + while(*tid) { + hres = get_typeinfo(*tid, &ti); + if(FAILED(hres)) + break; + + i=7; + while(1) { + hres = ITypeInfo_GetFuncDesc(ti, i++, &funcdesc); + if(FAILED(hres)) + break; + + add_func_info(data, &size, *tid, funcdesc->memid, dti); + ITypeInfo_ReleaseFuncDesc(ti, funcdesc); + } + + tid++; + } + + if(!data->func_cnt) { + heap_free(data->funcs); + data->funcs = NULL; + }else if(data->func_cnt != size) { + data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); + } + + qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); + + if(data->funcs) { + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); + for(i=0; i < data->func_cnt; i++) + data->name_table[i] = data->funcs+i; + qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); + }else { + data->name_table = NULL; + } + + return data; +} + +static CRITICAL_SECTION cs_dispex_static_data; +static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = +{ + 0, 0, &cs_dispex_static_data, + { &cs_dispex_static_data_dbg.ProcessLocksList, &cs_dispex_static_data_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dispex_static_data") } +}; +static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1, 0, 0, 0, 0 }; + + +static dispex_data_t *get_dispex_data(DispatchEx *This) +{ + if(This->data->data) + return This->data->data; + + EnterCriticalSection(&cs_dispex_static_data); + + if(!This->data->data) + This->data->data = preprocess_dispex_data(This); + + LeaveCriticalSection(&cs_dispex_static_data); + + return This->data->data; +} + void call_disp_func(HTMLDocument *doc, IDispatch *disp) { DISPID named_arg = DISPID_THIS; @@ -152,8 +298,16 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(This->data->disp_tid, ppTInfo); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, @@ -179,8 +333,41 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - return E_NOTIMPL; + dispex_data_t *data; + int min, max, n, c; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + if(grfdex & (~fdexNameCaseSensitive)) + FIXME("Unsupported grfdex %x\n", grfdex); + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + min = 0; + max = data->func_cnt-1; + + while(min <= max) { + n = (min+max)/2; + + c = strcmpiW(data->name_table[n]->name, bstrName); + if(!c) { + if((grfdex & fdexNameCaseSensitive) && strcmpW(data->name_table[n]->name, bstrName)) + break; + + *pid = data->name_table[n]->id; + return S_OK; + } + + if(c > 0) + max = n-1; + else + min = n+1; + } + + TRACE("not found %s\n", debugstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -253,8 +440,9 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -void init_dispex(DispatchEx *dispex, IUnknown *outer) +void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { dispex->lpIDispatchExVtbl = &DispatchExVtbl; dispex->outer = outer; + dispex->data = data; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 48f3b1b..e0f28c7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -60,17 +60,29 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { + NULL_tid, IHTMLWindow2_tid, + IOmNavigator_tid, LAST_tid } tid_t; +typedef struct dispex_data_t dispex_data_t; + +typedef struct { + const tid_t disp_tid; + dispex_data_t *data; + const tid_t iface_tids[]; +} dispex_static_data_t; + typedef struct { const IDispatchExVtbl *lpIDispatchExVtbl; IUnknown *outer; + + dispex_static_data_t *data; } DispatchEx; -void init_dispex(DispatchEx*,IUnknown*); +void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); typedef struct { const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 1a1e7e8..7f7e8c0 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -301,6 +301,15 @@ static const IOmNavigatorVtbl OmNavigatorVtbl = { OmNavigator_get_userProfile }; +static dispex_static_data_t OmNavigator_dispex = { + IOmNavigator_tid, + NULL, + { + IOmNavigator_tid, + 0 + } +}; + IOmNavigator *OmNavigator_Create(void) { OmNavigator *ret; @@ -309,7 +318,7 @@ IOmNavigator *OmNavigator_Create(void) ret->lpIOmNavigatorVtbl = &OmNavigatorVtbl; ret->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)OMNAVIGATOR(ret)); + init_dispex(&ret->dispex, (IUnknown*)OMNAVIGATOR(ret), &OmNavigator_dispex); return OMNAVIGATOR(ret); }

1 0

Jacek Caban : mshtml: Added load event support.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 12f312daccf5201e4b26d2d76ab4a87411821c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f312daccf5201e4b26d2d76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 00:48:18 2008 +0200 mshtml: Added load event support. --- dlls/mshtml/dispex.c | 29 ++++ dlls/mshtml/htmlevent.c | 339 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 3 +- dlls/mshtml/mshtml_private.h | 9 + dlls/mshtml/nsevents.c | 16 ++ 5 files changed, 389 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12f312daccf5201e4b26d…

1 0

Jacek Caban : mshtml: Parse and store onload attributes.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 4c21a5d3b0a4bba4029d0debc0d3b894626f5bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c21a5d3b0a4bba4029d0debc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 20:16:35 2008 +0200 mshtml: Parse and store onload attributes. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlevent.c | 101 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/mshtml_private.h | 6 +++ dlls/mshtml/nsevents.c | 14 +++++- dlls/mshtml/script.c | 72 +++++++++++++++++++++++++----- 6 files changed, 183 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c21a5d3b0a4bba4029d0…

1 0

Frans Kool : winecfg: Added missing Dutch translation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 9e482ce938cc15d03f69c47e3443c8109ba4487b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e482ce938cc15d03f69c47e3… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Fri Apr 18 16:27:17 2008 +0200 winecfg: Added missing Dutch translation. --- programs/winecfg/Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 5fb6929..fd9b4a6 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -66,6 +66,8 @@ BEGIN CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Laat de window manager de vensters &decoreren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met uw desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", IDC_STATIC,19,51,225,80

1 0

Dmitry Timoshkov : gdi32: Add a test for ExtCreateRegion, make it pass under Wine.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: f52b92efe504044018403e6221ab7d2664be51fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52b92efe504044018403e622… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 18 22:42:43 2008 +0900 gdi32: Add a test for ExtCreateRegion, make it pass under Wine. --- dlls/gdi32/region.c | 61 +++++++++++++++++--- dlls/gdi32/tests/clipping.c | 136 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index d0d8580..c9b9e1d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -985,6 +985,19 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) } +static void translate( POINT *pt, UINT count, const XFORM *xform ) +{ + while (count--) + { + FLOAT x = pt->x; + FLOAT y = pt->y; + pt->x = floor( x * xform->eM11 + y * xform->eM21 + xform->eDx + 0.5 ); + pt->y = floor( x * xform->eM12 + y * xform->eM22 + xform->eDy + 0.5 ); + pt++; + } +} + + /*********************************************************************** * ExtCreateRegion (GDI32.@) * @@ -1008,16 +1021,47 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* TRACE(" %p %d %p\n", lpXform, dwCount, rgndata ); - if( lpXform ) - WARN("(Xform not implemented - ignored)\n"); + if (!rgndata) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (rgndata->rdh.dwSize < sizeof(RGNDATAHEADER)) + return 0; + + /* XP doesn't care about the type */ if( rgndata->rdh.iType != RDH_RECTANGLES ) + WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType); + + if (lpXform) { - /* FIXME: We can use CreatePolyPolygonRgn() here - * for trapezoidal data */ + RECT *pCurRect, *pEndRect; - WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType); - goto fail; + hrgn = CreateRectRgn( 0, 0, 0, 0 ); + + pEndRect = (RECT *)rgndata->Buffer + rgndata->rdh.nCount; + for (pCurRect = (RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++) + { + static const INT count = 4; + HRGN poly_hrgn; + POINT pt[4]; + + pt[0].x = pCurRect->left; + pt[0].y = pCurRect->top; + pt[1].x = pCurRect->right; + pt[1].y = pCurRect->top; + pt[2].x = pCurRect->right; + pt[2].y = pCurRect->bottom; + pt[3].x = pCurRect->left; + pt[3].y = pCurRect->bottom; + + translate( pt, 4, lpXform ); + poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING ); + CombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR ); + DeleteObject( poly_hrgn ); + } + return hrgn; } if( (hrgn = REGION_CreateRegion( rgndata->rdh.nCount )) ) @@ -1039,8 +1083,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* } else ERR("Could not get pointer to newborn Region!\n"); } -fail: - WARN("Failed\n"); + return 0; } @@ -2743,6 +2786,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, int numFullPtBlocks = 0; INT poly, total; + TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); + if(!(hrgn = REGION_CreateRegion(nbpolygons))) return 0; obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 5e1d35f..25cc146 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -119,7 +119,143 @@ static void test_GetRandomRgn(void) DestroyWindow(hwnd); } +static void verify_region(HRGN hrgn, const RECT *rc) +{ + union + { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rgn; + const RECT *rect; + DWORD ret; + + ret = GetRegionData(hrgn, 0, NULL); + if (IsRectEmpty(rc)) + ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret); + else + ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + if (!ret) return; + + ret = GetRegionData(hrgn, sizeof(rgn), &rgn.data); + if (IsRectEmpty(rc)) + ok(ret == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", ret); + else + ok(ret == sizeof(rgn.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", + rgn.data.rdh.dwSize, rgn.data.rdh.iType, + rgn.data.rdh.nCount, rgn.data.rdh.nRgnSize, + rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, + rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); + if (rgn.data.rdh.nCount != 0) + { + rect = (const RECT *)rgn.data.Buffer; + trace("rect (%d,%d-%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); + ok(EqualRect(rect, rc), "rects don't match\n"); + } + + ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u", rgn.data.rdh.dwSize); + ok(rgn.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn.data.rdh.iType); + if (IsRectEmpty(rc)) + { + ok(rgn.data.rdh.nCount == 0, "expected 0, got %u\n", rgn.data.rdh.nCount); + ok(rgn.data.rdh.nRgnSize == 0, "expected 0, got %u\n", rgn.data.rdh.nRgnSize); + } + else + { + ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); + ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); + } + ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); +} + +static void test_ExtCreateRegion(void) +{ + static const RECT empty_rect; + static const RECT rc = { 111, 222, 333, 444 }; + static const RECT rc_xformed = { 76, 151, 187, 262 }; + union + { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + } rgn; + HRGN hrgn; + XFORM xform; + +if (0) /* crashes under Win9x */ +{ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 0, NULL); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); +} + + rgn.data.rdh.dwSize = 0; + rgn.data.rdh.iType = 0; + rgn.data.rdh.nCount = 0; + rgn.data.rdh.nRgnSize = 0; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh) - 1; + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + + /* although XP doesn't care about the type Win9x does */ + rgn.data.rdh.iType = RDH_RECTANGLES; + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + + rgn.data.rdh.nCount = 1; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh) + 1; + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 1, &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); + + xform.eM11 = 0.5; /* 50% width */ + xform.eM12 = 0.0; + xform.eM21 = 0.0; + xform.eM22 = 0.5; /* 50% height */ + xform.eDx = 20.0; + xform.eDy = 40.0; + + rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(&xform, sizeof(rgn), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); + verify_region(hrgn, &rc_xformed); + DeleteObject(hrgn); +} + START_TEST(clipping) { test_GetRandomRgn(); + test_ExtCreateRegion(); }

1 0

Dmitry Timoshkov : winedump: Print contents of EMR_INTERSECTCLIPRECT and EMR_EXTSELECTCLIPRGN.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: ae9fe5e36e2f866c62b83e8686bddca9ef065928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9fe5e36e2f866c62b83e868… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Apr 18 22:42:15 2008 +0900 winedump: Print contents of EMR_INTERSECTCLIPRECT and EMR_EXTSELECTCLIPRGN. --- tools/winedump/emf.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f539ea6..f3b6f50 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -112,7 +112,18 @@ static int dump_emfrecord(void) EMRCASE(EMR_MOVETOEX); EMRCASE(EMR_SETMETARGN); EMRCASE(EMR_EXCLUDECLIPRECT); - EMRCASE(EMR_INTERSECTCLIPRECT); + + case EMR_INTERSECTCLIPRECT: + { + const EMRINTERSECTCLIPRECT *clip = (const EMRINTERSECTCLIPRECT *)PRD(offset, sizeof(*clip)); + + printf("%-20s %08x\n", "EMR_INTERSECTCLIPRECT", length); + printf("rect %d,%d - %d, %d\n", + clip->rclClip.left, clip->rclClip.top, + clip->rclClip.right, clip->rclClip.bottom); + break; + } + EMRCASE(EMR_SCALEVIEWPORTEXTEX); EMRCASE(EMR_SCALEWINDOWEXTEX); EMRCASE(EMR_SAVEDC); @@ -156,7 +167,25 @@ static int dump_emfrecord(void) EMRCASE(EMR_FRAMERGN); EMRCASE(EMR_INVERTRGN); EMRCASE(EMR_PAINTRGN); - EMRCASE(EMR_EXTSELECTCLIPRGN); + + case EMR_EXTSELECTCLIPRGN: + { + const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)PRD(offset, sizeof(*clip)); + const RGNDATA *data = (RGNDATA *)clip->RgnData; + DWORD i, rc_count = 0; + RECT *rc; + + if (length >= sizeof(*clip) + sizeof(*data)) + rc_count = data->rdh.nCount; + + printf("%-20s %08x\n", "EMREXTSELECTCLIPRGN", length); + printf("mode %d, rects %d\n", clip->iMode, rc_count); + for (i = 0, rc = (RECT *)data->Buffer; i < rc_count; i++, rc++) + printf(" (%d,%d)-(%d,%d)", rc->left, rc->top, rc->right, rc->bottom); + if (rc_count != 0) printf("\n"); + break; + } + EMRCASE(EMR_BITBLT); EMRCASE(EMR_STRETCHBLT); EMRCASE(EMR_MASKBLT); @@ -166,7 +195,7 @@ static int dump_emfrecord(void) case EMR_EXTCREATEFONTINDIRECTW: { - const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, 4); + const EMREXTCREATEFONTINDIRECTW *pf = (const EMREXTCREATEFONTINDIRECTW *)PRD(offset, sizeof(*pf)); const LOGFONTW *plf = &pf->elfw.elfLogFont; printf("%-20s %08x\n", "EMR_EXTCREATEFONTINDIRECTW", length); @@ -187,7 +216,7 @@ static int dump_emfrecord(void) case EMR_EXTTEXTOUTW: { - const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, 4); + const EMREXTTEXTOUTW *etoW = (const EMREXTTEXTOUTW *)PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n",

1 0

Jeff Zaroyko : revise application rating definitions to include " cannot be installed" under Garbage
by Chris Morgan 21 Apr '08

21 Apr '08

Module: appdb Branch: master Commit: 8e6b4fe2fd621df796883ca8e9d05846980958f4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8e6b4fe2fd621df796883ca8… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Sun Apr 20 16:06:40 2008 +1000 revise application rating definitions to include "cannot be installed" under Garbage --- help/maintainer_ratings.help | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/help/maintainer_ratings.help b/help/maintainer_ratings.help index 9f5d2ae..fded0ad 100644 --- a/help/maintainer_ratings.help +++ b/help/maintainer_ratings.help @@ -40,7 +40,7 @@ Application works, but it has some issues, even for normal use; a game may not r An application gets this rating if it cannot be used for the purpose it was designed for. There should be at least one bug report in Bugzilla if it gets this rating. -Application does not start, or starts but has so many errors that it is nearly impossible to use it. +Application cannot be installed, does not start, or starts but has so many errors that it is nearly impossible to use it. </ul>

1 0

Alexandre Julliard : Wine release 0.9.60
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: website Branch: master Commit: 51ebfa70127af30e54abe4ce7c3bbe55d3b51eee URL: http://source.winehq.org/git/website.git/?a=commit;h=51ebfa70127af30e54abe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 17:59:13 2008 +0200 Wine release 0.9.60 --- news/2008041801.xml | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/news/2008041801.xml b/news/2008041801.xml new file mode 100644 index 0000000..7448e3a --- /dev/null +++ b/news/2008041801.xml @@ -0,0 +1,27 @@ +<news> +<date>April 18, 2008</date> +<title>Wine 0.9.60 Released</title> +<body> +Wine 0.9.60 was released today, with the following main changes: + +<ul> +<li>Better support for Windows IMEs.</li> +<li>Option for Windows-style window decorations.</li> +<li>Improved system tray behavior.</li> +<li>Window management fixes.</li> +<li>Improved quartz audio support.</li> +<li>Better support for launching apps from Unix file managers.</li> +<li>Lots of bug fixes.</li> +</ul> + + +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.60.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.60">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. + +</body> +</news>

1 0

Tag wine-0.9.60 : Alexandre Julliard : Release 0.9.60
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: refs/tags/wine-0.9.60 Tag: cfed77c92c1759a4701844dc5685559958d188e9 URL: http://source.winehq.org/git/wine.git/?a=tag;h=cfed77c92c1759a4701844dc5685… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 17:47:52 2008 +0200 Release 0.9.60

1 0

Alexandre Julliard : Release 0.9.60.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: b807c6197a95df14126206b7eb1f8be47821db6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b807c6197a95df14126206b7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 17:47:52 2008 +0200 Release 0.9.60. --- ANNOUNCE | 1489 ++++++++++++++++++++------------------- ChangeLog | 2361 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 3150 insertions(+), 720 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b807c6197a95df1412620…

1 0

Louis Lenders : wininet: Improve stub for FindNextUrlCacheEntryW a tiny bit .
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: b3f786091763d5dd0db40c0a8b016318e62f923f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3f786091763d5dd0db40c0a8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Apr 18 11:44:47 2008 +0000 wininet: Improve stub for FindNextUrlCacheEntryW a tiny bit. --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 429867a..ba16ed2 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3114,6 +3114,7 @@ BOOL WINAPI FindNextUrlCacheEntryW( ) { FIXME("(%p, %p, %p) stub\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Marcus Meissner : advapi32: Initialize hLock.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: fbc236107df4755c3af0fdcf89ad26041e5e399c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc236107df4755c3af0fdcf8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 08:41:54 2008 +0200 advapi32: Initialize hLock. --- dlls/advapi32/service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index dc44e6f..f9115c2 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -669,7 +669,7 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) SC_LOCK WINAPI LockServiceDatabase (SC_HANDLE hSCManager) { struct sc_manager *hscm; - SC_RPC_LOCK hLock; + SC_RPC_LOCK hLock = NULL; DWORD err; TRACE("%p\n",hSCManager);

1 0

Nikolay Sivov : gdiplus: Implemented GdipVectorTransformMatrixPoints.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 256874426dc6ec5260e3e729cb65d69f0b32f572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256874426dc6ec5260e3e729c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Apr 18 04:39:03 2008 +0400 gdiplus: Implemented GdipVectorTransformMatrixPoints. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 20 ++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index da33824..f2426b1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -619,7 +619,7 @@ @ stub GdipTranslateRegionI @ stub GdipTranslateTextureTransform @ stdcall GdipTranslateWorldTransform(ptr long long long) -@ stub GdipVectorTransformMatrixPoints +@ stdcall GdipVectorTransformMatrixPoints(ptr ptr long) @ stub GdipVectorTransformMatrixPointsI @ stub GdipWarpPath @ stub GdipWidenPath diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index dee6460..a40f690 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -281,3 +281,23 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, return Ok; } + +GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, INT count) +{ + REAL x, y; + INT i; + + if(!matrix || !pts) + return InvalidParameter; + + for(i = 0; i < count; i++) + { + x = pts[i].X; + y = pts[i].Y; + + pts[i].X = x * matrix->matrix[0] + y * matrix->matrix[2]; + pts[i].Y = x * matrix->matrix[1] + y * matrix->matrix[3]; + } + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c181b21..215864a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -229,6 +229,7 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetCustomLineCapBaseCap.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 685686aa9fcc5029d8ab39d0de235f54359e9e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=685686aa9fcc5029d8ab39d0d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 17 23:11:15 2008 +0400 gdiplus: Implemented GdipGetCustomLineCapBaseCap. --- dlls/gdiplus/customlinecap.c | 10 ++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 54005a8..e8e18bc 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -184,3 +184,13 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLineCap *baseCap) +{ + if(!customCap || !baseCap) + return InvalidParameter; + + *baseCap = customCap->cap; + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f697e50..da33824 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -249,7 +249,7 @@ @ stub GdipGetClipBoundsI @ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) -@ stub GdipGetCustomLineCapBaseCap +@ stdcall GdipGetCustomLineCapBaseCap(ptr ptr) @ stdcall GdipGetCustomLineCapBaseInset(ptr ptr) @ stub GdipGetCustomLineCapStrokeCaps @ stub GdipGetCustomLineCapStrokeJoin diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a9cdc54..c181b21 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -244,6 +244,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpLineCap); +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);

1 0

Anatoly Lyutin : user32/tests: Add test for switching not maximized mdi children.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 391ecdb6d285f7f4f27e8dedbe2b8ad9cd17a763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391ecdb6d285f7f4f27e8dedb… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Apr 17 21:27:25 2008 +0400 user32/tests: Add test for switching not maximized mdi children. --- dlls/user32/tests/msg.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b7aa39b..98fa424 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -303,6 +303,35 @@ static const struct message WmSwitchChild[] = { { 0 } }; +/* Switch visible not maximized mdi children */ +static const struct message WmSwitchNotMaximizedChild[] = { + /* Switch not maximized MDI child */ + { WM_MDIACTIVATE, sent },/* in the MDI client */ + { WM_WINDOWPOSCHANGING, sent|wparam,SWP_NOSIZE|SWP_NOMOVE },/* in the 2nd MDI child */ + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_CHILDACTIVATE, sent },/* in the 2nd MDI child */ + /* Deactivate 1st MDI child */ + { WM_NCACTIVATE, sent|wparam|defwinproc, 0 }, /* in the 1st MDI child */ + { WM_MDIACTIVATE, sent|defwinproc }, /* in the 1st MDI child */ + /* Activate 2nd MDI child */ + { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE}, /* in the 2nd MDI child */ + { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, /* in the 2nd MDI child */ + { WM_SETVISIBLE, hook }, /* in the 1st MDI child */ + { WM_KILLFOCUS, sent|defwinproc }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent|defwinproc }, /* in the 1st MDI child */ + { WM_IME_SETCONTEXT, sent }, /* in the MDI client */ + { WM_SETFOCUS, sent, 0 }, /* in the MDI client */ + { WM_SETVISIBLE, hook }, + { WM_KILLFOCUS, sent }, /* in the MDI client */ + { WM_IME_SETCONTEXT, sent }, /* in the MDI client */ + { WM_IME_SETCONTEXT, sent|defwinproc }, /* in the 1st MDI child */ + { WM_SETFOCUS, sent|defwinproc }, /* in the 2nd MDI child */ + { WM_MDIACTIVATE, sent|defwinproc }, /* in the 2nd MDI child */ + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE}, /* in the 2nd MDI child */ + { 0 } +}; + + /* SetWindowPos(SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE| SWP_NOZORDER|SWP_FRAMECHANGED) * for a visible overlapped window with WS_CLIPCHILDREN style set. @@ -3371,6 +3400,20 @@ static void test_mdi_messages(void) SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child, 0); ok_sequence(WmSwitchChild, "Child did not switch correctly", TRUE); trace("end of test for switch maximized MDI children\n"); + flush_sequence(); + + /* Prepare for switching test of not maximized MDI children */ + ShowWindow( mdi_child, SW_NORMAL ); + ok(!IsZoomed(mdi_child), "wrong zoomed state for %p(Switch test)\n", mdi_child); + ok(!IsZoomed(mdi_child2), "wrong zoomed state for %p(Switch test)\n", mdi_child2); + active_child = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(active_child == mdi_child, "wrong active MDI child %p(Switch test)\n", active_child); + flush_sequence(); + + SendMessageA(mdi_client, WM_MDIACTIVATE, (WPARAM)mdi_child2, 0); + ok_sequence(WmSwitchNotMaximizedChild, "Not maximized child did not switch correctly", TRUE); + trace("end of test for switch not maximized MDI children\n"); + flush_sequence(); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); flush_sequence(); @@ -3380,7 +3423,7 @@ static void test_mdi_messages(void) SetFocus(0); flush_sequence(); - /* end of test for switch maximized MDI children */ + /* end of tests for switch maximized/not maximized MDI children */ mdi_cs.szClass = "MDI_child_Class"; mdi_cs.szTitle = "MDI child";

1 0

Anatoly Lyutin : user32/tests: Get rid of magic number.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 7c4c6f1b599b8128c220401282c973d79cf46d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4c6f1b599b8128c22040128… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Apr 17 21:29:15 2008 +0400 user32/tests: Get rid of magic number. --- dlls/user32/tests/msg.c | 154 +++++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c4c6f1b599b8128c2204…

1 0

Lei Zhang : msxml3: Check for xsltInit before calling it.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 9d7f7bfc5e4c3c0fd1039c14df0aae44a490b3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7f7bfc5e4c3c0fd1039c14d… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 17 13:00:22 2008 -0700 msxml3: Check for xsltInit before calling it. --- configure | 111 ++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 19 ++++++--- dlls/msxml3/main.c | 2 +- include/config.h.in | 3 + 4 files changed, 123 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 01fdf19..f413e79 100755 --- a/configure +++ b/configure @@ -11948,6 +11948,7 @@ then ac_xslt_libs="`xslt-config --libs 2>/dev/null`" ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`" fi + ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" @@ -12005,7 +12006,15 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - { echo "$as_me:$LINENO: checking for xsltCompilePattern in -lxslt" >&5 + +fi + +done + + CPPFLAGS="$ac_save_CPPFLAGS" + if test "$ac_cv_header_libxslt_transform_h" = "yes" + then + { echo "$as_me:$LINENO: checking for xsltCompilePattern in -lxslt" >&5 echo $ECHO_N "checking for xsltCompilePattern in -lxslt... $ECHO_C" >&6; } if test "${ac_cv_lib_xslt_xsltCompilePattern+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12072,16 +12081,108 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_LIBXSLT 1 _ACEOF - XSLTLIBS="$ac_xslt_libs" - XSLTINCL="$ac_xslt_cflags" -fi + XSLTLIBS="$ac_xslt_libs" + XSLTINCL="$ac_xslt_cflags" + ac_save_LIBS="$LIBS" + LIBS="$LIBS $ac_xslt_libs" + +for ac_func in xsltInit +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi done - CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" +fi + + fi fi if test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"; then case "x$with_xslt" in diff --git a/configure.ac b/configure.ac index b5c4bf2..31bf9ce 100644 --- a/configure.ac +++ b/configure.ac @@ -826,17 +826,24 @@ then ac_xslt_libs="`xslt-config --libs 2>/dev/null`" ac_xslt_cflags="`xslt-config --cflags 2>/dev/null`" fi + ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" - AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h], - [AC_CHECK_LIB(xslt, xsltCompilePattern, - [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library]) - XSLTLIBS="$ac_xslt_libs" - XSLTINCL="$ac_xslt_cflags"],,$ac_xslt_libs) - ],, + AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],,, [#ifdef HAVE_LIBXSLT_PATTERN_H # include <libxslt/pattern.h> #endif]) CPPFLAGS="$ac_save_CPPFLAGS" + if test "$ac_cv_header_libxslt_transform_h" = "yes" + then + AC_CHECK_LIB(xslt, xsltCompilePattern, + [AC_DEFINE(HAVE_LIBXSLT, 1, [Define if you have the libxslt library]) + XSLTLIBS="$ac_xslt_libs" + XSLTINCL="$ac_xslt_cflags" + ac_save_LIBS="$LIBS" + LIBS="$LIBS $ac_xslt_libs" + AC_CHECK_FUNCS(xsltInit) + LIBS="$ac_save_LIBS"],,$ac_xslt_libs) + fi fi WINE_NOTICE_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"], [libxslt development files not found, xslt won't be supported.]) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 7296690..3c2bc22 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -175,7 +175,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) #ifdef HAVE_LIBXML2 xmlInitParser(); #endif -#ifdef HAVE_LIBXSLT +#ifdef HAVE_XSLTINIT xsltInit(); #endif hInstance = hInstDLL; diff --git a/include/config.h.in b/include/config.h.in index f867662..8763be3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -960,6 +960,9 @@ /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM +/* Define to 1 if you have the `xsltInit' function. */ +#undef HAVE_XSLTINIT + /* Define to 1 if you have the `_pclose' function. */ #undef HAVE__PCLOSE

1 0

Kusanagi Kouichi : winex11: Update caret position.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: bb8d1ca672b545900d6916a3716e71a39fcf3565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8d1ca672b545900d6916a37… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 18 09:48:31 2008 +0900 winex11: Update caret position. --- dlls/winex11.drv/ime.c | 26 ++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xim.c | 7 ++----- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index a1c229e..e4a2dd7 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1012,6 +1012,32 @@ INT IME_GetCursorPos() return rc; } +void IME_SetCursorPos(DWORD pos) +{ + LPINPUTCONTEXT lpIMC; + LPCOMPOSITIONSTRING compstr; + + if (!hSelectedFrom) + return; + + lpIMC = LockRealIMC(FROM_X11); + if (!lpIMC) + return; + + compstr = (LPCOMPOSITIONSTRING)ImmLockIMCC(lpIMC->hCompStr); + if (!compstr) + { + UnlockRealIMC(FROM_X11); + return; + } + + compstr->dwCursorPos = pos; + ImmUnlockIMCC(lpIMC->hCompStr); + UnlockRealIMC(FROM_X11); + GenerateIMEMessage(FROM_X11, WM_IME_COMPOSITION, pos, GCS_CURSORPOS); + return; +} + void IME_UpdateAssociation(HWND focus) { ImmGetContext(focus); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 30b339e..90a2abd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -280,6 +280,7 @@ extern void IME_SetOpenStatus(BOOL fOpen); extern void IME_XIMPresent(BOOL present); extern LRESULT IME_SendMessageToSelectedHWND(UINT msg, WPARAM wParam, LPARAM lParam); extern INT IME_GetCursorPos(); +extern void IME_SetCursorPos(DWORD pos); extern void IME_UpdateAssociation(HWND focus); extern BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index e8bf3bb..265f9c8 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -48,7 +48,6 @@ static LPBYTE CompositionString = NULL; static DWORD dwCompStringSize = 0; static LPBYTE ResultString = NULL; static DWORD dwResultStringSize = 0; -static DWORD dwPreeditPos = 0; #define STYLE_OFFTHESPOT (XIMPreeditArea | XIMStatusArea) #define STYLE_OVERTHESPOT (XIMPreeditPosition | XIMStatusNothing) @@ -216,7 +215,6 @@ static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreEditStartCallback %p\n",ic); X11DRV_ImmSetOpenStatus(TRUE); ximInComposeMode = TRUE; - IME_SendMessageToSelectedHWND(EM_GETSEL, 0, (LPARAM)&dwPreeditPos); return -1; } @@ -225,7 +223,6 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d TRACE("PreeditDoneCallback %p\n",ic); ximInComposeMode = FALSE; X11DRV_ImmSetOpenStatus(FALSE); - dwPreeditPos = 0; } static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, @@ -271,6 +268,7 @@ static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, } else X11DRV_ImmSetInternalString (GCS_COMPSTR, sel, len, NULL, 0); + IME_SetCursorPos(P_DR->caret); } TRACE("Finished\n"); } @@ -311,8 +309,7 @@ static void XIMPreEditCaretCallback(XIC ic, XPointer client_data, FIXME("Not implemented\n"); break; } - IME_SendMessageToSelectedHWND( EM_SETSEL, dwPreeditPos + pos, - dwPreeditPos + pos); + IME_SetCursorPos(pos); P_C->position = pos; } TRACE("Finished\n");

1 0

Kusanagi Kouichi : user32: Handle IME messages more gracefully.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: d79dff4e307d3ce6b2630d84db5ba31e261a2ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79dff4e307d3ce6b2630d84d… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Apr 18 08:39:31 2008 +0900 user32: Handle IME messages more gracefully. --- dlls/user32/edit.c | 72 +++++++++++++++++++++------------------------------- 1 files changed, 29 insertions(+), 43 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0866533..dba946b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1030,38 +1030,22 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, break; case WM_IME_STARTCOMPOSITION: - /* - * FIXME in IME: This message is not always sent like it should be - */ - if (es->selection_start != es->selection_end) - { - static const WCHAR empty_stringW[] = {0}; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); - } es->composition_start = es->selection_end; es->composition_len = 0; break; case WM_IME_COMPOSITION: - { - int caret_pos = es->selection_end; - if (es->composition_len == 0) - { - if (es->selection_start != es->selection_end) - { - static const WCHAR empty_stringW[] = {0}; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); - } - - es->composition_start = es->selection_end; - } - EDIT_ImeComposition(hwnd,lParam,es); - EDIT_SetCaretPos(es, caret_pos, es->flags & EF_AFTER_WRAP); + EDIT_ImeComposition(hwnd, lParam, es); break; - } case WM_IME_ENDCOMPOSITION: - es->composition_len= 0; + if (es->composition_len > 0) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + es->selection_end = es->selection_start; + es->composition_len= 0; + } break; case WM_IME_COMPOSITIONFULL: @@ -5402,22 +5386,17 @@ static void EDIT_UpdateText(EDITSTATE *es, const RECT *rc, BOOL bErase) * The Following code is to handle inline editing from IMEs */ -static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) +static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) { LONG buflen; LPWSTR lpCompStr = NULL; - HIMC hIMC; LPSTR lpCompStrAttr = NULL; DWORD dwBufLenAttr; - if (!(hIMC = ImmGetContext(hwnd))) - return; - buflen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); if (buflen < 0) { - ImmReleaseContext(hwnd, hIMC); return; } @@ -5425,7 +5404,6 @@ static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); - ImmReleaseContext(hwnd,hIMC); return; } @@ -5448,7 +5426,6 @@ static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { ERR("Unable to allocate IME Attribute String\n"); HeapFree(GetProcessHeap(),0,lpCompStr); - ImmReleaseContext(hwnd,hIMC); return; } ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, @@ -5479,22 +5456,16 @@ static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) HeapFree(GetProcessHeap(),0,lpCompStrAttr); HeapFree(GetProcessHeap(),0,lpCompStr); - ImmReleaseContext(hwnd,hIMC); } -static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) +static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) { LONG buflen; LPWSTR lpResultStr; - HIMC hIMC; - - if ( !(hIMC = ImmGetContext(hwnd))) - return; buflen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); if (buflen <= 0) { - ImmReleaseContext(hwnd, hIMC); return; } @@ -5502,7 +5473,6 @@ static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); - ImmReleaseContext(hwnd, hIMC); return; } @@ -5520,13 +5490,29 @@ static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) es->composition_len = 0; HeapFree(GetProcessHeap(),0,lpResultStr); - ImmReleaseContext(hwnd, hIMC); } static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { + HIMC hIMC; + int cursor; + + if (es->composition_len == 0 && es->selection_start != es->selection_end) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + es->composition_start = es->selection_end; + } + + hIMC = ImmGetContext(hwnd); + if (!hIMC) + return; + if (CompFlag & GCS_RESULTSTR) - EDIT_GetResultStr(hwnd,es); + EDIT_GetResultStr(hIMC, es); if (CompFlag & GCS_COMPSTR) - EDIT_GetCompositionStr(hwnd, CompFlag, es); + EDIT_GetCompositionStr(hIMC, CompFlag, es); + cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); + ImmReleaseContext(hwnd, hIMC); + EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); }

1 0

Alexandre Julliard : gdi32: Fixed initialization of bit masks in GetDIBits for 16-bit bitmaps.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 99892d6bae31a34c7972b86f8e61671168801189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99892d6bae31a34c7972b86f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 12:08:12 2008 +0200 gdi32: Fixed initialization of bit masks in GetDIBits for 16-bit bitmaps. Fix and improve the test cases. --- dlls/gdi32/dib.c | 147 +++++++++++++++++++++++---------------------- dlls/gdi32/tests/bitmap.c | 78 +++++++++++++++++------- 2 files changed, 130 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99892d6bae31a34c7972b…

1 0

Andrew Talbot : ddraw: Remove unused variables.
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: 6edfd1086896e9c6c6de2c069b39456e24018164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6edfd1086896e9c6c6de2c069… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Apr 17 22:43:49 2008 +0100 ddraw: Remove unused variables. --- dlls/ddraw/executebuffer.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 09125e2..76f0e36 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -401,9 +401,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, unsigned int nb; D3DVERTEX *src = ((LPD3DVERTEX) ((char *)This->desc.lpData + vs)) + ci->wStart; D3DTLVERTEX *dst = ((LPD3DTLVERTEX) (This->vertex_data)) + ci->wDest; - D3DMATRIX *mat2 = &world_mat; D3DMATRIX mat; - D3DVALUE nx,ny,nz; D3DVIEWPORT* Viewport = &lpViewport->viewports.vp1; if (TRACE_ON(d3d7)) { @@ -419,18 +417,13 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, multiply_matrix(&mat,&proj_mat,&mat); for (nb = 0; nb < ci->dwCount; nb++) { - /* Normals transformation */ - nx = (src->u4.nx * mat2->_11) + (src->u5.ny * mat2->_21) + (src->u6.nz * mat2->_31); - ny = (src->u4.nx * mat2->_12) + (src->u5.ny * mat2->_22) + (src->u6.nz * mat2->_32); - nz = (src->u4.nx * mat2->_13) + (src->u5.ny * mat2->_23) + (src->u6.nz * mat2->_33); - /* No lighting yet */ dst->u5.color = 0xFFFFFFFF; /* Opaque white */ dst->u6.specular = 0xFF000000; /* No specular and no fog factor */ - + dst->u7.tu = src->u7.tu; dst->u8.tv = src->u8.tv; - + /* Now, the matrix multiplication */ dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42);

1 0

Sergey Khodych : dinput/tests: Add test to show dinput does not use user defined data format for keyboard .
by Alexandre Julliard 18 Apr '08

18 Apr '08

Module: wine Branch: master Commit: c6a7fd44d28bc6c221e870980d260e3acf7ac3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a7fd44d28bc6c221e870980… Author: Sergey Khodych <khodych(a)gmail.com> Date: Fri Apr 18 00:29:24 2008 +0300 dinput/tests: Add test to show dinput does not use user defined data format for keyboard. --- dlls/dinput/tests/keyboard.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 76ecec8..440cd3c 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -71,6 +71,22 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) HRESULT hr; LPDIRECTINPUTDEVICE pKeyboard; BYTE kbd_state[256]; + BYTE custom_state[4]; + DIOBJECTDATAFORMAT dodf[] = + { + { &GUID_Key, 0, DIDFT_MAKEINSTANCE(DIK_Q)|DIDFT_BUTTON, 0 }, + { &GUID_Key, 1, DIDFT_MAKEINSTANCE(DIK_W)|DIDFT_BUTTON, 0 }, + { &GUID_Key, 2, DIDFT_MAKEINSTANCE(DIK_E)|DIDFT_BUTTON, 0 }, + { &GUID_Key, 3, DIDFT_MAKEINSTANCE(DIK_R)|DIDFT_BUTTON, 0 }, + }; + + DIDATAFORMAT df; + df.dwSize = sizeof( df ); + df.dwObjSize = sizeof( DIOBJECTDATAFORMAT ); + df.dwFlags = DIDF_RELAXIS; + df.dwDataSize = sizeof( dodf )/sizeof( dodf[0] ); + df.dwNumObjs = sizeof( dodf )/sizeof( dodf[0] ); + df.rgodf = dodf; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); @@ -94,6 +110,19 @@ static void acquire_tests(LPDIRECTINPUT pDI, HWND hwnd) ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(10,) should have failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_Unacquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Uncquire() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_SetDataFormat( pKeyboard , &df ); + ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %s\n", DXGetErrorString8(hr)); + todo_wine + { + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState(4,) failed: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(kbd_state), kbd_state); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetDeviceState(256,) should have failed: %s\n", DXGetErrorString8(hr)); + } if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008