January 2008 - Wine-Commits

Eric Pouech : msvcrt: symbol undecoration: Added support for a couple of more calling conventions.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: d7c0e274e88408698862be28a7e49296149f37b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c0e274e88408698862be28a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:05:46 2008 +0100 msvcrt: symbol undecoration: Added support for a couple of more calling conventions. --- dlls/msvcrt/undname.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 6c7febd..d1da19b 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -624,7 +624,8 @@ static BOOL get_calling_convention(char ch, const char** call_conv, case 'E': case 'F': *call_conv = "thiscall"; break; case 'G': case 'H': *call_conv = "stdcall"; break; case 'I': case 'J': *call_conv = "fastcall"; break; - case 'K': break; + case 'K': case 'L': break; + case 'M': *call_conv = "clrcall"; break; default: ERR("Unknown calling convention %c\n", ch); return FALSE; } } @@ -638,7 +639,8 @@ static BOOL get_calling_convention(char ch, const char** call_conv, case 'E': case 'F': *call_conv = "__thiscall"; break; case 'G': case 'H': *call_conv = "__stdcall"; break; case 'I': case 'J': *call_conv = "__fastcall"; break; - case 'K': break; + case 'K': case 'L': break; + case 'M': *call_conv = "__clrcall"; break; default: ERR("Unknown calling convention %c\n", ch); return FALSE; } }

1 0

Eric Pouech : msvcrt: symbol undecoration: Added support for cointerface.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 056e589556bc8b9c822233ee976bbc388f041284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056e589556bc8b9c822233ee9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:05:40 2008 +0100 msvcrt: symbol undecoration: Added support for cointerface. --- dlls/msvcrt/undname.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index f78a7d8..6c7febd 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -734,7 +734,8 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'T': /* union */ case 'U': /* struct */ case 'V': /* class */ - /* Class/struct/union */ + case 'Y': /* cointerface */ + /* Class/struct/union/cointerface */ { const char* struct_name = NULL; const char* type_name = NULL; @@ -748,6 +749,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case 'T': type_name = "union "; break; case 'U': type_name = "struct "; break; case 'V': type_name = "class "; break; + case 'Y': type_name = "cointerface "; break; } } ct->left = str_printf(sym, "%s%s", type_name, struct_name);

1 0

Eric Pouech : msvcrt: symbol undecoration: Corrected handling of non static member function modifiers.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 3db08321f43e305988e4536022b8bdc2da4a80ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db08321f43e305988e453602… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:05:52 2008 +0100 msvcrt: symbol undecoration: Corrected handling of non static member function modifiers. --- dlls/msvcrt/undname.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index d1da19b..f83d998 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -971,6 +971,7 @@ done: */ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { + char accmem; const char* access = NULL; const char* member_type = NULL; struct datatype_t ct_ret; @@ -1012,9 +1013,12 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * 'Z' */ + accmem = *sym->current++; + if (accmem < 'A' || accmem > 'Z') goto done; + if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) { - switch ((*sym->current - 'A') / 8) + switch ((accmem - 'A') / 8) { case 0: access = "private: "; break; case 1: access = "protected: "; break; @@ -1023,9 +1027,9 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) { - if (*sym->current >= 'A' && *sym->current <= 'X') + if (accmem <= 'X') { - switch ((*sym->current - 'A') % 8) + switch ((accmem - 'A') % 8) { case 2: case 3: member_type = "static "; break; case 4: case 5: member_type = "virtual "; break; @@ -1034,17 +1038,16 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } } - if (*sym->current >= 'A' && *sym->current <= 'X') + if (accmem <= 'X') { - if (!((*sym->current - 'A') & 2)) + if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) { /* Implicit 'this' pointer */ /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(*++sym->current, &modifier)) goto done; + if (!get_modifier(*sym->current, &modifier)) goto done; + sym->current++; } } - else if (*sym->current < 'A' || *sym->current > 'Z') goto done; - sym->current++; name = get_class_string(sym, 0);

1 0

Eric Pouech : msvcrt: symbol undecoration: Handling of void in template parameters' list.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 2d2e7c74bb6b73214ef025299c93c90900263919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2e7c74bb6b73214ef025299… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:05:33 2008 +0100 msvcrt: symbol undecoration: Handling of void in template parameters' list. --- dlls/msvcrt/undname.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 95e5c80..f78a7d8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -362,12 +362,8 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t } if (!demangle_datatype(sym, &ct, pmt_ref, TRUE)) return NULL; - /* 'void' terminates an argument list */ - if (!strcmp(ct.left, "void")) - { - if (!z_term && *sym->current == '@') sym->current++; - break; - } + /* 'void' terminates an argument list in a function */ + if (z_term && !strcmp(ct.left, "void")) break; str_array_push(sym, str_printf(sym, "%s%s", ct.left, ct.right), -1, &arg_collect); if (!strcmp(ct.left, "...")) break;

1 0

Paul Chitescu : mscoree: Semi-stub for LoadStringRCEx and LoadStringRC.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 961f5fa67a80084353aa9008249bfbc0d2f8b840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961f5fa67a80084353aa90082… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jan 21 18:07:43 2008 +0200 mscoree: Semi-stub for LoadStringRCEx and LoadStringRC. --- dlls/mscoree/mscoree.spec | 4 ++-- dlls/mscoree/mscoree_main.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 92efe94..1d110a8 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -2,7 +2,7 @@ 18 stub PostError 19 stub InitSSAutoEnterThread 20 stub UpdateError -22 stub LoadStringRC +22 stdcall LoadStringRC(long ptr long long) 23 stub ReOpenMetaDataWithMemory @ stub CallFunctionShim @@ -69,7 +69,7 @@ @ stub GetXMLObject @ stdcall LoadLibraryShim(ptr ptr ptr ptr) @ stub LoadLibraryWithPolicyShim -@ stub LoadStringRCEx +@ stdcall LoadStringRCEx(long long ptr long long ptr) @ stub LockClrVersion @ stub MetaDataGetDispenser @ stub OpenCtrs diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 35564ac..b60d4d3 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -273,6 +273,28 @@ HRESULT WINAPI GetVersionFromProcess(HANDLE hProcess, LPWSTR pVersion, DWORD cch return E_NOTIMPL; } +HRESULT WINAPI LoadStringRCEx(LCID culture, UINT resId, LPWSTR pBuffer, int iBufLen, int bQuiet, int* pBufLen) +{ + HRESULT res = S_OK; + if ((iBufLen <= 0) || !pBuffer) + return E_INVALIDARG; + pBuffer[0] = 0; + if (resId) { + FIXME("(%d, %x, %p, %d, %d, %p): semi-stub\n", culture, resId, pBuffer, iBufLen, bQuiet, pBufLen); + res = E_NOTIMPL; + } + else + res = E_FAIL; + if (pBufLen) + *pBufLen = lstrlenW(pBuffer); + return res; +} + +HRESULT WINAPI LoadStringRC(UINT resId, LPWSTR pBuffer, int iBufLen, int bQuiet) +{ + return LoadStringRCEx(-1, resId, pBuffer, iBufLen, bQuiet, NULL); +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { FIXME("(%p, %p, %p): stub\n", rclsid, riid, ppv);

1 0

Eric Pouech : msvcrt: symbol undecoration: Now correctly parsing the template forms.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 2e47a3a4f857e8b00cc1b43a4668a87d7c16e5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e47a3a4f857e8b00cc1b43a4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 21 22:05:26 2008 +0100 msvcrt: symbol undecoration: Now correctly parsing the template forms. --- dlls/msvcrt/tests/cpp.c | 3 + dlls/msvcrt/undname.c | 128 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 106 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index fea9885..85544c0 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -981,6 +981,9 @@ static void test_demangle(void) { "??0?$Foo(a)P6GHPAX0@Z@@QAE(a)PAD@Z", "__thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)", 0x880}, { "?Qux(a)Bar@@0PAP6AHPAV1(a)AAH1PAH@ZA", "private: static int (__cdecl** Bar::Qux)(class Bar *,int &,int &,int *)" }, { "?Qux(a)Bar@@0PAP6AHPAV1(a)AAH1PAH@ZA", "Bar::Qux", 0x1800}, +{"?$AAA@$DBAB@", "AAA<`template-parameter257'>"}, +{"?$AAA@$D?4@", "AAA<`template-parameter-5'>"}, +{"?$AAA(a)PAUBBB@@", "AAA<struct BBB *>"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 2816bfb..95e5c80 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -289,6 +289,52 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, struct array* pmt, BOOL in_args); +static const char* get_number(struct parsed_symbol* sym) +{ + char* ptr; + BOOL sgn = FALSE; + + if (*sym->current == '?') + { + sgn = TRUE; + sym->current++; + } + if (*sym->current >= '0' && *sym->current <= '8') + { + ptr = und_alloc(sym, 3); + if (sgn) ptr[0] = '-'; + ptr[sgn ? 1 : 0] = *sym->current + 1; + ptr[sgn ? 2 : 1] = '\0'; + sym->current++; + } + else if (*sym->current == '9') + { + ptr = und_alloc(sym, 4); + if (sgn) ptr[0] = '-'; + ptr[sgn ? 1 : 0] = '1'; + ptr[sgn ? 2 : 1] = '0'; + ptr[sgn ? 3 : 2] = '\0'; + sym->current++; + } + else if (*sym->current >= 'A' && *sym->current <= 'P') + { + long ret = 0; + + while (*sym->current >= 'A' && *sym->current <= 'P') + { + ret *= 16; + ret += *sym->current++ - 'A'; + } + if (*sym->current != '@') return NULL; + + ptr = und_alloc(sym, 17); + sprintf(ptr, "%s%ld", sgn ? "-" : "", ret); + sym->current++; + } + else return NULL; + return ptr; +} + /****************************************************************** * get_args * Parses a list of function/method arguments, creates a string corresponding @@ -672,7 +718,6 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, { char dt; BOOL add_pmt = TRUE; - int num_args=0; assert(ct); ct->left = ct->right = NULL; @@ -779,34 +824,46 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, add_pmt = FALSE; break; case '$': - if (sym->current[0] != '0') goto done; - if (sym->current[1] >= '0' && sym->current[1] <= '9') + switch (*sym->current++) { - char* ptr; - ptr = und_alloc(sym, 2); - ptr[0] = sym->current[1] + 1; - ptr[1] = 0; - ct->left = ptr; - sym->current += 2; - } - else if (sym->current[1] >= 'A' && sym->current[1] <= 'P') - { - while (sym->current[1] >= 'A' && sym->current[1] <= 'P') + case '0': + if (!(ct->left = get_number(sym))) goto done; + break; + case 'D': { - num_args *= 16; - num_args += sym->current[1] - 'A'; - sym->current += 1; + const char* ptr; + if (!(ptr = get_number(sym))) goto done; + ct->left = str_printf(sym, "`template-parameter%s'", ptr); } - if(sym->current[1] == '@') + break; + case 'F': { - char *ptr; - ptr = und_alloc(sym, 17); - sprintf(ptr,"%d",num_args); - ct->left = ptr; - sym->current += 1; + const char* p1; + const char* p2; + if (!(p1 = get_number(sym))) goto done; + if (!(p2 = get_number(sym))) goto done; + ct->left = str_printf(sym, "{%s,%s}", p1, p2); } + break; + case 'G': + { + const char* p1; + const char* p2; + const char* p3; + if (!(p1 = get_number(sym))) goto done; + if (!(p2 = get_number(sym))) goto done; + if (!(p3 = get_number(sym))) goto done; + ct->left = str_printf(sym, "{%s,%s,%s}", p1, p2, p3); + } + break; + case 'Q': + { + const char* ptr; + if (!(ptr = get_number(sym))) goto done; + ct->left = str_printf(sym, "`non-type-template-parameter%s'", ptr); + } + break; } - else goto done; break; default : ERR("Unknown type %c\n", dt); @@ -1036,6 +1093,22 @@ done: return ret; } +/****************************************************************** + * handle_template + * Does the final parsing and handling for a name with templates + */ +static BOOL handle_template(struct parsed_symbol* sym) +{ + const char* name; + const char* args; + + assert(*sym->current++ == '$'); + if (!(name = get_literal_string(sym))) return FALSE; + if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; + sym->result = str_printf(sym, "%s%s", name, args); + return TRUE; +} + /******************************************************************* * symbol_demangle * Demangle a C++ linker symbol @@ -1181,12 +1254,15 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) } /* Either a class name, or '@' if the symbol is not a class member */ - if (*sym->current != '@') + switch (*sym->current) { + case '@': sym->current++; break; + case '$': break; + default: /* Class the function is associated with, terminated by '@@' */ if (!get_class(sym)) goto done; + break; } - else sym->current++; switch (do_after) { @@ -1211,6 +1287,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) ret = handle_data(sym); else if (*sym->current >= 'A' && *sym->current <= 'Z') ret = handle_method(sym, do_after == 3); + else if (*sym->current == '$') + ret = handle_template(sym); else ret = FALSE; done: if (ret) assert(sym->result);

1 0

Hans Leidekker : gdi32: Add tests for GetICMProfile and SetICMMode.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 8d35fd8d230498811178edc1cfa518f619dde11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d35fd8d230498811178edc1c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 21 16:33:55 2008 +0100 gdi32: Add tests for GetICMProfile and SetICMMode. --- dlls/gdi32/tests/Makefile.in | 1 + dlls/gdi32/tests/icm.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 31cc771..866615c 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -13,6 +13,7 @@ CTESTS = \ font.c \ gdiobj.c \ generated.c \ + icm.c \ mapping.c \ metafile.c \ palette.c \ diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c new file mode 100644 index 0000000..bbd5574 --- /dev/null +++ b/dlls/gdi32/tests/icm.c @@ -0,0 +1,148 @@ +/* + * Tests for ICM functions + * + * Copyright (C) 2005, 2008 Hans Leidekker + * + * 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 "wingdi.h" + +#include "wine/test.h" + +static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; + +static void test_GetICMProfileA( HDC dc ) +{ + BOOL ret; + DWORD size, error; + char filename[MAX_PATH]; + + ret = GetICMProfileA( NULL, NULL, NULL ); + ok( !ret, "GetICMProfileA succeeded\n" ); + + ret = GetICMProfileA( dc, NULL, NULL ); + ok( !ret, "GetICMProfileA succeeded\n" ); + + size = MAX_PATH; + ret = GetICMProfileA( dc, &size, NULL ); + ok( !ret, "GetICMProfileA succeeded\n" ); + + ret = GetICMProfileA( dc, NULL, filename ); + ok( !ret, "GetICMProfileA succeeded\n" ); + + size = MAX_PATH; + ret = GetICMProfileA( NULL, &size, filename ); + ok( !ret, "GetICMProfileA succeeded\n" ); + + size = 0; + SetLastError(0xdeadbeef); + ret = GetICMProfileA( dc, &size, filename ); + error = GetLastError(); + ok( !ret, "GetICMProfileA succeeded\n" ); + ok( size, "expected size > 0\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %d, expected ERROR_INSUFFICIENT_BUFFER\n", error ); + + size = MAX_PATH; + ret = GetICMProfileA( dc, &size, filename ); + ok( ret, "GetICMProfileA failed %d\n", GetLastError() ); + + trace( "%s\n", filename ); +} + +static void test_GetICMProfileW( HDC dc ) +{ + BOOL ret; + DWORD size, error; + WCHAR filename[MAX_PATH]; + + ret = GetICMProfileW( NULL, NULL, NULL ); + ok( !ret, "GetICMProfileW succeeded\n" ); + + ret = GetICMProfileW( dc, NULL, NULL ); + ok( !ret, "GetICMProfileW succeeded\n" ); + + size = MAX_PATH; + ret = GetICMProfileW( dc, &size, NULL ); + ok( ret, "GetICMProfileW failed %d\n", GetLastError() ); + + ret = GetICMProfileW( dc, NULL, filename ); + ok( !ret, "GetICMProfileW succeeded\n" ); + + size = MAX_PATH; + ret = GetICMProfileW( NULL, &size, filename ); + ok( !ret, "GetICMProfileW succeeded\n" ); + + size = 0; + SetLastError(0xdeadbeef); + ret = GetICMProfileW( dc, &size, filename ); + error = GetLastError(); + ok( !ret, "GetICMProfileW succeeded\n" ); + ok( size, "expected size > 0\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %d, expected ERROR_INSUFFICIENT_BUFFER\n", error ); + + size = MAX_PATH; + ret = GetICMProfileW( dc, &size, filename ); + ok( ret, "GetICMProfileW failed %d\n", GetLastError() ); +} + +static void test_SetICMMode( HDC dc ) +{ + INT ret, knob, save; + + ret = SetICMMode( NULL, 0 ); + ok( !ret, "SetICMMode succeeded (%d)\n", GetLastError() ); + + ret = SetICMMode( dc, -1 ); + ok( !ret, "SetICMMode succeeded (%d)\n", GetLastError() ); + + save = SetICMMode( dc, ICM_QUERY ); + ok( save == ICM_ON || save == ICM_OFF, "SetICMMode failed (%d)\n", GetLastError() ); + + if (save == ICM_ON) knob = ICM_OFF; else knob = ICM_ON; + + ret = SetICMMode( dc, knob ); + todo_wine ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); + + ret = SetICMMode( dc, ICM_QUERY ); + todo_wine ok( ret == knob, "SetICMMode failed (%d)\n", GetLastError() ); + + ret = SetICMMode( dc, save ); + ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); + + dc = CreateDCW( displayW, NULL, NULL, NULL ); + ok( dc != NULL, "CreateDCW failed (%d)\n", GetLastError() ); + + ret = SetICMMode( dc, ICM_QUERY ); + ok( ret == ICM_OFF, "SetICMMode failed (%d)\n", GetLastError() ); + + DeleteDC( dc ); +} + +START_TEST(icm) +{ + HDC dc = GetDC( NULL ); + + test_GetICMProfileA( dc ); + test_GetICMProfileW( dc ); + test_SetICMMode( dc ); + + ReleaseDC( NULL, dc ); +}

1 0

Hans Leidekker : gdi32: Last parameter of GetICMProfile is an output parameter.
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 6f3607af0b4704cc02f60378a3225a7297c036ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3607af0b4704cc02f60378a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 21 16:32:31 2008 +0100 gdi32: Last parameter of GetICMProfile is an output parameter. --- dlls/gdi32/gdi32.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4b1b6a4..2d57ebb 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -288,8 +288,8 @@ @ stub GetGlyphOutlineWow @ stdcall GetGraphicsMode(long) # @ stub GetHFONT -@ stdcall GetICMProfileA(long ptr str) -@ stdcall GetICMProfileW(long ptr wstr) +@ stdcall GetICMProfileA(long ptr ptr) +@ stdcall GetICMProfileW(long ptr ptr) @ stdcall GetKerningPairs(long long ptr) GetKerningPairsA @ stdcall GetKerningPairsA(long long ptr) @ stdcall GetKerningPairsW(long long ptr)

1 0

Hans Leidekker : gdi32: Make GetICMProfile behave more like native. Rewrite ansi version as a wrapper and move color management functions to their own file .
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: 20c1e503e9848b3a661dccbe2028896344c6c388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c1e503e9848b3a661dccbe2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 21 16:33:03 2008 +0100 gdi32: Make GetICMProfile behave more like native. Rewrite ansi version as a wrapper and move color management functions to their own file. --- dlls/gdi32/icm.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/palette.c | 142 ------------------------------------------------- 2 files changed, 139 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20c1e503e9848b3a661dc…

1 0

Rob Shearman : ole32: Don' t get the HRESULT from the buffer if we get an RPC_S_CALL_FAILED status back from the runtime .
by Alexandre Julliard Jan. 22, 2008

Jan. 22, 2008

Module: wine Branch: master Commit: ee2250bc44d2b3ad844ba1d8809bda2ac21decd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2250bc44d2b3ad844ba1d88… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 21 22:54:43 2008 +0000 ole32: Don't get the HRESULT from the buffer if we get an RPC_S_CALL_FAILED status back from the runtime. The buffer might not contain any data and nowhere in our ole32 code passes HRESULTs in the buffer. --- dlls/ole32/rpc.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index e2f56fc..256ec04 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -893,12 +893,8 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - /* for normal RPC calls, faults are returned in first 4 bytes of the - * buffer */ TRACE("RPC call status: 0x%lx\n", status); - if (status == RPC_S_CALL_FAILED) - hrFault = *(HRESULT *)olemsg->Buffer; - else if (status != RPC_S_OK) + if (status != RPC_S_OK) hr = HRESULT_FROM_WIN32(status); TRACE("hrFault = 0x%08x\n", hrFault);

1 0