April 2009 - Wine-commits - list.winehq.org

David Adam : d3d9: Add tests for IDirect3D9Device_Reset.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: d993f85167fdbde73ddf6c44a898d2161e9bc707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d993f85167fdbde73ddf6c44a… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Apr 21 15:25:31 2009 +0200 d3d9: Add tests for IDirect3D9Device_Reset. --- dlls/d3d9/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f254719..fe4318e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1049,6 +1049,45 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); + pDevice = NULL; + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = FALSE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + + if(FAILED(hr)) + { + skip("could not create device, IDirect3D9_CreateDevice returned %#x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice9_TestCooperativeLevel(pDevice); + ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after creation returned %#x\n", hr); + + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.Windowed = TRUE; + d3dpp.BackBufferWidth = 400; + d3dpp.BackBufferHeight = 300; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + todo_wine ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); + todo_wine ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + todo_wine ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface9_Release(surface); + cleanup: HeapFree(GetProcessHeap(), 0, modes); if(pD3d) IDirect3D9_Release(pD3d);

1 0

Reece Dunn : winecfg: Fix the size of the application static text in Spanish.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: 2c3d5b27c220f77cdcc3638f05a49c8b92b564bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3d5b27c220f77cdcc3638f0… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 21 21:10:04 2009 +0100 winecfg: Fix the size of the application static text in Spanish. --- programs/winecfg/Es.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 440ea71..86639f7 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -52,9 +52,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configuraci�n de aplicaciones ",IDC_STATIC, 8,4,244,240 LTEXT "Wine puede imitar distintas versiones de Windows para cada aplicaci�n. Esta pesta�a est� enlazada a las de Librer�as y Gr�ficos para poder cambiar en ellas la configuraci�n global y/o la de por aplicaci�n.", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,20,227,32 CONTROL "Aplicaciones",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,50,230,150 + 15,56,230,144 PUSHBUTTON "&A�adir aplicaci�n...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Eliminar aplicaci�n...",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Versi�n a imitar:",IDC_STATIC,17,226,58,16

1 0

Reece Dunn : winecfg: Fix the size of the application static text in Japanese.
by Alexandre Julliard 22 Apr '09

22 Apr '09

Module: wine Branch: master Commit: cd71cb26f9d1ed81715838aeefd740437bc061f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd71cb26f9d1ed81715838aee… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 21 21:10:24 2009 +0100 winecfg: Fix the size of the application static text in Japanese. --- programs/winecfg/Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 8eaa603..a7868bb 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -57,9 +57,9 @@ FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " アプリケーション設定 ",IDC_STATIC, 8,4,244,240 LTEXT "Wineはアプリケーションによって異なるWindowsのバージョンをエミュレートできます。このタブはライブラリ及びグラフィック各タブと連動しますので、システム全体の設定や\n個別アプリケーションの設定の変更が行えます。", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,20,227,36 CONTROL "アプリケーション",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,50,230,150 + 15,56,230,144 PUSHBUTTON "アプリケーションを追加(&A)...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "アプリケーションを削除(&R)",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Windows バージョン:",IDC_STATIC,17,226,58,8

1 0

Christian Costa : ddraw: Handle refcount of lights when interacting with viewport.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: ffb5f749d58a641ac44e1cc7da56db1a58bb8b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb5f749d58a641ac44e1cc7d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:19:28 2009 +0200 ddraw: Handle refcount of lights when interacting with viewport. --- dlls/ddraw/viewport.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 30d5e18..c6e346e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -751,6 +751,7 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, /* Add the light in the 'linked' chain */ lpDirect3DLightImpl->next = This->lights; This->lights = lpDirect3DLightImpl; + IDirect3DLight_AddRef(lpDirect3DLight); /* Attach the light to the viewport */ lpDirect3DLightImpl->active_viewport = This; @@ -796,6 +797,7 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, else prev_light->next = cur_light->next; /* Detach the light to the viewport */ cur_light->active_viewport = NULL; + IDirect3DLight_Release( (IDirect3DLight *)cur_light ); This->num_lights--; This->map_lights &= ~(1<<lpDirect3DLightImpl->dwLightIndex); LeaveCriticalSection(&ddraw_cs); @@ -871,6 +873,9 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, break; } + if (*lplpDirect3DLight) + IDirect3DLight_AddRef(*lplpDirect3DLight); + LeaveCriticalSection(&ddraw_cs); return *lplpDirect3DLight ? D3D_OK : DDERR_INVALIDPARAMS;

1 0

Christian Costa : ddraw/tests: Add tests for refcount handling of light with viewport.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 06d2b30903c7bdb685c59d5264937d4c64886ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d2b30903c7bdb685c59d526… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:19:46 2009 +0200 ddraw/tests: Add tests for refcount handling of light with viewport. --- dlls/ddraw/tests/d3d.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 405edc9..57e1da0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -20,11 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <assert.h> #include "wine/test.h" #include "initguid.h" #include "ddraw.h" #include "d3d.h" +#include "unknwn.h" static LPDIRECTDRAW7 lpDD = NULL; static LPDIRECT3D7 lpD3D = NULL; @@ -41,6 +44,7 @@ static IDirect3D *Direct3D1 = NULL; static IDirect3DDevice *Direct3DDevice1 = NULL; static IDirect3DExecuteBuffer *ExecuteBuffer = NULL; static IDirect3DViewport *Viewport = NULL; +static IDirect3DLight *Light = NULL; typedef struct { int total; @@ -75,6 +79,13 @@ static void init_function_pointers(void) } +static ULONG getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + + static BOOL CreateDirect3D(void) { HRESULT rc; @@ -1000,11 +1011,17 @@ static BOOL D3D1_createObjects(void) hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); ok(hr == D3D_OK, "IDirect3DViewport_SetViewport returned %08x\n", hr); + hr = IDirect3D_CreateLight(Direct3D1, &Light, NULL); + ok(hr == D3D_OK, "IDirect3D_CreateLight failed: %08x\n", hr); + if (!Light) + return FALSE; + return TRUE; } static void D3D1_releaseObjects(void) { + if (Light) IDirect3DLight_Release(Light); if (Viewport) IDirect3DViewport_Release(Viewport); if (ExecuteBuffer) IDirect3DExecuteBuffer_Release(ExecuteBuffer); if (Direct3DDevice1) IDirect3DDevice_Release(Direct3DDevice1); @@ -1034,6 +1051,8 @@ static void Direct3D1Test(void) D3DINSTRUCTION *instr; D3DBRANCH *branch; IDirect3D *Direct3D_alt; + IDirect3DLight *d3dlight; + ULONG refcount; unsigned int idx = 0; static struct v_in testverts[] = { {0.0, 0.0, 0.0}, { 1.0, 1.0, 1.0}, {-1.0, -1.0, -1.0}, @@ -1394,6 +1413,24 @@ static void Direct3D1Test(void) hr = IDirect3DDevice_DeleteViewport(Direct3DDevice1, Viewport); ok(hr == D3D_OK, "IDirect3DDevice_DeleteViewport returned %08x\n", hr); + + hr = IDirect3DViewport_AddLight(Viewport, Light); + ok(hr == D3D_OK, "IDirect3DViewport_AddLight returned %08x\n", hr); + refcount = getRefcount((IUnknown*) Light); + ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + + hr = IDirect3DViewport_NextLight(Viewport, NULL, &d3dlight, D3DNEXT_HEAD); + ok(hr == D3D_OK, "IDirect3DViewport_AddLight returned %08x\n", hr); + ok(d3dlight == Light, "Got different light returned %p, expected %p\n", d3dlight, Light); + refcount = getRefcount((IUnknown*) Light); + ok(refcount == 3, "Refcount should be 2, returned is %d\n", refcount); + + hr = IDirect3DViewport_DeleteLight(Viewport, Light); + ok(hr == D3D_OK, "IDirect3DViewport_DeleteLight returned %08x\n", hr); + refcount = getRefcount((IUnknown*) Light); + ok(refcount == 2, "Refcount should be 2, returned is %d\n", refcount); + + IDirect3DLight_Release(Light); } static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY table2[256])

1 0

Damjan Jovanovic : winemenubuilder: Build freedesktop MIME type list for later use.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 0b4499cdcde2614d2bd2a9e0a9dd8ac718367bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4499cdcde2614d2bd2a9e0a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Apr 11 10:10:59 2009 +0200 winemenubuilder: Build freedesktop MIME type list for later use. --- programs/winemenubuilder/winemenubuilder.c | 169 ++++++++++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9dafc16..58e84c6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -78,6 +78,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" +#include "wine/list.h" #include "wine.xpm" #ifdef HAVE_PNG_H @@ -144,6 +145,13 @@ typedef struct int nIndex; } ENUMRESSTRUCT; +struct xdg_mime_type +{ + char *mimeType; + char *glob; + struct list entry; +}; + static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; @@ -1243,6 +1251,165 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } +static BOOL next_line(FILE *file, char **line, int *size) +{ + int pos = 0; + char *cr; + if (*line == NULL) + { + *size = 4096; + *line = HeapAlloc(GetProcessHeap(), 0, *size); + } + while (*line != NULL) + { + if (fgets(&(*line)[pos], *size - pos, file) == NULL) + { + HeapFree(GetProcessHeap(), 0, *line); + *line = NULL; + if (feof(file)) + return TRUE; + return FALSE; + } + pos = strlen(*line); + cr = strchr(*line, '\n'); + if (cr == NULL) + { + char *line2; + (*size) *= 2; + line2 = HeapReAlloc(GetProcessHeap(), 0, *line, *size); + if (line2) + *line = line2; + else + { + HeapFree(GetProcessHeap(), 0, *line); + *line = NULL; + } + } + else + { + *cr = 0; + return TRUE; + } + } + return FALSE; +} + +static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) +{ + char *globs_filename = NULL; + BOOL ret = TRUE; + globs_filename = heap_printf("%s/mime/globs", xdg_data_dir); + if (globs_filename) + { + FILE *globs_file = fopen(globs_filename, "r"); + if (globs_file) /* doesn't have to exist */ + { + char *line = NULL; + int size = 0; + while (ret && (ret = next_line(globs_file, &line, &size)) && line) + { + char *pos; + struct xdg_mime_type *mime_type_entry = NULL; + if (line[0] != '#' && (pos = strchr(line, ':'))) + { + mime_type_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xdg_mime_type)); + if (mime_type_entry) + { + *pos = 0; + mime_type_entry->mimeType = line; + mime_type_entry->glob = pos + 1; + list_add_tail(mime_types, &mime_type_entry->entry); + } + else + ret = FALSE; + } + } + HeapFree(GetProcessHeap(), 0, line); + fclose(globs_file); + } + HeapFree(GetProcessHeap(), 0, globs_filename); + } + else + ret = FALSE; + return ret; +} + +static void free_native_mime_types(struct list *native_mime_types) +{ + struct xdg_mime_type *mime_type_entry, *mime_type_entry2; + + LIST_FOR_EACH_ENTRY_SAFE(mime_type_entry, mime_type_entry2, native_mime_types, struct xdg_mime_type, entry) + { + list_remove(&mime_type_entry->entry); + HeapFree(GetProcessHeap(), 0, mime_type_entry->mimeType); + HeapFree(GetProcessHeap(), 0, mime_type_entry); + } + HeapFree(GetProcessHeap(), 0, native_mime_types); +} + +static BOOL build_native_mime_types(const char *xdg_data_home, struct list **mime_types) +{ + char *xdg_data_dirs; + BOOL ret; + + *mime_types = NULL; + + xdg_data_dirs = getenv("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) + xdg_data_dirs = heap_printf("/usr/local/share/:/usr/share/"); + else + xdg_data_dirs = heap_printf("%s", xdg_data_dirs); + + if (xdg_data_dirs) + { + *mime_types = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); + if (*mime_types) + { + const char *begin; + char *end; + + list_init(*mime_types); + ret = add_mimes(xdg_data_home, *mime_types); + if (ret) + { + for (begin = xdg_data_dirs; (end = strchr(begin, ':')); begin = end + 1) + { + *end = '\0'; + ret = add_mimes(begin, *mime_types); + *end = ':'; + if (!ret) + break; + } + if (ret) + ret = add_mimes(begin, *mime_types); + } + } + else + ret = FALSE; + HeapFree(GetProcessHeap(), 0, xdg_data_dirs); + } + else + ret = FALSE; + if (!ret && *mime_types) + { + free_native_mime_types(*mime_types); + *mime_types = NULL; + } + return ret; +} + +static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) +{ + struct list *nativeMimeTypes = NULL; + + if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) + { + WINE_ERR("could not build native MIME types\n"); + return FALSE; + } + return TRUE; +} + static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', @@ -1708,6 +1875,8 @@ static void RefreshFileTypeAssociations(void) } create_directories(applications_dir); + generate_associations(xdg_data_dir, packages_dir, applications_dir); + end: if (hSem) {

1 0

Kai Blin : sxs: Implement a stub CreateAssemblyCache to make Publish or Perish install.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 16a052817457ad34de8fd6b171697660eac9d896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a052817457ad34de8fd6b17… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Apr 19 23:55:14 2009 +0200 sxs: Implement a stub CreateAssemblyCache to make Publish or Perish install. --- dlls/sxs/sxs.c | 8 ++++++++ dlls/sxs/sxs.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 06e6672..76c2f85 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -22,7 +22,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** * DllMain (SXS.@) @@ -40,3 +42,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +HRESULT WINAPI CreateAssemblyCache(DWORD unimplemented, DWORD dwReserved) +{ + FIXME("%u %u stub\n", unimplemented, dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index 012d06b..cd32a2e 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,2 @@ -@ stub CreateAssemblyCache +@ stdcall CreateAssemblyCache(long long) @ stub CreateAssemblyNameObject

1 0

Nikolay Sivov : comctl32/listview: Add a TRACE(..) to LISTVIEW_CreateHeader .
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: ac8257cb1e805a0257328395885c4c11f6c64da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8257cb1e805a02573283958… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 21 05:27:19 2009 -0400 comctl32/listview: Add a TRACE(..) to LISTVIEW_CreateHeader. --- dlls/comctl32/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1ba8162..8f1489f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1377,6 +1377,8 @@ static INT LISTVIEW_CreateHeader(LISTVIEW_INFO *infoPtr) if (infoPtr->hwndHeader) return 0; + TRACE("Creating header for list %p\n", infoPtr->hwndSelf); + /* setup creation flags */ dFlags |= (LVS_NOSORTHEADER & infoPtr->dwStyle) ? 0 : HDS_BUTTONS; dFlags |= (LVS_NOCOLUMNHEADER & infoPtr->dwStyle) ? HDS_HIDDEN : 0;

1 0

Nikolay Sivov : comctl32/listview: Header should be created when LVS_EX_HEADERDRAGDROP set.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 9cc12d2879905cf626bdfc91699a680519c9a1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc12d2879905cf626bdfc916… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 21 05:29:22 2009 -0400 comctl32/listview: Header should be created when LVS_EX_HEADERDRAGDROP set. --- dlls/comctl32/listview.c | 7 ++++++- dlls/comctl32/tests/listview.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8f1489f..a4899c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7268,7 +7268,12 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM if((infoPtr->dwLvExStyle ^ dwOldExStyle) & LVS_EX_HEADERDRAGDROP) { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); + DWORD dwStyle; + + /* if not already created */ + LISTVIEW_CreateHeader(infoPtr); + + dwStyle = GetWindowLongW(infoPtr->hwndHeader, GWL_STYLE); if (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) dwStyle |= HDS_DRAGDROP; else diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b85dbfb..6f205fd 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -965,6 +965,17 @@ static void test_create(void) /* HDS_DRAGDROP set by default */ ok(GetWindowLongPtr(hHeader, GWL_STYLE) & HDS_DRAGDROP, "Expected header to have HDS_DRAGDROP\n"); DestroyWindow(hList); + + /* setting LVS_EX_HEADERDRAGDROP creates header */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Christian Costa : xmllite: Add stubbed dll for xmllite.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 2f4423e41b6368d351ceceefab4f03e63f27bfd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4423e41b6368d351ceceefa… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:22:15 2009 +0200 xmllite: Add stubbed dll for xmllite. --- configure | 9 ++++++++ configure.ac | 1 + dlls/xmllite/Makefile.in | 13 +++++++++++ dlls/xmllite/xmllite.spec | 6 +++++ dlls/xmllite/xmllite_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4d41840..fbe40c0 100755 --- a/configure +++ b/configure @@ -27683,6 +27683,14 @@ dlls/xinput9_1_0/Makefile: dlls/xinput9_1_0/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/xinput9_1_0/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/xmllite/Makefile" +test "x$enable_xmllite" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + xmllite" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/xmllite/Makefile: dlls/xmllite/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/xmllite/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ documentation/Makefile" test "x$enable_documentation" != xno && ALL_TOP_DIRS="$ALL_TOP_DIRS \\ documentation" @@ -29331,6 +29339,7 @@ do "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;; "dlls/xinput1_3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/tests/Makefile" ;; "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;; + "dlls/xmllite/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xmllite/Makefile" ;; "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; diff --git a/configure.ac b/configure.ac index bf5afe9..331ffdc 100644 --- a/configure.ac +++ b/configure.ac @@ -2289,6 +2289,7 @@ WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_ WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/xinput1_3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/xmllite/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in new file mode 100644 index 0000000..17d8dd1 --- /dev/null +++ b/dlls/xmllite/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = xmllite.dll +IMPORTS = kernel32 + +C_SRCS = \ + xmllite_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec new file mode 100644 index 0000000..cf43637 --- /dev/null +++ b/dlls/xmllite/xmllite.spec @@ -0,0 +1,6 @@ +@ stub CreateXmlReader +@ stub CreateXmlReaderInputWithEncodingCodePage +@ stub CreateXmlReaderInputWithEncodingName +@ stub CreateXmlWriter +@ stub CreateXmlWriterOutputWithEncodingCodePage +@ stub CreateXmlWriterOutputWithEncodingName diff --git a/dlls/xmllite/xmllite_main.c b/dlls/xmllite/xmllite_main.c new file mode 100644 index 0000000..d72903a --- /dev/null +++ b/dlls/xmllite/xmllite_main.c @@ -0,0 +1,47 @@ +/* + * XML parsing library + * + * Copyright 2009 Christian Costa + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0