June 2008 - Wine-commits - list.winehq.org

Jacek Caban : mshtml.idl: Added DispHTMLGenericElement declaration.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 8c9a7998c36871bf756c01b037da51f452e24f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9a7998c36871bf756c01b03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:10:59 2008 -0500 mshtml.idl: Added DispHTMLGenericElement declaration. --- include/mshtmdid.h | 5 + include/mshtml.idl | 842 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 847 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c9a7998c36871bf756c0…

1 0

Mikołaj Zalewski : comdlg32: Implement CDM_GETFOLDERIDLIST.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: bbd8706e731bfb3c07c66275c7cabfcfcebd74fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd8706e731bfb3c07c66275c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 19 15:31:35 2008 +0200 comdlg32: Implement CDM_GETFOLDERIDLIST. --- dlls/comdlg32/cdlg.h | 1 + dlls/comdlg32/cdlg32.c | 2 ++ dlls/comdlg32/filedlg.c | 6 ++++++ dlls/comdlg32/tests/filedlg.c | 14 ++++++++++++++ include/commdlg.h | 2 +- 5 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index f88e2d4..d0c0591 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -177,6 +177,7 @@ extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIS extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST); extern BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST); extern BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +extern UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); /* SHELL */ extern LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 57f3036..0f0f69b 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -47,6 +47,7 @@ LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILCombine)(LPCITEMIDLIST,LPCITEMIDLIST); LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILGetNext)(LPITEMIDLIST); BOOL (WINAPI *COMDLG32_PIDL_ILRemoveLastID)(LPCITEMIDLIST); BOOL (WINAPI *COMDLG32_PIDL_ILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); +UINT (WINAPI *COMDLG32_PIDL_ILGetSize)(LPCITEMIDLIST); /* SHELL */ LPVOID (WINAPI *COMDLG32_SHAlloc)(DWORD); @@ -95,6 +96,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) GPA(COMDLG32_PIDL_ILGetNext, SHELL32_hInstance, (LPCSTR)153L); GPA(COMDLG32_PIDL_ILClone, SHELL32_hInstance, (LPCSTR)18L); GPA(COMDLG32_PIDL_ILRemoveLastID, SHELL32_hInstance, (LPCSTR)17L); + GPA(COMDLG32_PIDL_ILGetSize, SHELL32_hInstance, (LPCSTR)152L); /* SHELL */ diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 57c76f8..618fc22 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -928,6 +928,12 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM retval = lstrlenW(lpstrPath); break; + case CDM_GETFOLDERIDLIST: + retval = COMDLG32_PIDL_ILGetSize(fodInfos->ShellInfos.pidlAbsCurrent); + if (retval <= wParam) + memcpy((void*)lParam, fodInfos->ShellInfos.pidlAbsCurrent, retval); + break; + case CDM_GETSPEC: TRACE("CDM_GETSPEC:\n"); retval = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0) + 1; diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 03192ba..abceb15 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -35,6 +35,16 @@ static UINT CALLBACK OFNHookProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPa if( nmh->code == CDN_INITDONE) { PostMessage( GetParent(hDlg), WM_COMMAND, IDCANCEL, FALSE); + } else if (nmh->code == CDN_FOLDERCHANGE ) + { + char buf[1024]; + int ret; + + memset(buf, 0x66, sizeof(buf)); + ret = SendMessage( GetParent(hDlg), CDM_GETFOLDERIDLIST, 5, (LPARAM)buf); + ok(ret > 0, "CMD_GETFOLDERIDLIST not implemented\n"); + if (ret > 5) + ok(buf[0] == 0x66 && buf[1] == 0x66, "CMD_GETFOLDERIDLIST: The buffer was touched on failure\n"); } } @@ -47,6 +57,9 @@ static void test_DialogCancel(void) OPENFILENAMEA ofn; BOOL result; char szFileName[MAX_PATH] = ""; + char szInitialDir[MAX_PATH]; + + GetWindowsDirectory(szInitialDir, MAX_PATH); ZeroMemory(&ofn, sizeof(ofn)); @@ -58,6 +71,7 @@ static void test_DialogCancel(void) ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; ofn.lpstrDefExt = "txt"; ofn.lpfnHook = (LPOFNHOOKPROC) OFNHookProc; + ofn.lpstrInitialDir = szInitialDir; PrintDlgA(NULL); ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", diff --git a/include/commdlg.h b/include/commdlg.h index cd4dc59..914e4c8 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -435,7 +435,7 @@ static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', #define CDM_GETSPEC (CDM_FIRST + 0x0000) #define CDM_GETFILEPATH (CDM_FIRST + 0x0001) #define CDM_GETFOLDERPATH (CDM_FIRST + 0x0002) -#define CDM_GETFOLDERLIST (CDM_FIRST + 0x0003) +#define CDM_GETFOLDERIDLIST (CDM_FIRST + 0x0003) #define CDM_SETCONTROLTEXT (CDM_FIRST + 0x0004) #define CDM_HIDECONTROL (CDM_FIRST + 0x0005) #define CDM_SETDEFEXT (CDM_FIRST + 0x0006)

1 0

Jacek Caban : urlmon: Make mk protocol behave like IE7.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 1aac23d89e82d14674e262dcd9b15a5f8b704bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aac23d89e82d14674e262dcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:11:44 2008 -0500 urlmon: Make mk protocol behave like IE7. --- dlls/urlmon/mk.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index a7edd1b..2a58d68 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -106,7 +106,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CLSID clsid; HRESULT hres; - static const WCHAR wszMK[] = {'m','k',':'}; + static const WCHAR wszMK[] = {'m','k',':','@'}; TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); @@ -133,10 +133,6 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } ptr2 = szUrl + sizeof(wszMK)/sizeof(WCHAR); - if(*ptr2 != '@') - return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); - ptr2++; - ptr = strchrW(ptr2, ':'); if(!ptr) return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER);

1 0

Jacek Caban : mshtml: Better timer handling.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 723b745579dba79e693e190ac624f0dabd344cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723b745579dba79e693e190ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 16:09:58 2008 -0500 mshtml: Better timer handling. --- dlls/mshtml/task.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 55ca882..f9969c5 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -81,7 +81,6 @@ static void release_task_timer(HWND thread_hwnd, task_timer_t *timer) { list_remove(&timer->entry); - KillTimer(thread_hwnd, timer->id); IDispatch_Release(timer->disp); heap_free(timer); @@ -336,18 +335,25 @@ static void process_task(task_t *task) static LRESULT process_timer(void) { thread_data_t *thread_data = get_thread_data(TRUE); - DWORD tc = GetTickCount(); + DWORD tc; task_timer_t *timer; + TRACE("\n"); + while(!list_empty(&thread_data->timer_list)) { timer = LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry); + + tc = GetTickCount(); if(timer->time > tc) { SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time-tc, NULL); return 0; } list_remove(&timer->entry); + list_init(&timer->entry); + call_disp_func(timer->doc, timer->disp); + release_task_timer(thread_data->thread_hwnd, timer); }

1 0

Mikołaj Zalewski : winhlp32: Update Polish translation .
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 30899341cd6e6753f159dcf806c0cbb1f6bf7f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30899341cd6e6753f159dcf80… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 19 12:43:55 2008 +0200 winhlp32: Update Polish translation. --- programs/winhlp32/Pl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc index 2c20de4..6b3a767 100644 --- a/programs/winhlp32/Pl.rc +++ b/programs/winhlp32/Pl.rc @@ -77,8 +77,8 @@ STID_HISTORY, "&Historia" STID_TOPICS, "&Tematy" STID_ALL_FILES, "Wszystkie pliki (*.*)" STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszuka� tego pliku samodzielnie?" +STID_NO_RICHEDIT "Nie uda�o si� znale�� modu�u richedit... Wy�wietlenie pomocy nie jest mo�liwe" }

1 0

H. Verbeet : wined3d: Report WINED3DFMT_FLAG_FILTERING on WINED3DFMT_D24X8.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: e081d69bc130ee2cb78cce614c50f46dbe8cfbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e081d69bc130ee2cb78cce614… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 19 18:24:45 2008 +0200 wined3d: Report WINED3DFMT_FLAG_FILTERING on WINED3DFMT_D24X8. We report this for WINED3DFMT_D24S8, so there should be no reason WINED3DFMT_D24X8 can't do it. Fixes a regression in 3DMark06. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8ec0688..d2883da 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -241,7 +241,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_D24S8 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL }, {WINED3DFMT_D24X8 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT - ,WINED3DFMT_FLAG_DEPTH }, + ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH }, {WINED3DFMT_D24X4S4 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT ,WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL }, {WINED3DFMT_D16 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_SHORT

1 0

H. Verbeet : wined3d: Handle depth formats like any other format in CheckDeviceFormat.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: c835b00a361eaa22c27621c43c40816b1358def8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c835b00a361eaa22c27621c43… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 19 18:24:23 2008 +0200 wined3d: Handle depth formats like any other format in CheckDeviceFormat. Currently depth formats are handled separately from the other formats, but depth formats can support things like filtering as well, so we should check those caps as well. --- dlls/wined3d/directx.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 61ab9d1..ace6199 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2212,7 +2212,9 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) TRACE_(d3d_caps)("[OK]\n"); return TRUE; - /* Depth/stencil is handled using checkDepthStencilCapability, return FALSE here */ + /***** + * Supported: Depth/Stencil formats + */ case WINED3DFMT_D16_LOCKABLE: case WINED3DFMT_D16: case WINED3DFMT_D15S1: @@ -2222,7 +2224,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) case WINED3DFMT_D24FS8: case WINED3DFMT_D32: case WINED3DFMT_D32F_LOCKABLE: - return FALSE; + return TRUE; /***** * Not supported everywhere(depends on GL_ATI_envmap_bumpmap or @@ -2669,9 +2671,15 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } } - } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { - if(Usage & WINED3DUSAGE_DEPTHSTENCIL) - UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + + if(Usage & WINED3DUSAGE_DEPTHSTENCIL) { + if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; + } else { + TRACE_(d3d_caps)("[FAILED] - No depth stencil support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else { TRACE_(d3d_caps)("[FAILED] - Texture format not supported\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Huw Davies : d3d8: Fix typo in test.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: a52224a48ba6e760ec418e93a6c4cb53f9dfdea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52224a48ba6e760ec418e93a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 19 16:26:52 2008 +0100 d3d8: Fix typo in test. --- dlls/d3d8/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4654842..4c15560 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -303,7 +303,7 @@ static void clear_test(IDirect3DDevice8 *device) /* negative x, negative y */ rect_negneg.x1 = 640; - rect_negneg.x1 = 240; + rect_negneg.y1 = 240; rect_negneg.x2 = 320; rect_negneg.y2 = 0; hr = IDirect3DDevice8_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);

1 0

Huw Davies : kernel32: Fix typo.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: 6e2827ec2984bd694ea132c26770ccd09a815516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2827ec2984bd694ea132c26… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 19 15:35:00 2008 +0100 kernel32: Fix typo. --- dlls/kernel32/tests/toolhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index eb7b424..804d266 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -272,7 +272,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected pe.dwSize = sizeof(pe); ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); - me.dwSize = sizeof(me); + te.dwSize = sizeof(te); ok(!pThread32First( hSnapshot, &te ), "shouldn't return a thread\n"); CloseHandle(hSnapshot);

1 0

Huw Davies : ntdll: Free the correct buffer in the test.
by Alexandre Julliard 20 Jun '08

20 Jun '08

Module: wine Branch: master Commit: a3d715594735313b8fe51e5f7d462b26c311af76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d715594735313b8fe51e5f7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 19 12:46:55 2008 +0100 ntdll: Free the correct buffer in the test. --- dlls/ntdll/tests/info.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 140be05..8e1e836 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -243,20 +243,20 @@ static void test_query_process(void) } SYSTEM_PROCESS_INFORMATION_PRIVATE, *PSYSTEM_PROCESS_INFORMATION_PRIVATE; ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); - SYSTEM_PROCESS_INFORMATION_PRIVATE* spi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); /* Only W2K3 returns the needed length, the rest returns 0, so we have to loop */ for (;;) { - status = pNtQuerySystemInformation(SystemProcessInformation, spi, SystemInformationLength, &ReturnLength); + status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength); if (status != STATUS_INFO_LENGTH_MISMATCH) break; - spi = HeapReAlloc(GetProcessHeap(), 0, spi , SystemInformationLength *= 2); + spi_buf = HeapReAlloc(GetProcessHeap(), 0, spi_buf , SystemInformationLength *= 2); } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + spi = spi_buf; /* Get the first dwOffset, from this we can deduce the OS version we're running * @@ -320,7 +320,7 @@ static void test_query_process(void) if (one_before_last_pid == 0) one_before_last_pid = last_pid; - HeapFree( GetProcessHeap(), 0, spi); + HeapFree( GetProcessHeap(), 0, spi_buf); } static void test_query_procperf(void)

1 0