September 2007 - Wine-commits

Michael Stefaniuc : advapi32: Move the storage specifier to the beginning of the declaration.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 790424f0ad4d07a29944d6799c20339d0ada7754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790424f0ad4d07a29944d6799… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Sep 26 18:57:07 2007 +0200 advapi32: Move the storage specifier to the beginning of the declaration. --- dlls/advapi32/security.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 9323c07..31ee263 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3611,7 +3611,7 @@ static BOOL DumpSid(PSID psid, WCHAR **pwptr, ULONG *plen) return DumpSidNumeric(psid, pwptr, plen); } -const static LPCWSTR AceRightBitNames[32] = { +static const LPCWSTR AceRightBitNames[32] = { SDDL_CREATE_CHILD, /* 0 */ SDDL_DELETE_CHILD, SDDL_LIST_CHILDREN, @@ -3648,7 +3648,7 @@ const static LPCWSTR AceRightBitNames[32] = { static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) { - const static WCHAR fmtW[] = {'0','x','%','x',0}; + static const WCHAR fmtW[] = {'0','x','%','x',0}; WCHAR buf[15]; int i; @@ -3688,9 +3688,9 @@ static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) { ACCESS_ALLOWED_ACE *piace; /* all the supported ACEs have the same memory layout */ - const static WCHAR openbr = '('; - const static WCHAR closebr = ')'; - const static WCHAR semicolon = ';'; + static const WCHAR openbr = '('; + static const WCHAR closebr = ')'; + static const WCHAR semicolon = ';'; if (((PACE_HEADER)pace)->AceType > SYSTEM_ALARM_ACE_TYPE || ((PACE_HEADER)pace)->AceSize < sizeof(ACCESS_ALLOWED_ACE)) { @@ -3777,7 +3777,7 @@ static BOOL DumpAcl(PACL pacl, WCHAR **pwptr, ULONG *plen, BOOL protected, BOOL static BOOL DumpOwner(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) { - const static WCHAR prefix[] = {'O',':',0}; + static const WCHAR prefix[] = {'O',':',0}; BOOL bDefaulted; PSID psid; @@ -3795,7 +3795,7 @@ static BOOL DumpOwner(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, UL static BOOL DumpGroup(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) { - const static WCHAR prefix[] = {'G',':',0}; + static const WCHAR prefix[] = {'G',':',0}; BOOL bDefaulted; PSID psid;

1 0

Alexandre Julliard : gdi32: Move the generic part of FontIsLinked() to font .c.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 3363d65f168f57f9ec34f1b80e03e0e104a84107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3363d65f168f57f9ec34f1b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 20:21:34 2007 +0200 gdi32: Move the generic part of FontIsLinked() to font.c. --- dlls/gdi32/font.c | 16 ++++++++++++++++ dlls/gdi32/freetype.c | 14 +++----------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 59b6780..269638f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3422,3 +3422,19 @@ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs) DC_ReleaseDCPtr(dc); return ret; } + + +/************************************************************* + * FontIsLinked (GDI32.@) + */ +BOOL WINAPI FontIsLinked(HDC hdc) +{ + DC *dc = DC_GetDCPtr(hdc); + BOOL ret = FALSE; + + if (!dc) return FALSE; + if (dc->gdiFont) ret = WineEngFontIsLinked(dc->gdiFont); + DC_ReleaseDCPtr(dc); + TRACE("returning %d\n", ret); + return ret; +} diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cc784ea..3ec28f9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4651,17 +4651,9 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) /************************************************************* * FontIsLinked */ -BOOL WINAPI FontIsLinked(HDC hdc) +BOOL WineEngFontIsLinked(GdiFont *font) { - DC *dc = DC_GetDCPtr(hdc); - BOOL ret = FALSE; - - if(!dc) return FALSE; - if(dc->gdiFont && !list_empty(&dc->gdiFont->child_fonts)) - ret = TRUE; - DC_ReleaseDCPtr(dc); - TRACE("returning %d\n", ret); - return ret; + return !list_empty(&font->child_fonts); } static BOOL is_hinting_enabled(void) @@ -5074,7 +5066,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) return 0; } -BOOL WINAPI FontIsLinked(HDC hdc) +BOOL WineEngFontIsLinked(GdiFont *font) { return FALSE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0904049..08ba02b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -444,6 +444,7 @@ extern BOOL WineEngGetTextExtentExPoint(GdiFont*, LPCWSTR, INT, INT, LPINT, LPIN extern BOOL WineEngGetTextExtentPointI(GdiFont*, const WORD *, INT, LPSIZE); extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR); extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW); +extern BOOL WineEngFontIsLinked(GdiFont*); extern BOOL WineEngInit(void); extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID);

1 0

Dan Hipschman : widl: Fix top-level conformant arrays with pointer attributes.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 347f2a2da2b98d8e365f944e439c9b8ee54ee30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=347f2a2da2b98d8e365f944e4… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 26 11:32:08 2007 -0700 widl: Fix top-level conformant arrays with pointer attributes. --- dlls/rpcrt4/tests/server.c | 17 +++++++++++++++++ dlls/rpcrt4/tests/server.idl | 2 ++ tools/widl/typegen.c | 24 +++++++++++++++++++----- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index cdec58b..a7d6c21 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -199,6 +199,18 @@ s_sum_conf_array(int x[], int n) } int +s_sum_unique_conf_array(int x[], int n) +{ + return s_sum_conf_array(x, n); +} + +int +s_sum_unique_conf_ptr(int *x, int n) +{ + return x ? s_sum_conf_array(x, n) : 0; +} + +int s_sum_var_array(int x[20], int n) { ok(0 <= n, "RPC sum_var_array\n"); @@ -699,6 +711,7 @@ array_tests(void) cpsc_t cpsc; cs_t *cs; int n; + int ca[5] = {1, -2, 3, -4, 5}; ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); @@ -709,6 +722,10 @@ array_tests(void) ok(sum_conf_array(&c[7], 1) == 7, "RPC sum_conf_array\n"); ok(sum_conf_array(&c[2], 0) == 0, "RPC sum_conf_array\n"); + ok(sum_unique_conf_array(ca, 4) == -2, "RPC sum_unique_conf_array\n"); + ok(sum_unique_conf_ptr(ca, 5) == 3, "RPC sum_unique_conf_array\n"); + ok(sum_unique_conf_ptr(NULL, 10) == 0, "RPC sum_unique_conf_array\n"); + ok(sum_var_array(c, 10) == 45, "RPC sum_conf_array\n"); ok(sum_var_array(&c[5], 2) == 11, "RPC sum_conf_array\n"); ok(sum_var_array(&c[7], 1) == 7, "RPC sum_conf_array\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index cadd1df..7a80489 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -111,6 +111,8 @@ interface IServer int test_list_length(test_list_t *ls); int sum_fixed_int_3d(int m[2][3][4]); int sum_conf_array([size_is(n)] int x[], int n); + int sum_unique_conf_array([size_is(n), unique] int x[], int n); + int sum_unique_conf_ptr([size_is(n), unique] int *x, int n); int sum_var_array([length_is(n)] int x[20], int n); int dot_two_vectors(vector_t vs[2]); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 06ebd4f..419dbf7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1954,7 +1954,23 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset); if (is_array(type)) - return write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); + { + size_t off; + off = write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); + if (pointer_type != RPC_FC_RP) + { + unsigned int absoff = type->typestring_offset; + short reloff = absoff - (*typeformat_offset + 2); + off = *typeformat_offset; + print_file(file, 0, "/* %d */\n", off); + print_file(file, 2, "0x%x, 0x0,\t/* %s */\n", pointer_type, + string_of_type(pointer_type)); + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + reloff, reloff, absoff); + *typeformat_offset += 4; + } + return off; + } if (!is_ptr(type)) { @@ -2621,10 +2637,8 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, } else if (phase != PHASE_FREE) { - if (pointer_type == RPC_FC_UP) - print_phase_function(file, indent, "Pointer", phase, var, start_offset); - else - print_phase_function(file, indent, array_type, phase, var, start_offset); + const char *t = pointer_type == RPC_FC_RP ? array_type : "Pointer"; + print_phase_function(file, indent, t, phase, var, start_offset); } } else if (!is_ptr(var->type) && is_base_type(rtype))

1 0

Dan Hipschman : widl: Fix string codes in pointer descriptions.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 723c8bacfaba0c945f889eaf8861e94385878f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723c8bacfaba0c945f889eaf8… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 26 11:32:47 2007 -0700 widl: Fix string codes in pointer descriptions. --- dlls/rpcrt4/tests/server.c | 20 +++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 20 ++++++++++++++++++++ tools/widl/typegen.c | 26 ++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index a7d6c21..f4ba399 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -390,6 +390,18 @@ s_check_null(int *null) ok(!null, "RPC check_null\n"); } +int +s_str_struct_len(str_struct_t *s) +{ + return lstrlenA(s->s); +} + +int +s_wstr_struct_len(wstr_struct_t *s) +{ + return lstrlenW(s->s); +} + void s_stop(void) { @@ -428,7 +440,8 @@ run_client(const char *test) static void basic_tests(void) { - static char string[] = "I am a string"; + char string[] = "I am a string"; + WCHAR wstring[] = {'I',' ','a','m',' ','a',' ','w','s','t','r','i','n','g', 0}; static int f[5] = {1, 3, 0, -2, -4}; static vector_t a = {1, 3, 7}; static vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2; @@ -448,6 +461,8 @@ basic_tests(void) short h; char c; int x; + str_struct_t ss = {string}; + wstr_struct_t ws = {wstring}; ok(int_return() == INT_CODE, "RPC int_return\n"); @@ -465,6 +480,9 @@ basic_tests(void) ok(str_length(string) == strlen(string), "RPC str_length\n"); ok(dot_self(&a) == 59, "RPC dot_self\n"); + ok(str_struct_len(&ss) == lstrlenA(string), "RPC str_struct_len\n"); + ok(wstr_struct_len(&ws) == lstrlenW(wstring), "RPC str_struct_len\n"); + v = 0.0; u = square_half(3.0, &v); ok(u == 9.0, "RPC square_half\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 7a80489..d8a1ca3 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -33,6 +33,13 @@ typedef struct tag_vector ] interface IServer { +cpp_quote("#if 0") + typedef wchar_t WCHAR; +cpp_quote("#endif") + + typedef [string] char *str_t; + typedef [string] WCHAR *wstr_t; + typedef struct { int *pi; @@ -228,5 +235,18 @@ interface IServer int sum_bogus(bogus_t *b); void check_null([unique] int *null); + typedef struct + { + str_t s; + } str_struct_t; + + typedef struct + { + wstr_t s; + } wstr_struct_t; + + int str_struct_len(str_struct_t *s); + int wstr_struct_len(wstr_struct_t *s); + void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 419dbf7..205529d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -101,6 +101,10 @@ const char *string_of_type(unsigned char type) case RPC_FC_ALIGNM4: return "FC_ALIGNM4"; case RPC_FC_ALIGNM8: return "FC_ALIGNM8"; case RPC_FC_POINTER: return "FC_POINTER"; + case RPC_FC_C_CSTRING: return "FC_C_CSTRING"; + case RPC_FC_C_WSTRING: return "FC_C_WSTRING"; + case RPC_FC_CSTRING: return "FC_CSTRING"; + case RPC_FC_WSTRING: return "FC_WSTRING"; default: error("string_of_type: unknown type 0x%02x\n", type); return NULL; @@ -826,12 +830,30 @@ static unsigned int write_nonsimple_pointer(FILE *file, const type_t *type, size return 4; } +static unsigned char conf_string_type_of_char_type(unsigned char t) +{ + switch (t) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + return RPC_FC_C_CSTRING; + case RPC_FC_WCHAR: + return RPC_FC_C_WSTRING; + } + + error("string_type_of_char_type: unrecognized type %d", t); + return 0; +} + static unsigned int write_simple_pointer(FILE *file, const type_t *type) { + unsigned char fc + = is_string_type(type->attrs, type) + ? conf_string_type_of_char_type(type->ref->type) + : type->ref->type; print_file(file, 2, "0x%02x, 0x8,\t/* %s [simple_pointer] */\n", type->type, string_of_type(type->type)); - print_file(file, 2, "0x%02x,\t/* %s */\n", type->ref->type, - string_of_type(type->ref->type)); + print_file(file, 2, "0x%02x,\t/* %s */\n", fc, string_of_type(fc)); print_file(file, 2, "0x5c,\t/* FC_PAD */\n"); return 4; }

1 0

Dan Hipschman : widl: Fix array alignment bug.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: cbd75d3ace9a4d06a16837bea5b046ba1122aeb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd75d3ace9a4d06a16837bea… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 26 17:34:25 2007 -0700 widl: Fix array alignment bug. --- tools/widl/typegen.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 205529d..c2e16e5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1469,6 +1469,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type if (write_embedded_types(file, attrs, type->ref, name, FALSE, typestring_offset)) has_pointer = TRUE; + align = 0; size = type_memsize(type, &align); if (size == 0) /* conformant array */ size = type_memsize(type->ref, &align);

1 0

Alex Villacís Lasso : riched20: EM_SETCHARFORMAT must return 0, not assert, on invalid struct size.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: be5105e8941bb82254fc3e878ef60f8eaca300c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5105e8941bb82254fc3e878… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Sep 26 12:58:24 2007 -0500 riched20: EM_SETCHARFORMAT must return 0, not assert, on invalid struct size. --- dlls/riched20/editor.c | 1 + dlls/riched20/style.c | 3 +- dlls/riched20/tests/editor.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f90c353..4efaa90 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1732,6 +1732,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, CHARFORMAT2W buf, *p; BOOL bRepaint = TRUE; p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); + if (p == NULL) return 0; if (!wParam || (editor->mode & TM_PLAINTEXT)) ME_SetDefaultCharFormat(editor, p); else if (wParam == (SCF_WORD | SCF_SELECTION)) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 48e29b5..0530c42 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -60,8 +60,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) return to; } - assert(from->cbSize >= sizeof(CHARFORMAT2W)); - return from; + return (from->cbSize >= sizeof(CHARFORMAT2W)) ? from : NULL; } void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7a092c3..416c803 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -333,6 +333,80 @@ static void test_EM_SCROLLCARET(void) DestroyWindow(hwndRichEdit); } +static void test_EM_SETCHARFORMAT(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + CHARFORMAT2 cf2; + int rc = 0; + + /* Invalid flags, CHARFORMAT2 structure blanked out */ + memset(&cf2, 0, sizeof(cf2)); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) 0xfffffff0, + (LPARAM) &cf2); + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + /* A valid flag, CHARFORMAT2 structure blanked out */ + memset(&cf2, 0, sizeof(cf2)); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_DEFAULT, + (LPARAM) &cf2); + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + /* A valid flag, CHARFORMAT2 structure blanked out */ + memset(&cf2, 0, sizeof(cf2)); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, + (LPARAM) &cf2); + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + /* A valid flag, CHARFORMAT2 structure blanked out */ + memset(&cf2, 0, sizeof(cf2)); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD, + (LPARAM) &cf2); + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + /* A valid flag, CHARFORMAT2 structure blanked out */ + memset(&cf2, 0, sizeof(cf2)); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, + (LPARAM) &cf2); + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + + /* Invalid flags, CHARFORMAT2 structure minimally filled */ + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(CHARFORMAT2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) 0xfffffff0, + (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + + /* A valid flag, CHARFORMAT2 structure minimally filled */ + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(CHARFORMAT2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_DEFAULT, + (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + + /* A valid flag, CHARFORMAT2 structure minimally filled */ + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(CHARFORMAT2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, + (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + + /* A valid flag, CHARFORMAT2 structure minimally filled */ + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(CHARFORMAT2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD, + (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + + /* A valid flag, CHARFORMAT2 structure minimally filled */ + memset(&cf2, 0, sizeof(cf2)); + cf2.cbSize = sizeof(CHARFORMAT2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, + (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + + DestroyWindow(hwndRichEdit); +} + static void test_EM_SETTEXTMODE(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -2125,6 +2199,7 @@ START_TEST( editor ) test_EM_SCROLLCARET(); test_EM_SCROLL(); test_WM_SETTEXT(); + test_EM_SETCHARFORMAT(); test_EM_SETTEXTMODE(); test_TM_PLAINTEXT(); test_EM_SETOPTIONS();

1 0

Maarten Lankhorst : wineoss: Silence some harmless warnings.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 30392be1e0e5afb95f14690bdf77acd5a6d0a37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30392be1e0e5afb95f14690bd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Sep 24 20:33:50 2007 +0200 wineoss: Silence some harmless warnings. --- dlls/wineoss.drv/audio.c | 6 ++---- dlls/wineoss.drv/dsrender.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index f3360cf..332280b 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -2082,10 +2082,8 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) /* Check that fragsize is correct per our settings above */ if ((info.fragsize > 1024) && (LOWORD(audio_fragment) <= 10)) { - /* we've tried to set 1K fragments or less, but it didn't work */ - ERR("fragment size set failed, size is now %d\n", info.fragsize); - MESSAGE("Your Open Sound System driver did not let us configure small enough sound fragments.\n"); - MESSAGE("This may cause delays and other problems in audio playback with certain applications.\n"); + /* we've tried to set 1K fragments or less, but it didn't work */ + WARN("fragment size set failed, size is now %d\n", info.fragsize); } /* Remember fragsize and total buffer size for future use */ diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index 27672fb..3236456 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -940,10 +940,8 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) /* the HAL isn't much better than the HEL if we can't do mmap() */ if (!(WOutDev[wDevID].ossdev->duplex_out_caps.dwSupport & WAVECAPS_DIRECTSOUND)) { - ERR("DirectSound flag not set\n"); - MESSAGE("This sound card's driver does not support direct access\n"); - MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n"); - return MMSYSERR_NOTSUPPORTED; + WARN("Warn DirectSound flag not set, falling back to HEL layer\n"); + return MMSYSERR_NOTSUPPORTED; } *idrv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDsDriverImpl));

1 0

Alexandre Julliard : gdi32: Don't hold the gdi lock while creating a DC.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 7480bd3204535d19da2ea5336b304d01936e418e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7480bd3204535d19da2ea5336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 17:39:25 2007 +0200 gdi32: Don't hold the gdi lock while creating a DC. --- dlls/gdi32/dc.c | 46 ++++++++++++++++++++++---------------------- dlls/gdi32/enhmfdrv/init.c | 16 +++++++------- dlls/gdi32/gdi_private.h | 4 +- dlls/gdi32/mfdrv/init.c | 16 +++++++------- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index fe51253..bb91785 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -71,9 +71,9 @@ static inline DC *get_dc_obj( HDC hdc ) /*********************************************************************** - * DC_AllocDC + * alloc_dc_ptr */ -DC *DC_AllocDC( const DC_FUNCTIONS *funcs, WORD magic ) +DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) { HDC hdc; DC *dc; @@ -149,6 +149,7 @@ DC *DC_AllocDC( const DC_FUNCTIONS *funcs, WORD magic ) dc->BoundsRect.bottom = 0; dc->saved_visrgn = NULL; PATH_InitGdiPath(&dc->path); + GDI_ReleaseObj( dc->hSelf ); return dc; } @@ -189,11 +190,13 @@ void DC_ReleaseDCPtr( DC *dc ) /*********************************************************************** - * DC_FreeDCPtr + * free_dc_ptr */ -BOOL DC_FreeDCPtr( DC *dc ) +BOOL free_dc_ptr( DC *dc ) { assert( dc->refcount == 1 ); + /* grab the gdi lock again */ + if (!GDI_GetObjPtr( dc->hSelf, MAGIC_DONTCARE )) return FALSE; /* shouldn't happen */ return GDI_FreeObject( dc->hSelf, dc ); } @@ -704,7 +707,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; } - if (!(dc = DC_AllocDC( funcs, DC_MAGIC ))) goto error; + if (!(dc = alloc_dc_ptr( funcs, DC_MAGIC ))) goto error; hdc = dc->hSelf; dc->hBitmap = GetStockObject( DEFAULT_BITMAP ); @@ -724,12 +727,12 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ) ); DC_InitDC( dc ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return hdc; error: if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn ); - if (dc) DC_FreeDCPtr( dc ); + if (dc) free_dc_ptr( dc ); DRIVER_release_driver( funcs ); return 0; } @@ -805,20 +808,20 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) GDI_CheckNotLock(); - if ((origDC = DC_GetDCPtr( hdc ))) + if ((origDC = get_dc_ptr( hdc ))) { if (GetObjectType( hdc ) == OBJ_DC) { funcs = origDC->funcs; physDev = origDC->physDev; } - DC_ReleaseDCPtr( origDC ); /* can't hold the lock while loading the driver */ + release_dc_ptr( origDC ); if (funcs) funcs = DRIVER_get_driver( funcs ); } if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; - if (!(dc = DC_AllocDC( funcs, MEMORY_DC_MAGIC ))) goto error; + if (!(dc = alloc_dc_ptr( funcs, MEMORY_DC_MAGIC ))) goto error; TRACE("(%p): returning %p\n", hdc, dc->hSelf ); @@ -838,12 +841,12 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) } DC_InitDC( dc ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return dc->hSelf; error: if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn ); - if (dc) DC_FreeDCPtr( dc ); + if (dc) free_dc_ptr( dc ); DRIVER_release_driver( funcs ); return 0; } @@ -861,29 +864,26 @@ BOOL WINAPI DeleteDC( HDC hdc ) GDI_CheckNotLock(); - if (!(dc = DC_GetDCPtr( hdc ))) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; if (dc->refcount != 1) { FIXME( "not deleting busy DC %p refcount %u\n", dc->hSelf, dc->refcount ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return FALSE; } /* Call hook procedure to check whether is it OK to delete this DC */ - if (dc->hookThunk) + if (dc->hookThunk && !dc->hookThunk( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) { - DCHOOKPROC proc = dc->hookThunk; - DWORD_PTR data = dc->dwHookData; - DC_ReleaseDCPtr( dc ); - if (!proc( hdc, DCHC_DELETEDC, data, 0 )) return FALSE; - if (!(dc = DC_GetDCPtr( hdc ))) return TRUE; /* deleted by the hook */ + release_dc_ptr( dc ); + return FALSE; } while (dc->saveLevel) { DC * dcs; HDC hdcs = dc->saved_dc; - if (!(dcs = DC_GetDCPtr( hdcs ))) break; + if (!(dcs = get_dc_ptr( hdcs ))) break; dc->saved_dc = dcs->saved_dc; dc->saveLevel--; if (dcs->hClipRgn) DeleteObject( dcs->hClipRgn ); @@ -891,7 +891,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (dcs->hMetaClipRgn) DeleteObject( dcs->hMetaClipRgn ); if (dcs->hVisRgn) DeleteObject( dcs->hVisRgn ); PATH_DestroyGdiPath(&dcs->path); - DC_FreeDCPtr( dcs ); + free_dc_ptr( dcs ); } if (!(dc->flags & DC_SAVED)) @@ -918,7 +918,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); PATH_DestroyGdiPath(&dc->path); - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); if (funcs) DRIVER_release_driver( funcs ); /* do that after releasing the GDI lock */ return TRUE; } diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index f5c4562..0db9ff6 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -171,7 +171,7 @@ static BOOL EMFDRV_DeleteDC( DC *dc ) HeapFree( GetProcessHeap(), 0, physDev->handles ); HeapFree( GetProcessHeap(), 0, physDev ); dc->physDev = NULL; - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); return TRUE; } @@ -314,11 +314,11 @@ HDC WINAPI CreateEnhMetaFileW( TRACE("%s\n", debugstr_w(filename) ); - if (!(dc = DC_AllocDC( &EMFDRV_Funcs, ENHMETAFILE_DC_MAGIC ))) return 0; + if (!(dc = alloc_dc_ptr( &EMFDRV_Funcs, ENHMETAFILE_DC_MAGIC ))) return 0; physDev = HeapAlloc(GetProcessHeap(),0,sizeof(*physDev)); if (!physDev) { - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); return 0; } dc->physDev = (PHYSDEV)physDev; @@ -334,7 +334,7 @@ HDC WINAPI CreateEnhMetaFileW( if (!(physDev->emh = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size))) { HeapFree( GetProcessHeap(), 0, physDev ); - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); return 0; } @@ -415,7 +415,7 @@ HDC WINAPI CreateEnhMetaFileW( TRACE("returning %p\n", dc->hSelf); ret = dc->hSelf; - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); if( !hdc ) DeleteDC( hRefDC ); @@ -436,16 +436,16 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ TRACE("(%p)\n", hdc ); - if (!(dc = DC_GetDCPtr( hdc ))) return NULL; + if (!(dc = get_dc_ptr( hdc ))) return NULL; if (GDIMAGIC(dc->header.wMagic) != ENHMETAFILE_DC_MAGIC) { - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return NULL; } if (dc->refcount != 1) { FIXME( "not deleting busy DC %p refcount %u\n", dc->hSelf, dc->refcount ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return NULL; } physDev = (EMFDRV_PDEVICE *)dc->physDev; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 157a7de..adad616 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -393,11 +393,11 @@ extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ); extern void CLIPPING_UpdateGCRegion( DC * dc ); /* dc.c */ -extern DC * DC_AllocDC( const DC_FUNCTIONS *funcs, WORD magic ); +extern DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ); extern DC * DC_GetDCUpdate( HDC hdc ); extern DC * DC_GetDCPtr( HDC hdc ); extern void DC_ReleaseDCPtr( DC *dc ); -extern BOOL DC_FreeDCPtr( DC *dc ); +extern BOOL free_dc_ptr( DC *dc ); extern DC *get_dc_ptr( HDC hdc ); extern void release_dc_ptr( DC *dc ); extern void update_dc( DC *dc ); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index aa10e96..c2cf404 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -165,12 +165,12 @@ static DC *MFDRV_AllocMetaFile(void) DC *dc; METAFILEDRV_PDEVICE *physDev; - if (!(dc = DC_AllocDC( &MFDRV_Funcs, METAFILE_DC_MAGIC ))) return NULL; + if (!(dc = alloc_dc_ptr( &MFDRV_Funcs, METAFILE_DC_MAGIC ))) return NULL; physDev = HeapAlloc(GetProcessHeap(),0,sizeof(*physDev)); if (!physDev) { - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); return NULL; } dc->physDev = (PHYSDEV)physDev; @@ -179,7 +179,7 @@ static DC *MFDRV_AllocMetaFile(void) if (!(physDev->mh = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev->mh) ))) { HeapFree( GetProcessHeap(), 0, physDev ); - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); return NULL; } @@ -215,7 +215,7 @@ static BOOL MFDRV_DeleteDC( DC *dc ) HeapFree( GetProcessHeap(), 0, physDev->handles ); HeapFree( GetProcessHeap(), 0, physDev ); dc->physDev = NULL; - DC_FreeDCPtr( dc ); + free_dc_ptr( dc ); return TRUE; } @@ -267,7 +267,7 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) TRACE("returning %p\n", dc->hSelf); ret = dc->hSelf; - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; } @@ -306,16 +306,16 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) TRACE("(%p)\n", hdc ); - if (!(dc = DC_GetDCPtr( hdc ))) return NULL; + if (!(dc = get_dc_ptr( hdc ))) return NULL; if (GDIMAGIC(dc->header.wMagic) != METAFILE_DC_MAGIC) { - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return NULL; } if (dc->refcount != 1) { FIXME( "not deleting busy DC %p refcount %u\n", dc->hSelf, dc->refcount ); - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return NULL; } physDev = (METAFILEDRV_PDEVICE *)dc->physDev;

1 0

Alexandre Julliard : gdi32: Don' t hold the gdi lock while calling DC driver functions.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 1abc24d29c648703b104f2d830a6b46e1ed2f542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abc24d29c648703b104f2d83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 17:51:41 2007 +0200 gdi32: Don't hold the gdi lock while calling DC driver functions. --- dlls/gdi32/dc.c | 273 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 140 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1abc24d29c648703b104f…

1 0

Alexandre Julliard : gdi32: Don' t pass a DC handle to WineEngGetFontUnicodeRanges.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 543270dfb53a2eb832e669bfab13b9699e11ec16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=543270dfb53a2eb832e669bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 20:17:13 2007 +0200 gdi32: Don't pass a DC handle to WineEngGetFontUnicodeRanges. --- dlls/gdi32/font.c | 11 ++++++++++- dlls/gdi32/freetype.c | 25 +++++++------------------ dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 44a3dde..59b6780 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3411,5 +3411,14 @@ BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT */ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs) { - return WineEngGetFontUnicodeRanges(hdc, lpgs); + DWORD ret = 0; + DC *dc = DC_GetDCPtr(hdc); + + TRACE("(%p, %p)\n", hdc, lpgs); + + if (!dc) return 0; + + if (dc->gdiFont) ret = WineEngGetFontUnicodeRanges(dc->gdiFont, lpgs); + DC_ReleaseDCPtr(dc); + return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 89f8b22..cc784ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4634,28 +4634,17 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) return num_ranges; } -DWORD WineEngGetFontUnicodeRanges(HDC hdc, LPGLYPHSET glyphset) +DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { DWORD size = 0; - DC *dc = DC_GetDCPtr(hdc); - - TRACE("(%p, %p)\n", hdc, glyphset); + DWORD num_ranges = get_font_unicode_ranges(font->ft_face, glyphset); - if (!dc) return 0; - - if (dc->gdiFont) + size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); + if (glyphset) { - DWORD num_ranges = get_font_unicode_ranges(dc->gdiFont->ft_face, glyphset); - - size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); - if (glyphset) - { - glyphset->cbThis = size; - glyphset->cRanges = num_ranges; - } + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; } - - DC_ReleaseDCPtr(dc); return size; } @@ -5079,7 +5068,7 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) return FALSE; } -DWORD WineEngGetFontUnicodeRanges(HDC hdc, LPGLYPHSET glyphset) +DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { FIXME("(%p, %p): stub\n", hdc, glyphset); return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index adad616..0904049 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -430,7 +430,7 @@ extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer); extern BOOL WineEngGetCharWidth(GdiFont*, UINT, UINT, LPINT); extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD); -extern DWORD WineEngGetFontUnicodeRanges(HDC, LPGLYPHSET); +extern DWORD WineEngGetFontUnicodeRanges(GdiFont *, LPGLYPHSET); extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); extern DWORD WineEngGetGlyphOutline(GdiFont*, UINT glyph, UINT format,

1 0