June 2009 - Wine-Commits - list.winehq.org

Hans Leidekker : wininet: Always create a URL cache entry.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 70454967f93a75f1a3db85b241a1ed6c97bbe913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70454967f93a75f1a3db85b24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 16 11:00:07 2009 +0200 wininet: Always create a URL cache entry. --- dlls/wininet/http.c | 3 +-- dlls/wininet/tests/http.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8f9f404..2721427 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3807,8 +3807,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } while (loop_next); - /* FIXME: Better check, when we have to create the cache file */ - if(bSuccess && (lpwhr->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) { + if(bSuccess) { WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR cacheFileName[MAX_PATH+1]; BOOL b; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7aa3575..6b20043 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1163,11 +1163,11 @@ static void test_http_cache(void) size = sizeof(file_name); ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); - todo_wine ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed %u\n", GetLastError()); + ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed %u\n", GetLastError()); file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - todo_wine ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); CloseHandle(file); ok(InternetCloseHandle(request), "Close request handle failed\n");

1 0

Henri Verbeet : wined3d: Add format conversions for some depth stencil formats.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 23231d5a62b2c23d0ec336b9e4b24a346eef3527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23231d5a62b2c23d0ec336b9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 16 09:38:25 2009 +0200 wined3d: Add format conversions for some depth stencil formats. Although these formats aren't lockable, we still explicitly set the initial surface data when creating the texture. Unfortunately that means we'll need the conversion functions, even though all they'll ever convert will be zeroes. --- dlls/wined3d/surface.c | 80 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 25 ++++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36ba6c5..6ab0443 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1975,6 +1975,29 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 12; break; + case WINED3DFMT_D15S1: + if (GL_SUPPORT(EXT_PACKED_DEPTH_STENCIL)) + { + *convert = CONVERT_D15S1; + *target_bpp = 4; + } + break; + + case WINED3DFMT_D24X4S4: + if (GL_SUPPORT(EXT_PACKED_DEPTH_STENCIL)) + { + *convert = CONVERT_D24X4S4; + } + break; + + case WINED3DFMT_D24FS8: + if (GL_SUPPORT(ARB_DEPTH_BUFFER_FLOAT)) + { + *convert = CONVERT_D24FS8; + *target_bpp = 8; + } + break; + default: break; } @@ -2427,6 +2450,63 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } + case CONVERT_D15S1: + { + unsigned int x, y; + + for (y = 0; y < height; ++y) + { + const WORD *source = (const WORD *)(src + y * pitch); + DWORD *dest = (DWORD *)(dst + y * outpitch); + + for (x = 0; x < width; ++x) + { + /* The depth data is normalized, so needs to be scaled, the stencil data isn't. */ + WORD d15 = source[x] & 0xfffe; + DWORD d24 = d15 * 0x100 + (d15 * 0xff80 + 0x3fff80) / 0x7fff00; + dest[x] = (d24 << 8) | (source[x] & 0x1); + } + } + break; + } + + case CONVERT_D24X4S4: + { + unsigned int x, y; + + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + y * pitch); + DWORD *dest = (DWORD *)(dst + y * outpitch); + + for (x = 0; x < width; ++x) + { + /* Just need to clear out the X4 part. */ + dest[x] = source[x] & ~0xf0; + } + } + break; + } + + case CONVERT_D24FS8: + { + unsigned int x, y; + + for (y = 0; y < height; ++y) + { + const DWORD *source = (const DWORD *)(src + y * pitch); + float *dest_f = (float *)(dst + y * outpitch); + DWORD *dest_s = (DWORD *)(dst + y * outpitch); + + for (x = 0; x < width; ++x) + { + dest_f[x * 2] = float_24_to_32((source[x] & 0xffffff00) >> 8); + dest_s[x * 2 + 1] = source[x] & 0xff; + } + } + break; + } + default: ERR("Unsupported conversation type %d\n", convert); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 331015c..fc430e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,28 @@ static inline float float_16_to_32(const unsigned short *in) { } } +static inline float float_24_to_32(DWORD in) +{ + const float sgn = in & 0x800000 ? -1.0f : 1.0f; + const unsigned short e = (in & 0x780000) >> 19; + const unsigned short m = in & 0x7ffff; + + if (e == 0) + { + if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ + else return sgn * pow(2, -6.0f) * ((float)m / 524288.0f); + } + else if (e < 15) + { + return sgn * pow(2, (float)e - 7.0f) * (1.0f + ((float)m / 524288.0f)); + } + else + { + if (m == 0) return sgn / 0.0; /* +INF / -INF */ + else return 0.0 / 0.0; /* NAN */ + } +} + /** * Settings */ @@ -2053,6 +2075,9 @@ typedef enum { CONVERT_G16R16, CONVERT_R16G16F, CONVERT_R32G32F, + CONVERT_D15S1, + CONVERT_D24X4S4, + CONVERT_D24FS8, } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp, BOOL srgb_mode);

1 0

Henri Verbeet : d3d8: Add tests for deleting invalid shader handles.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 7dd5cc87490cefabed4dc8b0c138494629972325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd5cc87490cefabed4dc8b0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 16 09:38:25 2009 +0200 d3d8: Add tests for deleting invalid shader handles. --- dlls/d3d8/tests/device.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0cd741d..f039a1b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1061,6 +1061,12 @@ static void test_shader(void) ok(hTempHandle == hPixelShader, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, hPixelShader); hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); + + /* Check for double delete. */ + hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader2); + ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); + hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); + ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %#08x\n", hr); } else { @@ -1083,6 +1089,12 @@ static void test_shader(void) hr = IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); ok(hr == D3D_OK, "IDirect3DDevice8_DeleteVertexShader returned %#08x\n", hr); + /* Check for double delete. */ + hr = IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader2); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_DeleteVertexShader returned %#08x\n", hr); + hr = IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_DeleteVertexShader returned %#08x\n", hr); + cleanup: if(pD3d) IDirect3D8_Release(pD3d); if(pDevice) IDirect3D8_Release(pDevice);

1 0

Paul Vriens : gdi32/tests: Fix the last test failure on NT4.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 53b1e8909fa251190d8cbc347ca79885a60f3a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b1e8909fa251190d8cbc347… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 16 11:35:38 2009 +0200 gdi32/tests: Fix the last test failure on NT4. --- dlls/gdi32/tests/metafile.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 59ab3d1..6164050 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1277,6 +1277,26 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr HeapFree(GetProcessHeap(), 0, eto1); HeapFree(GetProcessHeap(), 0, eto2); } + else if (emr1->iType == EMR_EXTSELECTCLIPRGN && !lstrcmpA(desc, "emf_clipping")) + { + /* We have to take care of NT4 differences here */ + diff = memcmp(emr1, emr2, emr1->nSize); + if (diff) + { + ENHMETARECORD *emr_nt4; + + emr_nt4 = HeapAlloc(GetProcessHeap(), 0, emr2->nSize); + memcpy(emr_nt4, emr2, emr2->nSize); + /* Correct the nRgnSize field */ + emr_nt4->dParm[5] = sizeof(RECT); + + diff = memcmp(emr1, emr_nt4, emr1->nSize); + if (!diff) + win_skip("Catered for NT4 differences\n"); + + HeapFree(GetProcessHeap(), 0, emr_nt4); + } + } else diff = memcmp(emr1, emr2, emr1->nSize);

1 0

Paul Vriens : gdi32/tests: Fix some test failures on NT4.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: eae4b22b6136f5d299a88561d63eb6f10005bdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae4b22b6136f5d299a88561d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 16 09:49:13 2009 +0200 gdi32/tests: Fix some test failures on NT4. --- dlls/gdi32/tests/metafile.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 6f91403..59ab3d1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1809,7 +1809,9 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(rgn1->data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn1->data.rdh.dwSize); ok(rgn1->data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn1->data.rdh.iType); ok(rgn1->data.rdh.nCount == 1, "expected 1, got %u\n", rgn1->data.rdh.nCount); - ok(rgn1->data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn1->data.rdh.nRgnSize); + ok(rgn1->data.rdh.nRgnSize == sizeof(RECT) || + broken(rgn1->data.rdh.nRgnSize == 168), /* NT4 */ + "expected sizeof(RECT), got %u\n", rgn1->data.rdh.nRgnSize); hrgn = CreateRectRgn(0, 0, 0, 0); @@ -1828,7 +1830,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, PlayEnhMetaFileRecord(hdc, handle_table, emr, n_objs); ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "GetClipRgn returned %d, expected 0\n", ret); + ok(ret == 1, "GetClipRgn returned %d, expected 1\n", ret); /* Win9x returns empty clipping region */ if (is_win9x) return 1; @@ -1862,7 +1864,9 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(rgn2.data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn2.data.rdh.dwSize); ok(rgn2.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn2.data.rdh.iType); ok(rgn2.data.rdh.nCount == 1, "expected 1, got %u\n", rgn2.data.rdh.nCount); - ok(rgn2.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn2.data.rdh.nRgnSize); + ok(rgn2.data.rdh.nRgnSize == sizeof(RECT) || + broken(rgn2.data.rdh.nRgnSize == 168), /* NT4 */ + "expected sizeof(RECT), got %u\n", rgn2.data.rdh.nRgnSize); DeleteObject(hrgn); }

1 0

Alexandre Julliard : ntdll: Fix handling of self-relative security descriptors for 64-bit.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 2ee9118266c485571e4c43402aa39abe84b75ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee9118266c485571e4c43402… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 13:29:05 2009 +0200 ntdll: Fix handling of self-relative security descriptors for 64-bit. --- dlls/ntdll/sec.c | 242 ++++++++++++++++++++++++++---------------------------- 1 files changed, 115 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ee9118266c485571e4c4…

1 0

Henri Verbeet : d3d8: Deleting an invalid pixel shader handle should return D3D_OK.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 1bbc65b1550fae708d1bbaa45ad5127c3faa9ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bbc65b1550fae708d1bbaa45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 16 09:38:25 2009 +0200 d3d8: Deleting an invalid pixel shader handle should return D3D_OK. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f64af2e..d4b79ed 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2308,7 +2308,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i { WARN("Invalid handle (%#x) passed.\n", pShader); LeaveCriticalSection(&d3d8_cs); - return D3DERR_INVALIDCALL; + return D3D_OK; } IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &cur);

1 0

Aric Stewart : msctf: Setup global CompartmentMgr.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 936713fe333486c6bdc186f5fbcbe70d44e20917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936713fe333486c6bdc186f5f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 16 06:25:36 2009 +0900 msctf: Setup global CompartmentMgr. --- dlls/msctf/msctf.c | 1 + dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 675e4d5..9729ef3 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -74,6 +74,7 @@ static UINT activated = 0; DWORD tlsIndex = 0; TfClientId processId = 0; +ITfCompartmentMgr *globalCompartmentMgr = NULL; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index b4e7446..8e093eb 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -29,6 +29,7 @@ extern DWORD tlsIndex; extern TfClientId processId; +extern ITfCompartmentMgr *globalCompartmentMgr; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 490bfc6..6d31198 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -390,8 +390,22 @@ static HRESULT WINAPI ThreadMgr_GetGlobalCompartment( ITfThreadMgr* iface, ITfCompartmentMgr **ppCompMgr) { ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + HRESULT hr; + TRACE("(%p) %p\n",This, ppCompMgr); + + if (!ppCompMgr) + return E_INVALIDARG; + + if (!globalCompartmentMgr) + { + hr = CompartmentMgr_Constructor(NULL,&IID_ITfCompartmentMgr,(IUnknown**)&globalCompartmentMgr); + if (FAILED(hr)) + return hr; + } + + ITfCompartmentMgr_AddRef(globalCompartmentMgr); + *ppCompMgr = globalCompartmentMgr; + return S_OK; } static const ITfThreadMgrVtbl ThreadMgr_ThreadMgrVtbl =

1 0

Henri Verbeet : shdocvw: Take the riid parameter to TaskbarList_Create() into account.
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: 697e529c195ca3cea1dd4dc64e1b2897a219324a URL: http://source.winehq.org/git/wine.git/?a=commit;h=697e529c195ca3cea1dd4dc64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 16 09:38:25 2009 +0200 shdocvw: Take the riid parameter to TaskbarList_Create() into account. --- dlls/shdocvw/taskbarlist.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c index e0e063c..4eee34f 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/shdocvw/taskbarlist.c @@ -130,12 +130,14 @@ static const struct ITaskbarListVtbl taskbar_list_vtbl = HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) { struct taskbar_list *object; + HRESULT hr; TRACE("outer %p, riid %s, taskbar_list %p\n", outer, debugstr_guid(riid), taskbar_list); if (outer) { WARN("Aggregation not supported\n"); + *taskbar_list = NULL; return CLASS_E_NOAGGREGATION; } @@ -143,15 +145,21 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) if (!object) { ERR("Failed to allocate taskbar list object memory\n"); + *taskbar_list = NULL; return E_OUTOFMEMORY; } object->lpVtbl = &taskbar_list_vtbl; - object->refcount = 1; - - *taskbar_list = object; + object->refcount = 0; TRACE("Created ITaskbarList %p\n", object); + hr = ITaskbarList_QueryInterface((ITaskbarList *)object, riid, taskbar_list); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + return S_OK; }

1 0

Rein Klazes : comdlg32: Delay setting the initial size of resizable file dialog until the CDN_INITDONE notification has been processed .
by Alexandre Julliard June 16, 2009

June 16, 2009

Module: wine Branch: master Commit: b498fe7544702e97e5ab2fb9dbe11e7c3c2813f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b498fe7544702e97e5ab2fb9d… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jun 16 08:17:09 2009 +0200 comdlg32: Delay setting the initial size of resizable file dialog until the CDN_INITDONE notification has been processed. --- dlls/comdlg32/filedlg.c | 6 +- dlls/comdlg32/tests/filedlg.c | 126 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index b820624..6e7f985 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1111,7 +1111,7 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { #if 0 - TRACE("0x%04x 0x%04x\n", hwnd, uMsg); + TRACE("%p 0x%04x\n", hwnd, uMsg); #endif switch(uMsg) @@ -1146,6 +1146,9 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l FILEDLG95_ResizeControls(hwnd, wParam, lParam); FILEDLG95_FillControls(hwnd, wParam, lParam); + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { GetWindowRect( hwnd, &rc); @@ -1162,7 +1165,6 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) { - SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); } diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 9714dda..8b8d6e7 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -270,9 +270,135 @@ static void test_create_view_template(void) ok(!ret, "CommDlgExtendedError returned %#x\n", ret); } +/* test cases for resizing of the file dialog */ +struct { + DWORD flags; + int resize_init; /* change in CDN_INITDONE handler */ + int resize_folderchg; /* change in CDN_FOLDERCHANGE handler */ + int resize_timer1; /* change in first WM_TIMER handler */ + int resize_check; /* expected change (in second WM_TIMER handler) */ + BOOL todo; /* mark that test todo_wine */ +} resize_testcases[] = { + { 0 , 10, 10, 10, 30,FALSE}, /* 0 */ + { 0 ,-10,-10,-10,-30,FALSE}, + { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE}, + { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE}, + { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE}, + { OFN_ENABLESIZING , 0,-10, 0, 10, TRUE}, /* 5 */ + { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE}, + { OFN_ENABLESIZING ,-10, 0, 0, 10, TRUE}, + { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE}, + /* mark the end */ + { 0xffffffff } +}; + +static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static RECT initrc, rc; + static int index, count; + HWND parent = GetParent( dlg); + int resize; + switch( msg) + { + case WM_INITDIALOG: + { + DWORD style; + + index = ((OPENFILENAME*)lParam)->lCustData; + count = 0; + /* test style */ + style = GetWindowLong( parent, GWL_STYLE); + if( resize_testcases[index].flags & OFN_ENABLESIZING) + ok( style & WS_SIZEBOX, + "testid %d: dialog should have a WS_SIZEBOX style.\n", index); + else + ok( !(style & WS_SIZEBOX), + "testid %d: dialog should not have a WS_SIZEBOX style.\n", index); + break; + } + case WM_NOTIFY: + { + if(( (LPNMHDR)lParam)->code == CDN_INITDONE){ + GetWindowRect( parent, &initrc); + if( (resize = resize_testcases[index].resize_init)){ + MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, + initrc.bottom - initrc.top + resize, TRUE); + } + } else if(( (LPNMHDR)lParam)->code == CDN_FOLDERCHANGE){ + if( (resize = resize_testcases[index].resize_folderchg)){ + GetWindowRect( parent, &rc); + MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, + rc.bottom - rc.top + resize, TRUE); + } + SetTimer( dlg, 0, 100, 0); + } + break; + } + case WM_TIMER: + { + if( count == 0){ + if( (resize = resize_testcases[index].resize_timer1)){ + GetWindowRect( parent, &rc); + MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, + rc.bottom - rc.top + resize, TRUE); + } + } else if( count == 1){ + resize = resize_testcases[index].resize_check; + GetWindowRect( parent, &rc); + if( resize_testcases[index].todo){ + todo_wine { + ok( resize == rc.right - rc.left - initrc.right + initrc.left, + "testid %d size-x change %d expected %d\n", index, + rc.right - rc.left - initrc.right + initrc.left, resize); + ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, + "testid %d size-y change %d expected %d\n", index, + rc.bottom - rc.top - initrc.bottom + initrc.top, resize); + } + }else{ + ok( resize == rc.right - rc.left - initrc.right + initrc.left, + "testid %d size-x change %d expected %d\n", index, + rc.right - rc.left - initrc.right + initrc.left, resize); + ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, + "testid %d size-y change %d expected %d\n", index, + rc.bottom - rc.top - initrc.bottom + initrc.top, resize); + } + KillTimer( dlg, 0); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + } + count++; + } + break; + } + return 0; +} + +static void test_resize(void) +{ + OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + char filename[1024] = {0}; + DWORD ret; + int i; + + ofn.lpstrFile = filename; + ofn.nMaxFile = 1042; + ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; + ofn.hInstance = GetModuleHandle(NULL); + ofn.lpTemplateName = "template1"; + for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { + ofn.lCustData = i; + ofn.Flags = resize_testcases[i].flags | + OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE ; + ret = GetOpenFileName(&ofn); + ok(!ret, "GetOpenFileName returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + } +} + START_TEST(filedlg) { test_DialogCancel(); test_create_view_window2(); test_create_view_template(); + test_resize(); }

1 0