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

Dan Kegel : kernel32: Make SetThreadPriorityBoost return success.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 073d7212a765ec5c4eff3fbf0ebe553462892fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073d7212a765ec5c4eff3fbf0… Author: Dan Kegel <dank(a)kegel.com> Date: Mon May 27 17:08:05 2013 -0700 kernel32: Make SetThreadPriorityBoost return success. --- dlls/kernel32/tests/thread.c | 12 ++++++------ dlls/kernel32/thread.c | 10 +++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 55014f8..9be0484 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -713,22 +713,22 @@ static VOID test_thread_priority(void) 0,curthreadId); ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); if (access_thread!=NULL) { - obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); + todo_wine obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); todo_wine obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); ok(CloseHandle(access_thread),"Error Closing thread handle\n"); } } + rc = pSetThreadPriorityBoost(curthread,1); + ok( rc != 0, "error=%d\n",GetLastError()); todo_wine { - rc = pSetThreadPriorityBoost(curthread,1); - ok( rc != 0, "error=%d\n",GetLastError()); rc=pGetThreadPriorityBoost(curthread,&disabled); ok(rc!=0 && disabled==1, "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled); - - rc = pSetThreadPriorityBoost(curthread,0); - ok( rc != 0, "error=%d\n",GetLastError()); } + + rc = pSetThreadPriorityBoost(curthread,0); + ok( rc != 0, "error=%d\n",GetLastError()); rc=pGetThreadPriorityBoost(curthread,&disabled); ok(rc!=0 && disabled==0, "rc=%d error=%d disabled=%d\n",rc,GetLastError(),disabled); diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5702d6c..c82ef58 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -357,18 +357,14 @@ BOOL WINAPI GetThreadPriorityBoost( /********************************************************************** * SetThreadPriorityBoost [KERNEL32.@] Sets priority boost for thread. * - * Priority boost is not implemented. This function always returns - * FALSE and sets last error to ERROR_CALL_NOT_IMPLEMENTED - * - * RETURNS - * Always returns FALSE to indicate a failure + * Priority boost is not implemented, but we return TRUE + * anyway because some games crash otherwise. */ BOOL WINAPI SetThreadPriorityBoost( HANDLE hthread, /* [in] Handle to thread */ BOOL disable) /* [in] TRUE to disable priority boost */ { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; }

1 0

Henri Verbeet : wined3d: Use debug_d3dstate() in compile_state_table() as well.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: b5df8bd4f5a3b71a0ae300066ee1aaaeeefc94d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5df8bd4f5a3b71a0ae300066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:17 2013 +0200 wined3d: Use debug_d3dstate() in compile_state_table() as well. --- dlls/wined3d/state.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 46ab990..bad4166 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -6021,10 +6021,11 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ cur[i].state, handlers + 1); } - if(StateTable[cur[i].state].representative && - StateTable[cur[i].state].representative != cur[i].content.representative) { - FIXME("State %u has different representatives in different pipeline parts\n", - cur[i].state); + if (StateTable[cur[i].state].representative + && StateTable[cur[i].state].representative != cur[i].content.representative) + { + FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", + debug_d3dstate(cur[i].state), cur[i].state); } StateTable[cur[i].state].representative = cur[i].content.representative; }

1 0

Henri Verbeet : wined3d: Expose WINED3DVTXPCAPS_TEXGEN_SPHEREMAP.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 97b6299eaf882a5702fbbfe48fbc1adbeac4b927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6299eaf882a5702fbbfe48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:18 2013 +0200 wined3d: Expose WINED3DVTXPCAPS_TEXGEN_SPHEREMAP. Since we already implement it. Tweening will likely never work with fixed function GL. --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bad4166..cdccb47 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5658,13 +5658,13 @@ static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3 caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = gl_info->limits.blends; caps->max_vertex_blend_matrix_index = 0; - /* FIXME: Add D3DVTXPCAPS_TWEENING, D3DVTXPCAPS_TEXGEN_SPHEREMAP */ caps->vertex_processing_caps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS | WINED3DVTXPCAPS_MATERIALSOURCE7 | WINED3DVTXPCAPS_POSITIONALLIGHTS | WINED3DVTXPCAPS_LOCALVIEWER | WINED3DVTXPCAPS_VERTEXFOG - | WINED3DVTXPCAPS_TEXGEN; + | WINED3DVTXPCAPS_TEXGEN + | WINED3DVTXPCAPS_TEXGEN_SPHEREMAP; caps->fvf_caps = WINED3DFVFCAPS_PSIZE | 0x0008; /* 8 texture coords */ caps->max_user_clip_planes = gl_info->limits.clipplanes; caps->raster_caps = 0;

1 0

Henri Verbeet : wined3d: Just remove the D3DCMP_NOTEQUAL / D3DCMP_EQUAL FIXME in state_zfunc().
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 50a386451588615f449e7b3b944530ec3db90976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a386451588615f449e7b3b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:19 2013 +0200 wined3d: Just remove the D3DCMP_NOTEQUAL / D3DCMP_EQUAL FIXME in state_zfunc(). As far as I'm aware this just works, I'm not aware of any open issues related to it. --- dlls/wined3d/state.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cdccb47..05c49a5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -267,21 +267,6 @@ static void state_zfunc(struct wined3d_context *context, const struct wined3d_st if (!depth_func) return; - if (depth_func == GL_EQUAL || depth_func == GL_NOTEQUAL) - { - static BOOL once; - /* There are a few issues with this: First, our inability to - * select a proper Z depth, most of the time we're stuck with - * D24S8, even if the app selects D32 or D16. There seem to be - * some other precision problems which have to be debugged to - * make NOTEQUAL and EQUAL work properly. */ - if (!once) - { - once = TRUE; - FIXME("D3DCMP_NOTEQUAL and D3DCMP_EQUAL do not work correctly yet.\n"); - } - } - gl_info->gl_ops.gl.p_glDepthFunc(depth_func); checkGLcall("glDepthFunc"); }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMTEXTURE3.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 397cc3f42dab9764abbc0be1dbc926d23a3b058d URL: http://source.winehq.org/git/wine.git/?a=commit;h=397cc3f42dab9764abbc0be1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:20 2013 +0200 d3drm: Avoid LPDIRECT3DRMTEXTURE3. --- dlls/d3drm/d3drm.c | 22 +++++++++------------- dlls/d3drm/frame.c | 22 +++++++--------------- dlls/d3drm/meshbuilder.c | 6 +++--- include/d3drm.h | 5 +++-- include/d3drmobj.h | 18 +++++++++--------- 5 files changed, 31 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=397cc3f42dab9764abbc0…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMATERIAL.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 19a519e90a763b713faad84b463bdd78d03b485a URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a519e90a763b713faad84b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:21 2013 +0200 d3drm: Avoid LPDIRECT3DRMMATERIAL. --- dlls/d3drm/d3drm.c | 19 ++++++++++--------- dlls/d3drm/frame.c | 7 ++----- dlls/d3drm/meshbuilder.c | 46 ++++++++++++++++++++++++---------------------- dlls/d3drm/tests/d3drm.c | 2 +- include/d3drm.h | 4 ++-- include/d3drmobj.h | 16 ++++++++-------- 6 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19a519e90a763b713faad…

1 0

Hans Leidekker : explorer: Initial implementation of desktop launchers.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: e44f0c8f2de480679abde7883a5161ef9526ed81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44f0c8f2de480679abde7883… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 12:42:09 2013 +0200 explorer: Initial implementation of desktop launchers. --- programs/explorer/desktop.c | 312 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 311 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e44f0c8f2de480679abde…

1 0

Hans Leidekker : explorer: Watch the desktop folders for changes and update the launcher list accordingly .
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: d62e7f7b9b2cd32c6e9f55c2642303c40402ab8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62e7f7b9b2cd32c6e9f55c26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 12:42:50 2013 +0200 explorer: Watch the desktop folders for changes and update the launcher list accordingly. --- programs/explorer/desktop.c | 133 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index cf0de3c..e426c1a 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -252,6 +252,36 @@ error: return FALSE; } +static void free_launcher( struct launcher *launcher ) +{ + DestroyIcon( launcher->icon ); + HeapFree( GetProcessHeap(), 0, launcher->path ); + HeapFree( GetProcessHeap(), 0, launcher->title ); + HeapFree( GetProcessHeap(), 0, launcher ); +} + +static BOOL remove_launcher( const WCHAR *folder, const WCHAR *filename, int len_filename ) +{ + UINT i; + WCHAR *path; + BOOL ret = FALSE; + + if (!(path = append_path( folder, filename, len_filename ))) return FALSE; + for (i = 0; i < nb_launchers; i++) + { + if (!strcmpiW( launchers[i]->path, path )) + { + free_launcher( launchers[i] ); + if (--nb_launchers) + memmove( &launchers[i], &launchers[i + 1], sizeof(launchers[i]) * (nb_launchers - i) ); + ret = TRUE; + break; + } + } + HeapFree( GetProcessHeap(), 0, path ); + return ret; +} + static BOOL get_icon_text_metrics( HWND hwnd, TEXTMETRICW *tm ) { BOOL ret; @@ -268,6 +298,107 @@ static BOOL get_icon_text_metrics( HWND hwnd, TEXTMETRICW *tm ) return ret; } +static BOOL process_changes( const WCHAR *folder, char *buf ) +{ + FILE_NOTIFY_INFORMATION *info = (FILE_NOTIFY_INFORMATION *)buf; + BOOL ret = FALSE; + + for (;;) + { + switch (info->Action) + { + case FILE_ACTION_ADDED: + case FILE_ACTION_RENAMED_NEW_NAME: + if (add_launcher( folder, info->FileName, info->FileNameLength / sizeof(WCHAR) )) + ret = TRUE; + break; + + case FILE_ACTION_REMOVED: + case FILE_ACTION_RENAMED_OLD_NAME: + if (remove_launcher( folder, info->FileName, info->FileNameLength / sizeof(WCHAR) )) + ret = TRUE; + break; + + default: + WARN( "unexpected action %u\n", info->Action ); + break; + } + if (!info->NextEntryOffset) break; + info = (FILE_NOTIFY_INFORMATION *)((char *)info + info->NextEntryOffset); + } + return ret; +} + +static DWORD CALLBACK watch_desktop_folders( LPVOID param ) +{ + HWND hwnd = param; + HRESULT init = CoInitialize( NULL ); + HANDLE dir0, dir1, events[2]; + OVERLAPPED ovl0, ovl1; + char *buf0 = NULL, *buf1 = NULL; + DWORD count, size = 4096, error = ERROR_OUTOFMEMORY; + BOOL ret, redraw; + + dir0 = CreateFileW( desktop_folder, FILE_LIST_DIRECTORY|SYNCHRONIZE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS|FILE_FLAG_OVERLAPPED, NULL ); + if (dir0 == INVALID_HANDLE_VALUE) return GetLastError(); + dir1 = CreateFileW( desktop_folder_public, FILE_LIST_DIRECTORY|SYNCHRONIZE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS|FILE_FLAG_OVERLAPPED, NULL ); + if (dir1 == INVALID_HANDLE_VALUE) + { + CloseHandle( dir0 ); + return GetLastError(); + } + if (!(ovl0.hEvent = events[0] = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; + if (!(ovl1.hEvent = events[1] = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; + if (!(buf0 = HeapAlloc( GetProcessHeap(), 0, size ))) goto error; + if (!(buf1 = HeapAlloc( GetProcessHeap(), 0, size ))) goto error; + + for (;;) + { + ret = ReadDirectoryChangesW( dir0, buf0, size, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ovl0, NULL ); + if (!ret) + { + error = GetLastError(); + goto error; + } + ret = ReadDirectoryChangesW( dir1, buf1, size, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ovl1, NULL ); + if (!ret) + { + error = GetLastError(); + goto error; + } + + redraw = FALSE; + switch ((error = WaitForMultipleObjects( 2, events, FALSE, INFINITE ))) + { + case WAIT_OBJECT_0: + if (!GetOverlappedResult( dir0, &ovl0, &count, FALSE ) || !count) break; + if (process_changes( desktop_folder, buf0 )) redraw = TRUE; + break; + + case WAIT_OBJECT_0 + 1: + if (!GetOverlappedResult( dir1, &ovl1, &count, FALSE ) || !count) break; + if (process_changes( desktop_folder_public, buf1 )) redraw = TRUE; + break; + + default: + goto error; + } + if (redraw) InvalidateRect( hwnd, NULL, TRUE ); + } + +error: + CloseHandle( dir0 ); + CloseHandle( dir1 ); + CloseHandle( events[0] ); + CloseHandle( events[1] ); + HeapFree( GetProcessHeap(), 0, buf0 ); + HeapFree( GetProcessHeap(), 0, buf1 ); + if (SUCCEEDED( init )) CoUninitialize(); + return error; +} + static void add_folder( const WCHAR *folder ) { static const WCHAR lnkW[] = {'\\','*','.','l','n','k',0}; @@ -334,6 +465,8 @@ static void initialize_launchers( HWND hwnd ) add_folder( desktop_folder ); add_folder( desktop_folder_public ); if (SUCCEEDED( init )) CoUninitialize(); + + CreateThread( NULL, 0, watch_desktop_folders, hwnd, 0, NULL ); } }

1 0

Fabian Müntefering : dwrite: Added missing initialization of stretch value.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 6bab3afc34a5579cfd81092696b955d9caf6d5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bab3afc34a5579cfd8109269… Author: Fabian Müntefering <Cookiezzz97(a)gmx.de> Date: Mon May 27 18:41:24 2013 +0200 dwrite: Added missing initialization of stretch value. --- dlls/dwrite/layout.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d9e4a99..b77f29f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1021,6 +1021,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.weight = weight; This->format.style = style; This->format.size = size; + This->format.stretch = stretch; if (collection) {

1 0

Aric Stewart : gdi32: Fix Tategaki rotation.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: cf891b04a087bcbc713e704c1adbf6b88243e996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf891b04a087bcbc713e704c1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 24 11:00:25 2013 -0500 gdi32: Fix Tategaki rotation. Tategaki does not ignore orientation rotation, instead it always rotates affect glyphs by 90 degrees inside their cell. --- dlls/gdi32/freetype.c | 57 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e972c98..459f49a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5923,6 +5923,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; + FT_Matrix transMatTategaki; BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); UINT original_index; @@ -6015,17 +6016,43 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* Rotation transform */ transMatUnrotated = transMat; - if(font->orientation && !tategaki) { + transMatTategaki = transMat; + if(font->orientation || tategaki) { FT_Matrix rotationMat; + FT_Matrix taterotationMat; FT_Vector vecAngle; - angle = FT_FixedFromFloat((double)font->orientation / 10.0); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); + + double orient = font->orientation / 10.0; + double tate_orient = 0.f; + + if (tategaki) + tate_orient = ((font->orientation+900)%3600)/10.0; + else + tate_orient = font->orientation/10.0; + + if (orient) + { + angle = FT_FixedFromFloat(orient); + pFT_Vector_Unit(&vecAngle, angle); + rotationMat.xx = vecAngle.x; + rotationMat.xy = -vecAngle.y; + rotationMat.yx = -rotationMat.xy; + rotationMat.yy = rotationMat.xx; + + pFT_Matrix_Multiply(&rotationMat, &transMat); + } + + if (tate_orient) + { + angle = FT_FixedFromFloat(tate_orient); + pFT_Vector_Unit(&vecAngle, angle); + taterotationMat.xx = vecAngle.x; + taterotationMat.xy = -vecAngle.y; + taterotationMat.yx = -taterotationMat.xy; + taterotationMat.yy = taterotationMat.xx; + pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); + } + needsTransform = TRUE; } @@ -6039,6 +6066,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); pFT_Matrix_Multiply(&worldMat, &transMat); pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); + pFT_Matrix_Multiply(&worldMat, &transMatTategaki); needsTransform = TRUE; } @@ -6052,6 +6080,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); pFT_Matrix_Multiply(&extraMat, &transMat); pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); + pFT_Matrix_Multiply(&extraMat, &transMatTategaki); needsTransform = TRUE; } @@ -6117,7 +6146,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiBearingX + xc * metrics.width; vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); - pFT_Vector_Transform(&vec, &transMat); + pFT_Vector_Transform(&vec, &transMatTategaki); if(xc == 0 && yc == 0) { left = right = vec.x; top = bottom = vec.y; @@ -6224,7 +6253,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); + pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -6280,7 +6309,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); + pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -6385,7 +6414,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); if ( needsTransform ) - pFT_Outline_Transform (&ft_face->glyph->outline, &transMat); + pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); if ( pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, lcdfilter ); @@ -6484,7 +6513,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) { - pFT_Outline_Transform(outline, &transMat); + pFT_Outline_Transform(outline, &transMatTategaki); } for(contour = 0; contour < outline->n_contours; contour++) {

1 0