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

Andrew Talbot : qmgr: Assign to structs instead of using memcpy.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 40c7031d2405bc650a10de0c3f753340ed8c529b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c7031d2405bc650a10de0c3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 8 15:37:09 2008 +0000 qmgr: Assign to structs instead of using memcpy. --- dlls/qmgr/job.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 2a894ba..8768027 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -159,7 +159,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetId( GUID *pVal) { BackgroundCopyJobImpl *This = (BackgroundCopyJobImpl *) iface; - memcpy(pVal, &This->jobId, sizeof *pVal); + *pVal = This->jobId; return S_OK; } @@ -460,7 +460,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, HeapFree(GetProcessHeap(), 0, This); return hr; } - memcpy(pJobId, &This->jobId, sizeof(GUID)); + *pJobId = This->jobId; list_init(&This->files); This->jobProgress.BytesTotal = 0;

1 0

Andrew Talbot : netapi32: Assign to struct instead of using memcpy.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 0167d2c8a60bef4204df11dac3b9b5f0abcd2aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0167d2c8a60bef4204df11dac… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 8 15:37:01 2008 +0000 netapi32: Assign to struct instead of using memcpy. --- dlls/netapi32/nbt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index a3e38ba..1186572 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1278,13 +1278,13 @@ static UCHAR NetBTRegisterAdapter(const MIB_IPADDRROW *ipRow) { UCHAR ret; NetBTAdapter *adapter; - + if (!ipRow) return NRC_BADDR; adapter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NetBTAdapter)); if (adapter) { - memcpy(&adapter->ipr, ipRow, sizeof(MIB_IPADDRROW)); + adapter->ipr = *ipRow; if (!NetBIOSRegisterAdapter(gTransportID, ipRow->dwIndex, adapter)) { NetBTCleanupAdapter(adapter);

1 0

Huw Davies : gdi32: Update both winnt and win9x font keys and factor out the cleanup code.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 025d84e644cffbb1b38e67cd11cbb2cedae88e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025d84e644cffbb1b38e67cd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 7 17:02:32 2008 +0000 gdi32: Update both winnt and win9x font keys and factor out the cleanup code. --- dlls/gdi32/freetype.c | 115 ++++++++++++++++++++++++++++++------------------ 1 files changed, 72 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d011cd8..ab7760d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1760,10 +1760,9 @@ static void load_system_fonts(void) */ static void update_reg_entries(void) { - HKEY winkey = 0, externalkey = 0; + HKEY winnt_key = 0, win9x_key = 0, external_key = 0; LPWSTR valueW; - LPVOID data; - DWORD dlen, vlen, datalen, valuelen, i, type, len, len_fam; + DWORD len, len_fam; Family *family; Face *face; struct list *family_elem_ptr, *face_elem_ptr; @@ -1772,47 +1771,20 @@ static void update_reg_entries(void) static const WCHAR spaceW[] = {' ', '\0'}; char *path; - if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winkey, NULL) != ERROR_SUCCESS) { + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL) != ERROR_SUCCESS) { ERR("Can't create Windows font reg key\n"); goto end; } - /* @@ Wine registry key: HKCU\Software\Wine\Fonts\ExternalFonts */ - if(RegCreateKeyW(HKEY_CURRENT_USER, external_fonts_reg_key, &externalkey) != ERROR_SUCCESS) { - ERR("Can't create external font reg key\n"); - goto end; - } - /* Delete all external fonts added last time */ - - RegQueryInfoKeyW(externalkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - valuelen++; /* returned value doesn't include room for '\0' */ - valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); - - dlen = datalen * sizeof(WCHAR); - vlen = valuelen; - i = 0; - while(RegEnumValueW(externalkey, i++, valueW, &vlen, NULL, &type, data, - &dlen) == ERROR_SUCCESS) { - - RegDeleteValueW(winkey, valueW); - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, win9x_font_reg_key, + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL) != ERROR_SUCCESS) { + ERR("Can't create Windows font reg key\n"); + goto end; } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, valueW); - - /* Delete the old external fonts key */ - RegCloseKey(externalkey); - externalkey = 0; - RegDeleteKeyW(HKEY_CURRENT_USER, external_fonts_reg_key); - /* @@ Wine registry key: HKCU\Software\Wine\Fonts\ExternalFonts */ if(RegCreateKeyExW(HKEY_CURRENT_USER, external_fonts_reg_key, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, &externalkey, NULL) != ERROR_SUCCESS) { + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &external_key, NULL) != ERROR_SUCCESS) { ERR("Can't create external font reg key\n"); goto end; } @@ -1843,21 +1815,76 @@ static void update_reg_entries(void) file = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, path, -1, file, len); - RegSetValueExW(winkey, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); - RegSetValueExW(externalkey, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); + RegSetValueExW(winnt_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); + RegSetValueExW(win9x_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); + RegSetValueExW(external_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, file); HeapFree(GetProcessHeap(), 0, valueW); } } end: - if(externalkey) - RegCloseKey(externalkey); - if(winkey) - RegCloseKey(winkey); + if(external_key) RegCloseKey(external_key); + if(win9x_key) RegCloseKey(win9x_key); + if(winnt_key) RegCloseKey(winnt_key); return; } +static void delete_external_font_keys(void) +{ + HKEY winnt_key = 0, win9x_key = 0, external_key = 0; + DWORD dlen, vlen, datalen, valuelen, i, type; + LPWSTR valueW; + LPVOID data; + + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL) != ERROR_SUCCESS) { + ERR("Can't create Windows font reg key\n"); + goto end; + } + + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, win9x_font_reg_key, + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &win9x_key, NULL) != ERROR_SUCCESS) { + ERR("Can't create Windows font reg key\n"); + goto end; + } + + if(RegCreateKeyW(HKEY_CURRENT_USER, external_fonts_reg_key, &external_key) != ERROR_SUCCESS) { + ERR("Can't create external font reg key\n"); + goto end; + } + + /* Delete all external fonts added last time */ + + RegQueryInfoKeyW(external_key, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + &valuelen, &datalen, NULL, NULL); + valuelen++; /* returned value doesn't include room for '\0' */ + valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); + data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); + + dlen = datalen * sizeof(WCHAR); + vlen = valuelen; + i = 0; + while(RegEnumValueW(external_key, i++, valueW, &vlen, NULL, &type, data, + &dlen) == ERROR_SUCCESS) { + + RegDeleteValueW(winnt_key, valueW); + RegDeleteValueW(win9x_key, valueW); + /* reset dlen and vlen */ + dlen = datalen; + vlen = valuelen; + } + HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, valueW); + + /* Delete the old external fonts key */ + RegCloseKey(external_key); + RegDeleteKeyW(HKEY_CURRENT_USER, external_fonts_reg_key); + + end: + if(win9x_key) RegCloseKey(win9x_key); + if(winnt_key) RegCloseKey(winnt_key); +} /************************************************************* * WineEngAddFontResourceEx @@ -2229,6 +2256,8 @@ BOOL WineEngInit(void) } WaitForSingleObject(font_mutex, INFINITE); + delete_external_font_keys(); + /* load the system bitmap fonts */ load_system_fonts();

1 0

Paul Vriens : users32/tests: Win9x doesn't like FILE_ALL_ACCESS.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 58665f08d1f4d56e46f71e84ec3b898dc8f5a0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=58665f08d1f4d56e46f71e84e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 7 21:34:13 2008 +0100 users32/tests: Win9x doesn't like FILE_ALL_ACCESS. --- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/listbox.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 023a3a5..2febfbb 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -626,7 +626,7 @@ static void test_LoadImage(void) icon_header->biSizeImage = 0; /* Uncompressed bitmap. */ /* Create the icon. */ - handle = CreateFileA("icon.ico", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, + handle = CreateFileA("icon.ico", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); ret = WriteFile(handle, icon_data, ICON_SIZE, &bytes_written, NULL); diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 6d0d2c8..4a9ddf4 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -561,7 +561,7 @@ static void test_listbox_LB_DIR() char driveletter; HANDLE file; - file = CreateFileA( "wtest1.tmp.c", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); CloseHandle( file ); @@ -1054,7 +1054,7 @@ static void test_listbox_dlgdir(void) char driveletter; HANDLE file; - file = CreateFileA( "wtest1.tmp.c", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); + file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); CloseHandle( file );

1 0

Paul Vriens : user32/tests: Use A-call.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: 470a0a0cae44f0517fe107d6dc7ebe850c257473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470a0a0cae44f0517fe107d6d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 7 21:44:05 2008 +0100 user32/tests: Use A-call. --- dlls/user32/tests/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 77c5b72..8bf3c29 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -877,7 +877,7 @@ static void InitialFocusTest (void) pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); g_hwndInitialFocusT1 = 0; - hDlg = CreateDialogIndirectParamW(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); ok (hDlg != 0, "Failed to create test dialog.\n"); ok ((g_hwndInitialFocusT1 == 0),

1 0

Paul Vriens : ntdll/tests: ProcessImageFileName is not supported before XP.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: af7172c18682c438008d611df561304f8cb18f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7172c18682c438008d611df… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 7 22:16:49 2008 +0100 ntdll/tests: ProcessImageFileName is not supported before XP. --- dlls/ntdll/tests/info.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 08ab192..9fab806 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -765,6 +765,11 @@ static void test_query_process_image_file_name(void) INT len; status = pNtQueryInformationProcess(NULL, ProcessImageFileName, &image_file_name, sizeof(image_file_name), NULL); + if (status == STATUS_INVALID_INFO_CLASS) + { + skip("ProcessImageFileName is not supported\n"); + return; + } ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageFileName, &image_file_name, 2, &ReturnLength);

1 0

Paul Vriens : dinput/tests: Don't treat old dinput versions as an error.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: a85c7594dc30658bc1e99380c0118815ae10d231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85c7594dc30658bc1e99380c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 7 20:26:57 2008 +0100 dinput/tests: Don't treat old dinput versions as an error. --- dlls/dinput/tests/device.c | 5 +++++ dlls/dinput/tests/keyboard.c | 5 +++++ dlls/dinput/tests/mouse.c | 5 +++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 2a9c24a..0088d5b 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -144,6 +144,11 @@ static void device_tests(void) struct enum_data data; hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (hr == DIERR_OLDDIRECTINPUTVERSION) + { + skip("Tests require a newer dinput version\n"); + return; + } ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); if (FAILED(hr)) return; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 4503f2f..76ecec8 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -143,6 +143,11 @@ static void keyboard_tests(DWORD version) ULONG ref = 0; hr = DirectInputCreate(hInstance, version, &pDI, NULL); + if (hr == DIERR_OLDDIRECTINPUTVERSION) + { + skip("Tests require a newer dinput version\n"); + return; + } ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); if (FAILED(hr)) return; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 3ea2147..8860457 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -118,6 +118,11 @@ static void mouse_tests(void) ULONG ref = 0; hr = DirectInputCreate(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (hr == DIERR_OLDDIRECTINPUTVERSION) + { + skip("Tests require a newer dinput version\n"); + return; + } ok(SUCCEEDED(hr), "DirectInputCreate() failed: %s\n", DXGetErrorString8(hr)); if (FAILED(hr)) return;

1 0

Ethan Chen : include: Add GdipBitmapUnlockBits to include/gdiplusflat.h.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: c19e0a6371e3200051e0b22781a33cd361c9a7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19e0a6371e3200051e0b2278… Author: Ethan Chen <echen(a)thunder-08-L> Date: Fri Mar 7 04:47:35 2008 -0800 include: Add GdipBitmapUnlockBits to include/gdiplusflat.h. --- include/gdiplusflat.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ae09118..fe7bdbb 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -244,6 +244,7 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); +GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap*,BitmapData*); GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*, EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**);

1 0

Paul Vriens : shell32/tests: Make tests run again on win95 and NT.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: ee69858ebed9627420a89e5ecd02d479d495a159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee69858ebed9627420a89e5ec… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 7 20:05:57 2008 +0100 shell32/tests: Make tests run again on win95 and NT. --- dlls/shell32/tests/systray.c | 43 ++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index f7fc747..c672d67 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -27,6 +27,7 @@ static HWND hMainWnd; static BOOL (WINAPI *pShell_NotifyIconW)(DWORD,PNOTIFYICONDATAW); +static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); void test_cbsize(void) { @@ -89,21 +90,28 @@ static void test_SHAppBarMessage(void) ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); - /* Presumably one can pass a hwnd with ABM_GETAUTOHIDEBAR to specify a monitor. - Pass the foreground window and check */ - foregnd = GetForegroundWindow(); - if(foregnd) + if (!pMonitorFromWindow) { - abd.hWnd = foregnd; - hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd); - ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); - ok(abd.hWnd == foregnd, "hWnd overwritten\n"); - if(hwnd) + skip("MonitorFromWindow is not available\n"); + } + else + { + /* Presumably one can pass a hwnd with ABM_GETAUTOHIDEBAR to specify a monitor. + Pass the foreground window and check */ + foregnd = GetForegroundWindow(); + if(foregnd) { - HMONITOR appbar_mon, foregnd_mon; - appbar_mon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - foregnd_mon = MonitorFromWindow(foregnd, MONITOR_DEFAULTTONEAREST); - ok(appbar_mon == foregnd_mon, "Windows on different monitors\n"); + abd.hWnd = foregnd; + hwnd = (HWND)SHAppBarMessage(ABM_GETAUTOHIDEBAR, &abd); + ok(hwnd == NULL || IsWindow(hwnd), "ret %p which is not a window\n", hwnd); + ok(abd.hWnd == foregnd, "hWnd overwritten\n"); + if(hwnd) + { + HMONITOR appbar_mon, foregnd_mon; + appbar_mon = pMonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + foregnd_mon = pMonitorFromWindow(foregnd, MONITOR_DEFAULTTONEAREST); + ok(appbar_mon == foregnd_mon, "Windows on different monitors\n"); + } } } @@ -128,10 +136,13 @@ START_TEST(systray) WNDCLASSA wc; MSG msg; RECT rc; - HMODULE hdll; + HMODULE huser32, hshell32; + + hshell32 = GetModuleHandleA("shell32.dll"); + pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW"); - hdll = GetModuleHandleA("shell32.dll"); - pShell_NotifyIconW = (void*)GetProcAddress(hdll, "Shell_NotifyIconW"); + huser32 = GetModuleHandleA("user32.dll"); + pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0;

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::write implementation.
by Alexandre Julliard March 10, 2008

March 10, 2008

Module: wine Branch: master Commit: b84626bdf04828cc72ec22e030b7d06ab6fd3bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84626bdf04828cc72ec22e03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 7 12:56:33 2008 +0100 mshtml: Added IHTMLDocument2::write implementation. --- dlls/mshtml/htmldoc.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 7 ++++- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2a04ef3..b93fe95 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -675,8 +675,61 @@ static HRESULT WINAPI HTMLDocument_get_nameProp(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarray) { - FIXME("(%p)->(%p)\n", iface, psarray); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + nsIDOMDocument *domdoc; + nsIDOMHTMLDocument *nsdoc; + nsAString nsstr; + VARIANT *var; + int i; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", iface, psarray); + + if(psarray->cDims != 1) { + FIXME("cDims=%d\n", psarray->cDims); + return E_INVALIDARG; + } + + if(!This->nscontainer) + return S_OK; + + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &domdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return S_OK; + } + + nsres = nsIDOMDocument_QueryInterface(domdoc, &IID_nsIDOMHTMLDocument, (void**)&nsdoc); + nsIDOMDocument_Release(domdoc); + if(NS_FAILED(nsres)) + return S_OK; + + hres = SafeArrayAccessData(psarray, (void**)&var); + if(FAILED(hres)) { + WARN("SafeArrayAccessData failed: %08x\n", hres); + nsIDOMHTMLDocument_Release(nsdoc); + return hres; + } + + nsAString_Init(&nsstr, NULL); + + for(i=0; i < psarray->rgsabound[0].cElements; i++) { + if(V_VT(var+i) == VT_BSTR) { + nsAString_SetData(&nsstr, V_BSTR(var+i)); + nsres = nsIDOMHTMLDocument_Write(nsdoc, &nsstr); + if(NS_FAILED(nsres)) + ERR("Write failed: %08x\n", nsres); + }else { + FIXME("vt=%d\n", V_VT(var+i)); + } + } + + nsAString_Finish(&nsstr); + SafeArrayUnaccessData(psarray); + nsIDOMHTMLDocument_Release(nsdoc); + + return S_OK; } static HRESULT WINAPI HTMLDocument_writeln(IHTMLDocument2 *iface, SAFEARRAY *psarray) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b97910d..d26250e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -415,6 +415,7 @@ PRUint32 nsACString_GetData(const nsACString*,const char**); void nsACString_Finish(nsACString*); void nsAString_Init(nsAString*,const PRUnichar*); +void nsAString_SetData(nsAString*,const PRUnichar*); PRUint32 nsAString_GetData(const nsAString*,const PRUnichar**); void nsAString_Finish(nsAString*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 08d13af..37afc6d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -502,7 +502,12 @@ void nsAString_Init(nsAString *str, const PRUnichar *data) { NS_StringContainerInit(str); if(data) - NS_StringSetData(str, data, PR_UINT32_MAX); + nsAString_SetData(str, data); +} + +void nsAString_SetData(nsAString *str, const PRUnichar *data) +{ + NS_StringSetData(str, data, PR_UINT32_MAX); } PRUint32 nsAString_GetData(const nsAString *str, const PRUnichar **data)

1 0