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

Mikołaj Zalewski : taskmgr: Use own icon in Run dialog .
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: ca12410f46d6fa85f2da8917ce964795cc573b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca12410f46d6fa85f2da8917c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jun 30 18:15:51 2008 +0200 taskmgr: Use own icon in Run dialog. --- programs/taskmgr/run.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index efb9fb0..1954e9f 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -61,6 +61,7 @@ void TaskManager_OnFileNew(void) /* Show "Run..." dialog */ if (RunFileDlg) { + HICON hIcon = LoadIconW(GetModuleHandleW(NULL), MAKEINTRESOURCEW(IDI_TASKMANAGER)); versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&versionInfo); @@ -68,13 +69,13 @@ void TaskManager_OnFileNew(void) { WCHAR wTitle[64]; LoadStringW(GetModuleHandleW(NULL), IDS_RUNDLG_CAPTION, wTitle, 64); - RunFileDlg(hMainWnd, 0, NULL, (LPCSTR)wTitle, NULL, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, hIcon, NULL, (LPCSTR)wTitle, NULL, RFF_CALCDIRECTORY); } else { char szTitle[64]; LoadStringA(GetModuleHandleW(NULL), IDS_RUNDLG_CAPTION, szTitle, 64); - RunFileDlg(hMainWnd, 0, NULL, szTitle, NULL, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, hIcon, NULL, szTitle, NULL, RFF_CALCDIRECTORY); } }

1 0

Mikołaj Zalewski : shell32: RunFileDlg: Allow custom icons.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: ca854add25b9897dae2a428a0b8cdf4257e06ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca854add25b9897dae2a428a0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jul 8 16:05:50 2008 +0200 shell32: RunFileDlg: Allow custom icons. --- dlls/shell32/dialogs.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 0e858b8..b64d306 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -139,9 +139,12 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR if (prfdp->uFlags & RFF_CALCDIRECTORY) FIXME("RFF_CALCDIRECTORY not supported\n"); - SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; - SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_ICON), STM_SETICON, - (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); + if (prfdp->hIcon == NULL) + prfdp->hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); + SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)prfdp->hIcon); + SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); + FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0) ; SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)) ; return TRUE ;

1 0

Tobias Jakobi : d3d9: Remove faulty comment from CreateOffscreenPlainSurface.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: fb0fbc4b85ce7cf79ac7436743f403df51c465f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0fbc4b85ce7cf79ac743674… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Jul 3 01:34:16 2008 +0200 d3d9: Remove faulty comment from CreateOffscreenPlainSurface. --- dlls/d3d9/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d69149d..7376525 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -660,8 +660,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIREC FIXME("Attempting to create a managed offscreen plain surface\n"); return D3DERR_INVALIDCALL; } - /*MSDN: D3DPOOL_SCRATCH will return a surface that has identical characteristics to a surface created by the Microsoft DirectX 8.x method CreateImageSurface. - + /* 'Off-screen plain surfaces are always lockable, regardless of their pool types.' but then... D3DPOOL_DEFAULT is the appropriate pool for use with the IDirect3DDevice9::StretchRect and IDirect3DDevice9::ColorFill.

1 0

Dylan Smith : richedit: Removed unused variable bCaretShown in ME_TextEditor.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: eb4ed9cadf0392658da42813040d8de236f39111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4ed9cadf0392658da428130… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 8 11:19:40 2008 -0400 richedit: Removed unused variable bCaretShown in ME_TextEditor. --- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3d7f339..8a099a6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1708,7 +1708,6 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ME_MakeFirstParagraph(ed); - ed->bCaretShown = FALSE; /* The four cursors are for: * 0 - The position where the caret is shown * 1 - The anchored end of the selection (for normal selection) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 98769e4..e3f29b3 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -300,7 +300,6 @@ typedef struct tagME_TextEditor { HWND hWnd; BOOL bEmulateVersion10; - BOOL bCaretShown; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; int nCursors;

1 0

Huw Davies : gdiplus: Add a test to show that bitmap fonts aren' t used for fontfamilies.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 5d929b13742d767f38095110b21ab41e4d9a1e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d929b13742d767f38095110b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 8 13:20:55 2008 +0100 gdiplus: Add a test to show that bitmap fonts aren't used for fontfamilies. --- dlls/gdiplus/tests/font.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 51fd327..8bf1289 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -166,6 +166,13 @@ static void test_fontfamily (void) ok ((lstrcmpiW(itsName, nonexistant) != 0), "Expected a non-zero value for nonexistant font!\n"); + /* Bitmap fonts are not found */ +todo_wine +{ + stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); + expect (FontFamilyNotFound, stat); +} + stat = GdipCreateFontFamilyFromName (arial, NULL, &family); expect (Ok, stat);

1 0

Huw Davies : user32: sizeof DDEPOKE and DDEDATA is six, which is probably not what is expected, so use offsetof instead.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 64acbb55b4411cb44ed00f72d7dcb03805fe55a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64acbb55b4411cb44ed00f72d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 8 15:18:21 2008 +0100 user32: sizeof DDEPOKE and DDEDATA is six, which is probably not what is expected, so use offsetof instead. --- dlls/user32/dde_client.c | 2 +- dlls/user32/dde_server.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/tests/dde.c | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 83bc9fb..6f7386d 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -724,7 +724,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD GlobalUnlock(hglobal); } - pXAct->hMem = GlobalAlloc(GHND | GMEM_DDESHARE, sizeof(DDEPOKE) + cbData); + pXAct->hMem = GlobalAlloc(GHND | GMEM_DDESHARE, FIELD_OFFSET(DDEPOKE, Value[cbData])); ddePoke = GlobalLock(pXAct->hMem); if (!ddePoke) { diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index a2064a0..1c75bff 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -844,7 +844,7 @@ static WDML_QUEUE_STATE WDML_ServerHandlePoke(WDML_CONV* pConv, WDML_XACT* pXAct if (!(pConv->instance->CBFflags & CBF_FAIL_POKES)) { hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, pDdePoke->Value, - GlobalSize(pXAct->hMem) - sizeof(DDEPOKE) + 1, + GlobalSize(pXAct->hMem) - FIELD_OFFSET(DDEPOKE, Value), 0, 0, pDdePoke->cfFormat, 0); if (hDdeData) { diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6588f8e..522ff38 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1456,8 +1456,8 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes { size = GlobalSize( (HGLOBAL)uiLo ) ; if ((info->msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) || - (info->msg == WM_DDE_DATA && size < sizeof(DDEDATA)) || - (info->msg == WM_DDE_POKE && size < sizeof(DDEPOKE)) + (info->msg == WM_DDE_DATA && size < FIELD_OFFSET(DDEDATA, Value)) || + (info->msg == WM_DDE_POKE && size < FIELD_OFFSET(DDEPOKE, Value)) ) return FALSE; } diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index f082314..56c8893 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -699,10 +699,7 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ptr = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", ptr); - todo_wine - { - ok(size == 14, "Expected 14, got %d\n", size); - } + ok(size == 12, "Expected 12, got %d\n", size); DdeUnaccessData(hdata); size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); @@ -981,7 +978,7 @@ static HGLOBAL create_poke() DDEPOKE *poke; DWORD size; - size = sizeof(DDEPOKE) + lstrlenA("poke data\r\n") + 1; + size = FIELD_OFFSET(DDEPOKE, Value[sizeof("poke data\r\n")]); hglobal = GlobalAlloc(GMEM_DDESHARE, size); ok(hglobal != 0, "Expected non-NULL hglobal\n");

1 0

Tobias Jakobi : d3d8: Add testcase for IDirect3DDevice8::CreateImageSurface .
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 413ce31eff419dba00a1b03cf73ba7fe92f351e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413ce31eff419dba00a1b03cf… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Tue Jul 8 12:50:09 2008 +0200 d3d8: Add testcase for IDirect3DDevice8::CreateImageSurface. --- dlls/d3d8/tests/surface.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 6e0d48c..3580e59 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -66,6 +66,42 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) return device_ptr; } +/* Test the behaviour of the IDirect3DDevice8::CreateImageSurface method. + +Expected behaviour (and also documented in the original DX8 docs) is that the +call returns a surface with the SYSTEMMEM pool type. Games like Max Payne 1 +and 2 which use Direct3D8 calls depend on this behaviour. + +A short remark in the DX9 docs however states that the pool of the +returned surface object is of type SCRATCH. This is misinformation and results +in screenshots not appearing in the savegame loading menu of both games +mentioned above (engine tries to display a texture from the scratch pool). + +This test verifies that the behaviour described in the original D3D8 docs is +the correct one. For more information about this issue, see the MSDN: + +D3D9 docs: "Converting to Direct3D 9" +D3D9 reference: "IDirect3DDevice9::CreateOffscreenPlainSurface" +D3D8 reference: "IDirect3DDevice8::CreateImageSurface" +*/ + +static void test_image_surface_pool(IDirect3DDevice8 *device) { + IDirect3DSurface8 *surface = 0; + D3DSURFACE_DESC surf_desc; + HRESULT hr; + + hr = IDirect3DDevice8_CreateImageSurface(device, 128, 128, D3DFMT_A8R8G8B8, &surface); + ok(SUCCEEDED(hr), "CreateImageSurface failed (0x%08x)\n", hr); + + hr = IDirect3DSurface8_GetDesc(surface, &surf_desc); + ok(SUCCEEDED(hr), "GetDesc failed (0x%08x)\n", hr); + + todo_wine ok((surf_desc.Pool == D3DPOOL_SYSTEMMEM), + "CreateImageSurface returns surface with unexpected pool type %u (should be SYSTEMMEM = 2)\n", surf_desc.Pool); + + IDirect3DSurface8_Release(surface); +} + static void test_surface_get_container(IDirect3DDevice8 *device_ptr) { IDirect3DTexture8 *texture_ptr = 0; @@ -296,6 +332,7 @@ START_TEST(surface) device_ptr = init_d3d8(d3d8_handle); if (!device_ptr) return; + test_image_surface_pool(device_ptr); test_surface_get_container(device_ptr); test_lockrect_invalid(device_ptr); test_private_data(device_ptr);

1 0

Tobias Jakobi : d3d8: Fix IDirect3DDevice8::CreateImageSurface pool type.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 9ba3d03e7848ec7881ffc3cfdcf01a76d1aa1cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba3d03e7848ec7881ffc3cfd… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Tue Jul 8 12:56:16 2008 +0200 d3d8: Fix IDirect3DDevice8::CreateImageSurface pool type. --- dlls/d3d8/device.c | 4 +++- dlls/d3d8/tests/surface.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cf864cc..476abe9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -697,12 +697,14 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DD return hr; } +/* IDirect3DDevice8Impl::CreateImageSurface returns surface with pool type SYSTEMMEM */ static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) { HRESULT hr; TRACE("Relay\n"); EnterCriticalSection(&d3d8_cs); - hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Loackable */ , FALSE /*Discard*/ , 0 /* Level */ , ppSurface, D3DRTYPE_SURFACE, 0 /* Usage (undefined/none) */ , D3DPOOL_SCRATCH, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); + hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Loackable */ , FALSE /*Discard*/ , 0 /* Level */ , ppSurface, + D3DRTYPE_SURFACE, 0 /* Usage (undefined/none) */ , D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */); LeaveCriticalSection(&d3d8_cs); return hr; } diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index 3580e59..86fb884 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -96,7 +96,7 @@ static void test_image_surface_pool(IDirect3DDevice8 *device) { hr = IDirect3DSurface8_GetDesc(surface, &surf_desc); ok(SUCCEEDED(hr), "GetDesc failed (0x%08x)\n", hr); - todo_wine ok((surf_desc.Pool == D3DPOOL_SYSTEMMEM), + ok((surf_desc.Pool == D3DPOOL_SYSTEMMEM), "CreateImageSurface returns surface with unexpected pool type %u (should be SYSTEMMEM = 2)\n", surf_desc.Pool); IDirect3DSurface8_Release(surface);

1 0

Michael Stefaniuc : riched20: Fix typo.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 0164bffd9a16b67ccb630cdccb3697ef0de8cc1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0164bffd9a16b67ccb630cdcc… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Tue Jul 8 14:05:26 2008 +0200 riched20: Fix typo. --- dlls/riched20/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7e90096..3d7f339 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1642,8 +1642,8 @@ static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, clickMsg.wParam = wParam; clickMsg.lParam = lParam; clickMsg.time = GetMessageTime(); - clickMsg.pt.x = LOWORD(lParam); - clickMsg.pt.x = HIWORD(lParam); + clickMsg.pt.x = (short)LOWORD(lParam); + clickMsg.pt.y = (short)HIWORD(lParam); if ((clickNum != 0) && (clickMsg.message == prevClickMsg.message) && (clickMsg.hwnd == prevClickMsg.hwnd) &&

1 0

Alexandre Julliard : dsound: Don' t depend on the dxerr8 static library in the tests.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: ca681835dc0b97c299b235adba413bf80941fc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca681835dc0b97c299b235adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 17:49:20 2008 +0200 dsound: Don't depend on the dxerr8 static library in the tests. --- dlls/dsound/tests/Makefile.in | 2 +- dlls/dsound/tests/capture.c | 134 ++++++++------------- dlls/dsound/tests/ds3d.c | 249 +++++++++++++++------------------------ dlls/dsound/tests/ds3d8.c | 248 +++++++++++++++------------------------ dlls/dsound/tests/dsound.c | 261 +++++++++++++++++------------------------ dlls/dsound/tests/dsound8.c | 216 ++++++++++++++-------------------- dlls/dsound/tests/duplex.c | 37 +++---- dlls/dsound/tests/propset.c | 89 +++++++------- 8 files changed, 493 insertions(+), 743 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca681835dc0b97c299b23…

1 0