wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

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

← Newer
1
...
18
19
20
21
22
23
24
...
52
Older →

Jump to page:

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