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

Rico Schüller : d3dx9: Add ID3DXBuffer test.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 670f0efe5cb3f58133396b04bfdc3383ac109e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670f0efe5cb3f58133396b04b… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:13 2011 +0200 d3dx9: Add ID3DXBuffer test. --- dlls/d3dx9_36/tests/core.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b1379ef..e6e641c 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -62,6 +62,35 @@ static inline void check_mat(D3DXMATRIX got, D3DXMATRIX exp) U(exp).m[3][0],U(exp).m[3][1],U(exp).m[3][2],U(exp).m[3][3]); } +static void test_ID3DXBuffer(void) +{ + ID3DXBuffer *buffer; + HRESULT hr; + ULONG count; + DWORD size; + + hr = D3DXCreateBuffer(10, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateBuffer failed, got %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateBuffer(0, &buffer); + ok(hr == D3D_OK, "D3DXCreateBuffer failed, got %#x, expected %#x\n", hr, D3D_OK); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "GetBufferSize failed, got %u, expected %u\n", size, 0); + + count = ID3DXBuffer_Release(buffer); + ok(!count, "ID3DBuffer has %u references left\n", count); + + hr = D3DXCreateBuffer(3, &buffer); + ok(hr == D3D_OK, "D3DXCreateBuffer failed, got %#x, expected %#x\n", hr, D3D_OK); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 3, "GetBufferSize failed, got %u, expected %u\n", size, 3); + + count = ID3DXBuffer_Release(buffer); + ok(!count, "ID3DBuffer has %u references left\n", count); +} + static void test_ID3DXSprite(IDirect3DDevice9 *device) { ID3DXSprite *sprite; @@ -448,6 +477,7 @@ START_TEST(core) return; } + test_ID3DXBuffer(); test_ID3DXSprite(device); test_ID3DXFont(device);

1 0

Rico Schüller : d3dcompiler: Remove type cast in D3DCreateBlob().
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: c4530c56d16d3de6eb663d33f417b577b056dfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4530c56d16d3de6eb663d33f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:16 2011 +0200 d3dcompiler: Remove type cast in D3DCreateBlob(). --- dlls/d3dcompiler_43/blob.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 4a5ff79..86fb791 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -161,9 +161,9 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) return hr; } - *blob = (ID3DBlob *)object; + *blob = &object->ID3DBlob_iface; - TRACE("Created ID3DBlob %p\n", object); + TRACE("Created ID3DBlob %p\n", *blob); return S_OK; }

1 0

Rico Schüller : d3dcompiler: Move blob and strip functions to blob.c.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 5c999d650fdab6bf335eacac0f2469f16a74fead URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c999d650fdab6bf335eacac0… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:19 2011 +0200 d3dcompiler: Move blob and strip functions to blob.c. --- dlls/d3dcompiler_43/blob.c | 47 +++++++++++++++++++++++++++- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 46 ---------------------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 -- 3 files changed, 45 insertions(+), 52 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 86fb791..6900e87 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -220,7 +220,7 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) return add; } -HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) +static HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) { struct dxbc src_dxbc, dst_dxbc; HRESULT hr; @@ -361,7 +361,7 @@ static BOOL check_blob_strip(DWORD tag, UINT flags) return add; } -HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) +static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) { struct dxbc src_dxbc, dst_dxbc; HRESULT hr; @@ -423,3 +423,46 @@ HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, return hr; } + +HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data, + data_size, debug_d3dcompiler_d3d_blob_part(part), flags, blob); + + return d3dcompiler_get_blob_part(data, data_size, part, flags, blob); +} + +HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); +} + +HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); +} + +HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); +} + +HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) +{ + TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + + return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); +} + +HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob) +{ + TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + + return d3dcompiler_strip_shader(data, data_size, flags, blob); +} diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 51314e8..db2f587 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -25,12 +25,9 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" #include "d3dcompiler_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); - BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch (reason) @@ -45,46 +42,3 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } - -HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) -{ - TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data, - data_size, debug_d3dcompiler_d3d_blob_part(part), flags, blob); - - return d3dcompiler_get_blob_part(data, data_size, part, flags, blob); -} - -HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) -{ - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); - - return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); -} - -HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) -{ - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); - - return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); -} - -HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) -{ - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); - - return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); -} - -HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) -{ - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); - - return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); -} - -HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob) -{ - TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); - - return d3dcompiler_strip_shader(data, data_size, flags, blob); -} diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3ee88db..1af84f8 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -44,10 +44,6 @@ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN; const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) DECLSPEC_HIDDEN; -/* blob handling */ -HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; -HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; - /* Shader assembler definitions */ typedef enum _shader_type { ST_VERTEX,

1 0

Rico Schüller : d3dcompiler: Make some variables static.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 96aa08ecfd6fb5510561dfc2493d593bc4d32800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96aa08ecfd6fb5510561dfc24… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:24 2011 +0200 d3dcompiler: Make some variables static. --- dlls/d3dcompiler_43/reflection.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4599535..ea01e24 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -141,9 +141,9 @@ struct d3dcompiler_shader_reflection static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3dcompiler_shader_reflection *reflection, const char *data, DWORD offset); -const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; -const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; -const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; +static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl; +static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl; /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; @@ -687,7 +687,7 @@ static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( return 0; } -const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = +static const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = { /* IUnknown methods */ d3dcompiler_shader_reflection_QueryInterface, @@ -795,7 +795,7 @@ static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_ref return &null_variable.ID3D11ShaderReflectionVariable_iface; } -const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = +static const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = { /* ID3D11ShaderReflectionConstantBuffer methods */ d3dcompiler_shader_reflection_constant_buffer_GetDesc, @@ -866,7 +866,7 @@ static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfac return 0; } -const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = +static const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = { /* ID3D11ShaderReflectionVariable methods */ d3dcompiler_shader_reflection_variable_GetDesc, @@ -1041,7 +1041,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_type_ImplementsIn return E_NOTIMPL; } -const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl = +static const struct ID3D11ShaderReflectionTypeVtbl d3dcompiler_shader_reflection_type_vtbl = { /* ID3D11ShaderReflectionType methods */ d3dcompiler_shader_reflection_type_GetDesc,

1 0

Akihiro Sagawa : gdi32/tests: Add a test for a charset enumeration order.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: a9c9970d9ba621dd5b21827b0a82b98ff0163eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c9970d9ba621dd5b21827b0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 1 21:19:52 2011 +0900 gdi32/tests: Add a test for a charset enumeration order. --- dlls/gdi32/tests/font.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a9a8755..b0f2e9f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2169,6 +2169,62 @@ else ReleaseDC(0, hdc); } +static INT CALLBACK enum_font_data_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efd = (struct enum_font_data *)lParam; + + if (type != TRUETYPE_FONTTYPE) return 1; + + if (efd->total < MAX_ENUM_FONTS) + efd->lf[efd->total++] = *lf; + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + +static void test_EnumFontFamiliesEx_default_charset(void) +{ + struct enum_font_data efd; + LOGFONT gui_font, enum_font; + DWORD ret; + HDC hdc; + + ret = GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(gui_font), &gui_font); + ok(ret, "GetObject failed.\n"); + if (!ret) + return; + + efd.total = 0; + + hdc = GetDC(0); + memset(&enum_font, 0, sizeof(enum_font)); + lstrcpy(enum_font.lfFaceName, gui_font.lfFaceName); + enum_font.lfCharSet = DEFAULT_CHARSET; + EnumFontFamiliesEx(hdc, &enum_font, enum_font_data_proc, (LPARAM)&efd, 0); + ReleaseDC(0, hdc); + + if (efd.total == 0) { + skip("'%s' is not found or not a TrueType font.\n", gui_font.lfFaceName); + return; + } + trace("'%s' has %d charsets.\n", gui_font.lfFaceName, efd.total); + + if (gui_font.lfCharSet != ANSI_CHARSET) { + todo_wine + ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); + } + else { + ok(efd.lf[0].lfCharSet == gui_font.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, gui_font.lfCharSet); + } + + return; +} + static void test_negative_width(HDC hdc, const LOGFONTA *lf) { HFONT hfont, hfont_prev; @@ -3615,6 +3671,7 @@ START_TEST(font) } else skip("Arial Black or Symbol/Wingdings is not installed\n"); + test_EnumFontFamiliesEx_default_charset(); test_GetTextMetrics(); test_GdiRealizationInfo(); test_GetTextFace();

1 0

Akihiro Sagawa : gdi32: Move charset enumeration to helper function.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 6a404a3b5881f0e14cb7022d247fe89f1196a6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a404a3b5881f0e14cb7022d2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Apr 1 21:19:54 2011 +0900 gdi32: Move charset enumeration to helper function. --- dlls/gdi32/freetype.c | 125 ++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 78 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4582216..31fe4f2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4101,6 +4101,51 @@ static BOOL face_matches(Face *face, const LOGFONTW *lf) return !strcmpiW(lf->lfFaceName, full_family_name); } +static BOOL enum_face_charsets(Face *face, FONTENUMPROCW proc, LPARAM lparam) +{ + ENUMLOGFONTEXW elf; + NEWTEXTMETRICEXW ntm; + DWORD type = 0; + FONTSIGNATURE fs; + CHARSETINFO csi; + int i; + + GetEnumStructs(face, &elf, &ntm, &type); + for(i = 0; i < 32; i++) { + if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ + elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; + strcpyW(elf.elfScript, OEM_DOSW); + i = 32; /* break out of loop */ + } else if(!(face->fs.fsCsb[0] & (1L << i))) + continue; + else { + fs.fsCsb[0] = 1L << i; + fs.fsCsb[1] = 0; + if(!TranslateCharsetInfo(fs.fsCsb, &csi, TCI_SRCFONTSIG)) + csi.ciCharset = DEFAULT_CHARSET; + if(i == 31) csi.ciCharset = SYMBOL_CHARSET; + if(csi.ciCharset != DEFAULT_CHARSET) { + elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = csi.ciCharset; + if(ElfScriptsW[i]) + strcpyW(elf.elfScript, ElfScriptsW[i]); + else + FIXME("Unknown elfscript for bit %d\n", i); + } + } + TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", + debugstr_w(elf.elfLogFont.lfFaceName), + debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), + csi.ciCharset, type, debugstr_w(elf.elfScript), + elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, + ntm.ntmTm.ntmFlags); + /* release section before callback (FIXME) */ + LeaveCriticalSection( &freetype_cs ); + if (!proc(&elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam)) return FALSE; + EnterCriticalSection( &freetype_cs ); + } + return TRUE; +} + /************************************************************* * WineEngEnumFonts * @@ -4110,13 +4155,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) Family *family; Face *face; struct list *family_elem_ptr, *face_elem_ptr; - ENUMLOGFONTEXW elf; - NEWTEXTMETRICEXW ntm; - DWORD type; - FONTSIGNATURE fs; - CHARSETINFO csi; LOGFONTW lf; - int i; if (!plf) { @@ -4147,44 +4186,8 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) if(family_matches(family, plf)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!face_matches(face, plf)) continue; - - GetEnumStructs(face, &elf, &ntm, &type); - for(i = 0; i < 32; i++) { - if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - strcpyW(elf.elfScript, OEM_DOSW); - i = 32; /* break out of loop */ - } else if(!(face->fs.fsCsb[0] & (1L << i))) - continue; - else { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if(!TranslateCharsetInfo(fs.fsCsb, &csi, - TCI_SRCFONTSIG)) - csi.ciCharset = DEFAULT_CHARSET; - if(i == 31) csi.ciCharset = SYMBOL_CHARSET; - if(csi.ciCharset != DEFAULT_CHARSET) { - elf.elfLogFont.lfCharSet = - ntm.ntmTm.tmCharSet = csi.ciCharset; - if(ElfScriptsW[i]) - strcpyW(elf.elfScript, ElfScriptsW[i]); - else - FIXME("Unknown elfscript for bit %d\n", i); - } - } - TRACE("enuming face %s full %s style %s charset %d type %d script %s it %d weight %d ntmflags %08x\n", - debugstr_w(elf.elfLogFont.lfFaceName), - debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - csi.ciCharset, type, debugstr_w(elf.elfScript), - elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, - ntm.ntmTm.ntmFlags); - /* release section before callback (FIXME) */ - LeaveCriticalSection( &freetype_cs ); - if (!proc(&elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam)) return 0; - EnterCriticalSection( &freetype_cs ); - } + if (!enum_face_charsets(face, proc, lparam)) return 0; } } } @@ -4193,41 +4196,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) family = LIST_ENTRY(family_elem_ptr, Family, entry); face_elem_ptr = list_head(&family->faces); face = LIST_ENTRY(face_elem_ptr, Face, entry); - GetEnumStructs(face, &elf, &ntm, &type); - for(i = 0; i < 32; i++) { - if(!face->scalable && face->fs.fsCsb[0] == 0) { /* OEM bitmap */ - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = OEM_CHARSET; - strcpyW(elf.elfScript, OEM_DOSW); - i = 32; /* break out of loop */ - } else if(!(face->fs.fsCsb[0] & (1L << i))) - continue; - else { - fs.fsCsb[0] = 1L << i; - fs.fsCsb[1] = 0; - if(!TranslateCharsetInfo(fs.fsCsb, &csi, - TCI_SRCFONTSIG)) - csi.ciCharset = DEFAULT_CHARSET; - if(i == 31) csi.ciCharset = SYMBOL_CHARSET; - if(csi.ciCharset != DEFAULT_CHARSET) { - elf.elfLogFont.lfCharSet = ntm.ntmTm.tmCharSet = - csi.ciCharset; - if(ElfScriptsW[i]) - strcpyW(elf.elfScript, ElfScriptsW[i]); - else - FIXME("Unknown elfscript for bit %d\n", i); - } - } - TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", - debugstr_w(elf.elfLogFont.lfFaceName), - debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), - csi.ciCharset, type, debugstr_w(elf.elfScript), - elf.elfLogFont.lfItalic, elf.elfLogFont.lfWeight, - ntm.ntmTm.ntmFlags); - /* release section before callback (FIXME) */ - LeaveCriticalSection( &freetype_cs ); - if (!proc(&elf.elfLogFont, (TEXTMETRICW *)&ntm, type, lparam)) return 0; - EnterCriticalSection( &freetype_cs ); - } + if (!enum_face_charsets(face, proc, lparam)) return 0; } } LeaveCriticalSection( &freetype_cs );

1 0

Andrew Nguyen : dxdiagn: Add paged memory display string properties to the DxDiag_SystemInfo container .
by Alexandre Julliard 04 Apr '11

04 Apr '11

1 0

Andrew Nguyen : dxdiagn: Add operating system string properties to the DxDiag_SystemInfo container.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 097a31bb215de0350065415f7d12bc5479a9091d URL: http://source.winehq.org/git/wine.git/?a=commit;h=097a31bb215de0350065415f7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 3 20:56:07 2011 -0500 dxdiagn: Add operating system string properties to the DxDiag_SystemInfo container. --- dlls/dxdiagn/provider.c | 32 ++++++++++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 12 ++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1252272..459f8e9 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -511,6 +511,34 @@ static HRESULT fill_datetime_information(IDxDiagContainerImpl_Container *node) return S_OK; } +static HRESULT fill_os_string_information(IDxDiagContainerImpl_Container *node, OSVERSIONINFOW *info) +{ + static const WCHAR winxpW[] = {'W','i','n','d','o','w','s',' ','X','P',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; + static const WCHAR szOSLocalized[] = {'s','z','O','S','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szOSExLongLocalized[] = {'s','z','O','S','E','x','L','o','n','g','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szOSEnglish[] = {'s','z','O','S','E','n','g','l','i','s','h',0}; + static const WCHAR szOSExEnglish[] = {'s','z','O','S','E','x','E','n','g','l','i','s','h',0}; + static const WCHAR szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0}; + + static const WCHAR *prop_list[] = {szOSLocalized, szOSExLocalized, szOSExLongLocalized, + szOSEnglish, szOSExEnglish, szOSExLongEnglish}; + + size_t i; + HRESULT hr; + + /* FIXME: OS detection should be performed, and localized OS strings + * should contain translated versions of the "build" phrase. */ + for (i = 0; i < sizeof(prop_list)/sizeof(prop_list[0]); i++) + { + hr = add_bstr_property(node, prop_list[i], winxpW); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; @@ -665,6 +693,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = fill_os_string_information(node, &info); + if (FAILED(hr)) + return hr; + return S_OK; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 2b8d6f6..6de80e7 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -791,6 +791,12 @@ static void test_DxDiag_SystemInfo(void) static const WCHAR szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; static const WCHAR szPageFileLocalized[] = {'s','z','P','a','g','e','F','i','l','e','L','o','c','a','l','i','z','e','d',0}; static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',0}; + static const WCHAR szOSLocalized[] = {'s','z','O','S','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szOSExLongLocalized[] = {'s','z','O','S','E','x','L','o','n','g','L','o','c','a','l','i','z','e','d',0}; + static const WCHAR szOSEnglish[] = {'s','z','O','S','E','n','g','l','i','s','h',0}; + static const WCHAR szOSExEnglish[] = {'s','z','O','S','E','x','E','n','g','l','i','s','h',0}; + static const WCHAR szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0}; static const struct { @@ -824,6 +830,12 @@ static void test_DxDiag_SystemInfo(void) {szPhysicalMemoryEnglish, VT_BSTR}, {szPageFileLocalized, VT_BSTR}, {szPageFileEnglish, VT_BSTR}, + {szOSLocalized, VT_BSTR}, + {szOSExLocalized, VT_BSTR}, + {szOSExLongLocalized, VT_BSTR}, + {szOSEnglish, VT_BSTR}, + {szOSExEnglish, VT_BSTR}, + {szOSExLongEnglish, VT_BSTR}, }; HRESULT hr;

1 0

David Hedberg : comdlg32: Fetch rectangle from the correct control.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 0efd552b5be6d0a0bd0fde93f13a65b9b2ac5074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efd552b5be6d0a0bd0fde93f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Apr 4 11:01:50 2011 +0200 comdlg32: Fetch rectangle from the correct control. --- dlls/comdlg32/itemdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 35910c3..f447828 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -354,6 +354,7 @@ static SIZE update_layout(FileDialogImpl *This) } /* Open/Save button */ + hwnd = GetDlgItem(This->dlg_hwnd, IDOK); if(hwnd) { int open_width, open_height;

1 0

David Hedberg : comdlg32: Add support for customizing control labels in the item dialog.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 231ca429ee7475ba48b97564d2c5aeb3b03d69ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=231ca429ee7475ba48b97564d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Apr 4 11:01:51 2011 +0200 comdlg32: Add support for customizing control labels in the item dialog. --- dlls/comdlg32/itemdlg.c | 113 ++++++++++++++++++++++++++++++++++++++--- dlls/comdlg32/tests/itemdlg.c | 15 ------ 2 files changed, 105 insertions(+), 23 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index f447828..51767a7 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -86,6 +86,10 @@ typedef struct FileDialogImpl { DWORD ebevents_cookie; LPWSTR set_filename; + LPWSTR custom_title; + LPWSTR custom_okbutton; + LPWSTR custom_cancelbutton; + LPWSTR custom_filenamelabel; } FileDialogImpl; /************************************************************************** @@ -307,6 +311,36 @@ static HRESULT on_default_action(FileDialogImpl *This) } /************************************************************************** + * Control functions. + */ +static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width) +{ + LPWSTR text; + UINT len, final_width; + SIZE size; + RECT rc; + HDC hdc; + + TRACE("\n"); + + len = SendMessageW(hctrl, WM_GETTEXTLENGTH, 0, 0); + text = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); + if(!text) return; + SendMessageW(hctrl, WM_GETTEXT, len+1, (LPARAM)text); + + hdc = GetDC(hctrl); + GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); + ReleaseDC(hctrl, hdc); + + GetWindowRect(hctrl, &rc); + final_width = min(max(size.cx, min_width) + 4, max_width); + SetWindowPos(hctrl, NULL, 0, 0, final_width, rc.bottom - rc.top, + SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); + + HeapFree(GetProcessHeap(), 0, text); +} + +/************************************************************************** * Window related functions. */ static SIZE update_layout(FileDialogImpl *This) @@ -557,6 +591,34 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); } +static void update_control_text(FileDialogImpl *This) +{ + HWND hitem; + if(This->custom_title) + SetWindowTextW(This->dlg_hwnd, This->custom_title); + + if(This->custom_okbutton && + (hitem = GetDlgItem(This->dlg_hwnd, IDOK))) + { + SetWindowTextW(hitem, This->custom_okbutton); + ctrl_resize(hitem, 50, 250); + } + + if(This->custom_cancelbutton && + (hitem = GetDlgItem(This->dlg_hwnd, IDCANCEL))) + { + SetWindowTextW(hitem, This->custom_cancelbutton); + ctrl_resize(hitem, 50, 250); + } + + if(This->custom_filenamelabel && + (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAMESTATIC))) + { + SetWindowTextW(hitem, This->custom_filenamelabel); + ctrl_resize(hitem, 50, 250); + } +} + static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) { FileDialogImpl *This = (FileDialogImpl*)lParam; @@ -592,6 +654,7 @@ static LRESULT on_wm_initdialog(HWND hwnd, LPARAM lParam) init_explorerbrowser(This); init_toolbar(This, hwnd); + update_control_text(This); update_layout(This); return TRUE; @@ -822,6 +885,10 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface) if(This->psia_results) IShellItemArray_Release(This->psia_results); LocalFree(This->set_filename); + LocalFree(This->custom_title); + LocalFree(This->custom_okbutton); + LocalFree(This->custom_cancelbutton); + LocalFree(This->custom_filenamelabel); HeapFree(GetProcessHeap(), 0, This); } @@ -1067,22 +1134,39 @@ static HRESULT WINAPI IFileDialog2_fnGetFileName(IFileDialog2 *iface, LPWSTR *ps static HRESULT WINAPI IFileDialog2_fnSetTitle(IFileDialog2 *iface, LPCWSTR pszTitle) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, pszTitle); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, pszTitle); + + LocalFree(This->custom_title); + This->custom_title = StrDupW(pszTitle); + update_control_text(This); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetOkButtonLabel(IFileDialog2 *iface, LPCWSTR pszText) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, pszText); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, pszText); + + LocalFree(This->custom_okbutton); + This->custom_okbutton = StrDupW(pszText); + update_control_text(This); + update_layout(This); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetFileNameLabel(IFileDialog2 *iface, LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, pszLabel); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, pszLabel); + + LocalFree(This->custom_filenamelabel); + This->custom_filenamelabel = StrDupW(pszLabel); + update_control_text(This); + update_layout(This); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnGetResult(IFileDialog2 *iface, IShellItem **ppsi) @@ -1162,8 +1246,14 @@ static HRESULT WINAPI IFileDialog2_fnSetFilter(IFileDialog2 *iface, IShellItemFi static HRESULT WINAPI IFileDialog2_fnSetCancelButtonLabel(IFileDialog2 *iface, LPCWSTR pszLabel) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%s)\n", This, debugstr_w(pszLabel)); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, pszLabel); + + LocalFree(This->custom_cancelbutton); + This->custom_cancelbutton = StrDupW(pszLabel); + update_control_text(This); + update_layout(This); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetNavigationRoot(IFileDialog2 *iface, IShellItem *psi) @@ -2057,12 +2147,18 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->dlg_type = ITEMDLG_TYPE_OPEN; fdimpl->u.IFileOpenDialog_iface.lpVtbl = &vt_IFileOpenDialog; fdimpl->options = FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR; + fdimpl->custom_title = fdimpl->custom_okbutton = NULL; } else { + WCHAR buf[16]; fdimpl->dlg_type = ITEMDLG_TYPE_SAVE; fdimpl->u.IFileSaveDialog_iface.lpVtbl = &vt_IFileSaveDialog; fdimpl->options = FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR; + + LoadStringW(COMDLG32_hInstance, IDS_SAVE, buf, sizeof(buf)/sizeof(WCHAR)); + fdimpl->custom_title = StrDupW(buf); + fdimpl->custom_okbutton = StrDupW(buf); } fdimpl->filterspecs = NULL; @@ -2079,6 +2175,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->peb = NULL; fdimpl->set_filename = NULL; + fdimpl->custom_cancelbutton = fdimpl->custom_filenamelabel = NULL; /* FIXME: The default folder setting should be restored for the * application if it was previously set. */ diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index e14bfaa..3653014 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -566,8 +566,6 @@ static void test_basics(void) CoTaskMemFree(filename); /* SetFileNameLabel */ - todo_wine - { hr = IFileOpenDialog_SetFileNameLabel(pfod, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_SetFileNameLabel(pfod, null); @@ -581,7 +579,6 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_SetFileNameLabel(pfsd, txt); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* Close */ hr = IFileOpenDialog_Close(pfod, S_FALSE); @@ -590,8 +587,6 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); /* SetOkButtonLabel */ - todo_wine - { hr = IFileOpenDialog_SetOkButtonLabel(pfod, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_SetOkButtonLabel(pfod, null); @@ -604,11 +599,8 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_SetOkButtonLabel(pfsd, txt); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* SetTitle */ - todo_wine - { hr = IFileOpenDialog_SetTitle(pfod, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileOpenDialog_SetTitle(pfod, null); @@ -621,7 +613,6 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_SetTitle(pfsd, txt); ok(hr == S_OK, "got 0x%08x\n", hr); - } /** IFileOpenDialog specific **/ @@ -699,15 +690,12 @@ static void test_basics(void) if(SUCCEEDED(hr)) { /* SetCancelButtonLabel */ - todo_wine - { hr = IFileDialog2_SetOkButtonLabel(pfd2, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileDialog2_SetOkButtonLabel(pfd2, null); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileDialog2_SetOkButtonLabel(pfd2, txt); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* SetNavigationRoot */ todo_wine @@ -726,15 +714,12 @@ static void test_basics(void) if(SUCCEEDED(hr)) { /* SetCancelButtonLabel */ - todo_wine - { hr = IFileDialog2_SetOkButtonLabel(pfd2, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileDialog2_SetOkButtonLabel(pfd2, null); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileDialog2_SetOkButtonLabel(pfd2, txt); ok(hr == S_OK, "got 0x%08x\n", hr); - } /* SetNavigationRoot */ todo_wine

1 0