wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

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

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

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: 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 : 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 : d3dx9: Add argument check to D3DXCreateBuffer().
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 1fcce55894c6a79e2f85def1875784a4f4baa40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcce55894c6a79e2f85def18… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:11 2011 +0200 d3dx9: Add argument check to D3DXCreateBuffer(). --- dlls/d3dx9_36/core.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 06a8305..8947970 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -137,6 +137,12 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, LPD3DXBUFFER *buffer) struct ID3DXBufferImpl *object; HRESULT hr; + if (!buffer) + { + WARN("Invalid buffer specified.\n"); + return D3DERR_INVALIDCALL; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) {

1 0

Rico Schüller : d3dcompiler: Move D3DCreateBlob() to blob.c.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 4d543607650a34c341a199bf6684980a8073aeac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d543607650a34c341a199bf6… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Apr 1 15:00:04 2011 +0200 d3dcompiler: Move D3DCreateBlob() to blob.c. --- dlls/d3dcompiler_43/blob.c | 46 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 35 ---------------------- dlls/d3dcompiler_43/d3dcompiler_private.h | 12 ------- 3 files changed, 45 insertions(+), 48 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 995ac41..4a5ff79 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -26,6 +26,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +struct d3dcompiler_blob +{ + ID3DBlob ID3DBlob_iface; + LONG refcount; + + SIZE_T size; + void *data; +}; + static inline struct d3dcompiler_blob *impl_from_ID3DBlob(ID3DBlob *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_blob, ID3DBlob_iface); @@ -108,7 +117,7 @@ static const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl = d3dcompiler_blob_GetBufferSize, }; -HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) +static HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) { blob->ID3DBlob_iface.lpVtbl = &d3dcompiler_blob_vtbl; blob->refcount = 1; @@ -124,6 +133,41 @@ HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) return S_OK; } +HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) +{ + struct d3dcompiler_blob *object; + HRESULT hr; + + TRACE("data_size %lu, blob %p\n", data_size, blob); + + if (!blob) + { + WARN("Invalid blob specified.\n"); + return D3DERR_INVALIDCALL; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D blob object memory\n"); + return E_OUTOFMEMORY; + } + + hr = d3dcompiler_blob_init(object, data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize blob, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + *blob = (ID3DBlob *)object; + + TRACE("Created ID3DBlob %p\n", object); + + return S_OK; +} + static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) { BOOL add = FALSE; diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 37937a6..51314e8 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -46,41 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } -HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) -{ - struct d3dcompiler_blob *object; - HRESULT hr; - - TRACE("data_size %lu, blob %p\n", data_size, blob); - - if (!blob) - { - WARN("Invalid blob specified.\n"); - return D3DERR_INVALIDCALL; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate D3D blob object memory\n"); - return E_OUTOFMEMORY; - } - - hr = d3dcompiler_blob_init(object, data_size); - if (FAILED(hr)) - { - WARN("Failed to initialize blob, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - *blob = (ID3DBlob *)object; - - TRACE("Created ID3DBlob %p\n", object); - - return S_OK; -} - 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, diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 4ac8966..3ee88db 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -44,18 +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; -/* ID3DBlob */ -struct d3dcompiler_blob -{ - ID3DBlob ID3DBlob_iface; - LONG refcount; - - SIZE_T size; - void *data; -}; - -HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) 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;

1 0

Stefan Leichter : scarddlg: New dll stub.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 81f3d68abd3eef263e6c50d62208b466accb9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f3d68abd3eef263e6c50d62… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 3 23:50:40 2011 +0200 scarddlg: New dll stub. --- configure | 1 + configure.ac | 1 + dlls/scarddlg/Makefile.in | 6 +++++ dlls/scarddlg/main.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/scarddlg/scarddlg.spec | 5 ++++ 5 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a61c726..0b972b3 100755 --- a/configure +++ b/configure @@ -15279,6 +15279,7 @@ wine_fn_config_dll rstrtmgr enable_rstrtmgr wine_fn_config_dll rtutils enable_rtutils implib wine_fn_config_dll samlib enable_samlib wine_fn_config_dll sane.ds enable_sane_ds po +wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test diff --git a/configure.ac b/configure.ac index 3f29303..8d68d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,7 @@ WINE_CONFIG_DLL(rstrtmgr) WINE_CONFIG_DLL(rtutils,,[implib]) WINE_CONFIG_DLL(samlib) WINE_CONFIG_DLL(sane.ds,,[po]) +WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) diff --git a/dlls/scarddlg/Makefile.in b/dlls/scarddlg/Makefile.in new file mode 100644 index 0000000..7b3ddc8 --- /dev/null +++ b/dlls/scarddlg/Makefile.in @@ -0,0 +1,6 @@ +MODULE = scarddlg.dll + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/scarddlg/main.c b/dlls/scarddlg/main.c new file mode 100644 index 0000000..59cc5a8 --- /dev/null +++ b/dlls/scarddlg/main.c @@ -0,0 +1,49 @@ +/* + * Implementation of the SCardDlg Interface + * + * Copyright 2011 Stefan Leichter + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wfext.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scarddlg); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%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; + } + return TRUE; +} diff --git a/dlls/scarddlg/scarddlg.spec b/dlls/scarddlg/scarddlg.spec new file mode 100644 index 0000000..3208c1b --- /dev/null +++ b/dlls/scarddlg/scarddlg.spec @@ -0,0 +1,5 @@ +1 stub GetOpenCardNameA +2 stub GetOpenCardNameW +3 stub SCardDlgExtendedError +4 stub SCardUIDlgSelectCardA +5 stub SCardUIDlgSelectCardW

1 0

Huw Davies : gdi32: Add a skeleton dib driver.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 4cffb2d0a9f8cb001584e5f561f76385919a0172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cffb2d0a9f8cb001584e5f56… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 1 15:27:48 2011 +0100 gdi32: Add a skeleton dib driver. --- configure | 5 + configure.ac | 1 + dlls/gdi32/Makefile.in | 2 + dlls/gdi32/bitmap.c | 21 ++++- dlls/gdi32/dc.c | 2 + dlls/gdi32/dibdrv/dc.c | 221 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dibdrv.h | 24 +++++ dlls/gdi32/gdi_private.h | 17 ++++ 8 files changed, 290 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cffb2d0a9f8cb001584e…

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

← Newer
1
...
83
84
85
86
87
88
89
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011