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

Alexandre Julliard : gdi32: Put vertical font families after their horizontal counterpart in the font list .
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: e531306f7ad6292fe0deff1533e25059d88df93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e531306f7ad6292fe0deff153… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 12:12:16 2013 +0200 gdi32: Put vertical font families after their horizontal counterpart in the font list. --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2ec7335..bdd6df7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1622,6 +1622,38 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu } } +/* move vertical fonts after their horizontal counterpart */ +/* assumes that font_list is already sorted by family name */ +static void reorder_vertical_fonts(void) +{ + Family *family, *next, *vert_family; + struct list *ptr, *vptr; + struct list vertical_families = LIST_INIT( vertical_families ); + + LIST_FOR_EACH_ENTRY_SAFE( family, next, &font_list, Family, entry ) + { + if (family->FamilyName[0] != '@') continue; + list_remove( &family->entry ); + list_add_tail( &vertical_families, &family->entry ); + } + + ptr = list_head( &font_list ); + vptr = list_head( &vertical_families ); + while (ptr && vptr) + { + family = LIST_ENTRY( ptr, Family, entry ); + vert_family = LIST_ENTRY( vptr, Family, entry ); + if (strcmpiW( family->FamilyName, vert_family->FamilyName + 1 ) > 0) + { + list_remove( vptr ); + list_add_before( ptr, vptr ); + vptr = list_head( &vertical_families ); + } + else ptr = list_next( &font_list, ptr ); + } + list_move_tail( &font_list, &vertical_families ); +} + static void load_font_list_from_cache(HKEY hkey_font_cache) { DWORD size, family_index = 0; @@ -1672,6 +1704,8 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) release_family( family ); size = sizeof(buffer); } + + reorder_vertical_fonts(); } static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition)

1 0

Aric Stewart : gdi32/tests: Add a test case for vertical fonts enumeration order.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 37d216cc563477312b438dad9fbe4156e53a1e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d216cc563477312b438dad9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 18 07:42:00 2013 -0500 gdi32/tests: Add a test case for vertical fonts enumeration order. --- dlls/gdi32/tests/font.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9563da9..6ee8db4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5098,6 +5098,42 @@ static void test_max_height(void) return; } +static void test_vertical_order(void) +{ + struct enum_font_data efd; + LOGFONTA lf; + HDC hdc; + int i, j; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + efd.total = 0; + EnumFontFamiliesExA(hdc, &lf, enum_font_data_proc, (LPARAM)&efd, 0); + for (i = 0; i < efd.total; i++) + { + if (efd.lf[i].lfFaceName[0] != '@') continue; + for (j = 0; j < efd.total; j++) + { + if (!strcmp(efd.lf[i].lfFaceName + 1, efd.lf[j].lfFaceName)) + { + ok(i > j,"Found vertical font %s before its horizontal version\n", efd.lf[i].lfFaceName); + break; + } + } + } + DeleteDC( hdc ); +} + + START_TEST(font) { init(); @@ -5155,6 +5191,7 @@ START_TEST(font) test_fullname2(); test_east_asian_font_selection(); test_max_height(); + test_vertical_order(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Jacek Caban : dwmapi.h: Added some missing declarations.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 92bdc3705860303c0c540aee7f6b73b598f71b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bdc3705860303c0c540aee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 20 15:28:59 2013 +0200 dwmapi.h: Added some missing declarations. --- include/dwmapi.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index b2546ae..f85999a 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -32,6 +32,59 @@ extern "C" { DECLARE_HANDLE(HTHUMBNAIL); typedef HTHUMBNAIL *PHTHUMBNAIL; +#include <pshpack1.h> + +typedef ULONGLONG DWM_FRAME_COUNT; +typedef ULONGLONG QPC_TIME; + +typedef struct _UNSIGNED_RATIO { + UINT32 uiNumerator; + UINT32 uiDenominator; +} UNSIGNED_RATIO; + +typedef struct _DWM_TIMING_INFO { + UINT32 cbSize; + UNSIGNED_RATIO rateRefresh; + QPC_TIME qpcRefreshPeriod; + UNSIGNED_RATIO rateCompose; + QPC_TIME qpcVBlank; + DWM_FRAME_COUNT cRefresh; + UINT cDXRefresh; + QPC_TIME qpcCompose; + DWM_FRAME_COUNT cFrame; + UINT cDXPresent; + DWM_FRAME_COUNT cRefreshFrame; + DWM_FRAME_COUNT cFrameSubmitted; + UINT cDXPresentSubmitted; + DWM_FRAME_COUNT cFrameConfirmed; + UINT cDXPresentConfirmed; + DWM_FRAME_COUNT cRefreshConfirmed; + UINT cDXRefreshConfirmed; + DWM_FRAME_COUNT cFramesLate; + UINT cFramesOutstanding; + DWM_FRAME_COUNT cFrameDisplayed; + QPC_TIME qpcFrameDisplayed; + DWM_FRAME_COUNT cRefreshFrameDisplayed; + DWM_FRAME_COUNT cFrameComplete; + QPC_TIME qpcFrameComplete; + DWM_FRAME_COUNT cFramePending; + QPC_TIME qpcFramePending; + DWM_FRAME_COUNT cFramesDisplayed; + DWM_FRAME_COUNT cFramesComplete; + DWM_FRAME_COUNT cFramesPending; + DWM_FRAME_COUNT cFramesAvailable; + DWM_FRAME_COUNT cFramesDropped; + DWM_FRAME_COUNT cFramesMissed; + DWM_FRAME_COUNT cRefreshNextDisplayed; + DWM_FRAME_COUNT cRefreshNextPresented; + DWM_FRAME_COUNT cRefreshesDisplayed; + DWM_FRAME_COUNT cRefreshesPresented; + DWM_FRAME_COUNT cRefreshStarted; + ULONGLONG cPixelsReceived; + ULONGLONG cPixelsDrawn; + DWM_FRAME_COUNT cBuffersEmpty; +} DWM_TIMING_INFO; + typedef struct _MilMatrix3x2D { DOUBLE S_11; @@ -42,6 +95,8 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#include <poppack.h> + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -60,6 +115,7 @@ DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD);

1 0

Jacek Caban : dwmapi: Added DwmGetCompositionTimingInfo stub.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: f98ccb82b9987d0c9cff79e15ac8c08a82cd011d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98ccb82b9987d0c9cff79e15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 20 15:29:17 2013 +0200 dwmapi: Added DwmGetCompositionTimingInfo stub. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 8f8f7a3..5f74970 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -28,7 +28,7 @@ @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) -@ stub DwmGetCompositionTimingInfo +@ stdcall DwmGetCompositionTimingInfo(long ptr) @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 39a9918..e6154ba 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -208,3 +208,15 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i return E_NOTIMPL; } + +/********************************************************************** + * DwmGetCompositionTimingInfo (DWMAPI.@) + */ +HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) +{ + static int i; + + if(!i++) FIXME("(%p %p)\n", hwnd, info); + + return E_NOTIMPL; +}

1 0

Alexandre Julliard : winemac.drv: Don' t register IME classes before the dll is initialized.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 410b728c7b04abba1a7de2a4e9ec287b593ad76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=410b728c7b04abba1a7de2a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 17:02:01 2013 +0200 winemac.drv: Don't register IME classes before the dll is initialized. --- dlls/winemac.drv/macdrv_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d72b036..470553e 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -164,7 +164,7 @@ static void setup_options(void) /*********************************************************************** * process_attach */ -static BOOL process_attach(void) +static BOOL process_attach( HINSTANCE instance ) { SessionAttributeBits attributes; OSStatus status; @@ -186,6 +186,7 @@ static BOOL process_attach(void) set_app_icon(); macdrv_clipboard_process_attach(); + IME_RegisterClasses( instance ); return TRUE; } @@ -279,8 +280,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) switch(reason) { case DLL_PROCESS_ATTACH: - IME_RegisterClasses(hinst); - ret = process_attach(); + ret = process_attach( hinst ); break; case DLL_THREAD_DETACH: thread_detach();

1 0

Matteo Bruni : wined3d: Fix NP2 surface repacking in surface_download_data.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 5649746b60af65248177309e1c998dff1aa9aef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5649746b60af65248177309e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 19 21:59:24 2013 +0200 wined3d: Fix NP2 surface repacking in surface_download_data. --- dlls/wined3d/surface.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a325ac0..83ff41f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2246,12 +2246,11 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data = mem; dst_data = surface->resource.allocatedMemory; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); - for (y = 1; y < surface->resource.height; ++y) + for (y = 0; y < surface->resource.height; ++y) { - /* skip the first row */ + memcpy(dst_data, src_data, dst_pitch); src_data += src_pitch; dst_data += dst_pitch; - memcpy(dst_data, src_data, dst_pitch); } HeapFree(GetProcessHeap(), 0, mem);

1 0

Matteo Bruni : d3d9/tests: Reset texture 0 to NULL at the end of texop_test ().
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 5ffabcdfff8a14256b202cd8e26187afe603c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffabcdfff8a14256b202cd8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 19 21:59:25 2013 +0200 d3d9/tests: Reset texture 0 to NULL at the end of texop_test(). --- dlls/d3d9/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dc84559..73f5066 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10179,8 +10179,9 @@ static void texop_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); } - if (texture) IDirect3DTexture9_Release(texture); - if (vertex_declaration) IDirect3DVertexDeclaration9_Release(vertex_declaration); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + IDirect3DTexture9_Release(texture); + IDirect3DVertexDeclaration9_Release(vertex_declaration); } static void yuv_color_test(IDirect3DDevice9 *device) {

1 0

Matteo Bruni : d3d9/tests: Skip unbound_sampler_test if cube or volume textures aren't supported.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: aeade16d62d94b941a8d7e48b5fb6f3897fcb84d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeade16d62d94b941a8d7e48b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 19 21:59:26 2013 +0200 d3d9/tests: Skip unbound_sampler_test if cube or volume textures aren't supported. --- dlls/d3d9/tests/visual.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 73f5066..ee15651 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12763,6 +12763,7 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) IDirect3DPixelShader9 *ps, *ps_cube, *ps_volume; IDirect3DSurface9 *rt, *old_rt; DWORD color; + D3DCAPS9 caps; static const DWORD ps_code[] = { @@ -12805,6 +12806,14 @@ static void unbound_sampler_test(IDirect3DDevice9 *device) { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f} }; + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) || !(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + { + skip("No cube / volume textures support, skipping the unbound sampler test.\n"); + return; + } + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTextureStage failed, %#x.\n", hr);

1 0

Stefan Dösinger : ddraw: SPECULARENABLE defaults to true in IDirect3DDevice2.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 05de3f8cee3758f87f66e1963d8d6a009e68e2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05de3f8cee3758f87f66e1963… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 20 14:00:00 2013 +0200 ddraw: SPECULARENABLE defaults to true in IDirect3DDevice2. --- dlls/ddraw/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8e86f55..7235949 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6728,6 +6728,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, d3d_device_update_depth_stencil(device)); if (version == 1) /* Color keying is initially enabled for version 1 devices. */ wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); + else if (version == 2) + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); return D3D_OK; }

1 0

Frédéric Delanoy : loader: Update French translation of wine manpage.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 15171d8d05a56eec0ec9cb72418afd7a6d164d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15171d8d05a56eec0ec9cb724… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 19 17:49:12 2013 +0200 loader: Update French translation of wine manpage. --- loader/wine.fr.man.in | 119 +++++++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15171d8d05a56eec0ec9c…

1 0