September 2007 - Wine-commits

Alex Villacís Lasso : iccvid: Guard against null pointer reference.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: bbe9104514b696eb681d2f9961e7152f2e4bb4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe9104514b696eb681d2f996… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Sep 15 21:30:36 2007 -0500 iccvid: Guard against null pointer reference. --- dlls/iccvid/iccvid.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index b3e98bf..a34e58c 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -872,6 +872,11 @@ static LRESULT ICCVID_Decompress( ICCVID_Info *info, ICDECOMPRESS *icd, DWORD si if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; + if (info->cvinfo==NULL) + { + ERR("ICM_DECOMPRESS sent after ICM_DECOMPRESS_END\n"); + return ICERR_BADPARAM; + } width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; @@ -890,6 +895,11 @@ static LRESULT ICCVID_DecompressEx( ICCVID_Info *info, ICDECOMPRESSEX *icd, DWOR if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; + if (info->cvinfo==NULL) + { + ERR("ICM_DECOMPRESSEX sent after ICM_DECOMPRESS_END\n"); + return ICERR_BADPARAM; + } /* FIXME: flags are ignored */

1 0

Alex Villacís Lasso : riched20: Prevent overflow on richedit debug channel.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 157a0199e99690601e64c4b808a8b737213aa1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157a0199e99690601e64c4b80… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat Sep 15 21:32:20 2007 -0500 riched20: Prevent overflow on richedit debug channel. --- dlls/riched20/writer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fa9efa0..68088f7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -92,7 +92,7 @@ ME_StreamOutMove(ME_OutStream *pStream, const char *buffer, int len) int space = STREAMOUT_BUFFER_SIZE - pStream->pos; int fit = min(space, len); - TRACE("%u:%u:%.*s\n", pStream->pos, fit, fit, buffer); + TRACE("%u:%u:%s\n", pStream->pos, fit, debugstr_an(buffer,fit)); memmove(pStream->buffer + pStream->pos, buffer, fit); len -= fit; buffer += fit;

1 0

Alexandre Julliard : ntdll: Fix an error message.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: eb22539efa03341c29b90ab7be17de5325661d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb22539efa03341c29b90ab7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 13:42:01 2007 +0200 ntdll: Fix an error message. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e920504..bf35a47 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1187,7 +1187,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc break; case FSCTL_PIPE_IMPERSONATE: - FIXME("FSCTL_PIPE_DISCONNECT: impersonating self\n"); + FIXME("FSCTL_PIPE_IMPERSONATE: impersonating self\n"); status = RtlImpersonateSelf( SecurityImpersonation ); break;

1 0

James Hawkins : kernel32: Fix the case where memory is freed twice in GlobalFree.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 40dff81b5ac79f30e07eac6d242bbfbba4ee2c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40dff81b5ac79f30e07eac6d2… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Sep 16 18:28:56 2007 -0500 kernel32: Fix the case where memory is freed twice in GlobalFree. --- dlls/kernel32/heap.c | 6 +++- dlls/kernel32/tests/heap.c | 12 +++++++ dlls/user32/tests/dde.c | 72 ++++++++++++++----------------------------- 3 files changed, 41 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 98552ca..005a9fe 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -741,7 +741,11 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) hreturned = 0; if(ISPOINTER(hmem)) /* POINTER */ { - if(!HeapFree(GetProcessHeap(), 0, (LPVOID) hmem)) hmem = 0; + if(!HeapFree(GetProcessHeap(), 0, (LPVOID) hmem)) + { + SetLastError(ERROR_INVALID_HANDLE); + hreturned = hmem; + } } else /* HANDLE */ { diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index a02a8d4..66155ef 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -176,6 +176,18 @@ START_TEST(heap) "returned %d with %d (expected ERROR_INVALID_HANDLE)\n", res, GetLastError()); + gbl = GlobalAlloc(GMEM_DDESHARE, 100); + + /* first free */ + mem = GlobalFree(gbl); + ok(mem == NULL, "Expected NULL, got %p\n", mem); + + /* invalid free */ + SetLastError(MAGIC_DEAD); + mem = GlobalFree(gbl); + ok(mem == gbl, "Expected gbl, got %p\n", mem); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); /* ####################################### */ /* Local*() functions */ diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 054c686..e51391f 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -399,12 +399,9 @@ static void test_FreeDDElParam(void) ret = FreeDDElParam(WM_DDE_ADVISE, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); val = GlobalFree(hglobal); - todo_wine - { - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(val == hglobal, "Expected hglobal, got %p\n", val); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_UNADVISE, (LPARAM)hglobal); @@ -416,23 +413,17 @@ static void test_FreeDDElParam(void) ret = FreeDDElParam(WM_DDE_ACK, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); val = GlobalFree(hglobal); - todo_wine - { - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(val == hglobal, "Expected hglobal, got %p\n", val); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_DATA, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); val = GlobalFree(hglobal); - todo_wine - { - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(val == hglobal, "Expected hglobal, got %p\n", val); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_REQUEST, (LPARAM)hglobal); @@ -444,12 +435,9 @@ static void test_FreeDDElParam(void) ret = FreeDDElParam(WM_DDE_POKE, (LPARAM)hglobal); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); val = GlobalFree(hglobal); - todo_wine - { - ok(val == hglobal, "Expected hglobal, got %p\n", val); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(val == hglobal, "Expected hglobal, got %p\n", val); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hglobal = GlobalAlloc(GMEM_DDESHARE, 100); ret = FreeDDElParam(WM_DDE_EXECUTE, (LPARAM)hglobal); @@ -519,12 +507,9 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); hglobal = GlobalFree((HGLOBAL)lparam); - todo_wine - { - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lparam = PackDDElParam(WM_DDE_UNADVISE, 0xcafe, 0xbeef); ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); @@ -564,12 +549,9 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); hglobal = GlobalFree((HGLOBAL)lparam); - todo_wine - { - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lparam = PackDDElParam(WM_DDE_DATA, 0xcafe, 0xbeef); ptr = GlobalLock((HGLOBAL)lparam); @@ -593,12 +575,9 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); hglobal = GlobalFree((HGLOBAL)lparam); - todo_wine - { - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lparam = PackDDElParam(WM_DDE_REQUEST, 0xcafe, 0xbeef); ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); @@ -638,12 +617,9 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret); hglobal = GlobalFree((HGLOBAL)lparam); - todo_wine - { - ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } + ok(hglobal == (HGLOBAL)lparam, "Expected lparam, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); lparam = PackDDElParam(WM_DDE_EXECUTE, 0xcafe, 0xbeef); ok(lparam == 0xbeef, "Expected 0xbeef, got %08lx\n", lparam);

1 0

James Hawkins : kernel32: Return TRUE for all pointer params in GlobalUnlock.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 72a3f1833873cc0e84c4b6639eaf13e6a4ec497c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a3f1833873cc0e84c4b6639… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Sep 16 18:30:20 2007 -0500 kernel32: Return TRUE for all pointer params in GlobalUnlock. --- dlls/kernel32/heap.c | 2 +- dlls/kernel32/tests/heap.c | 8 ++++++++ dlls/user32/tests/dde.c | 20 ++++---------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 005a9fe..b526af0 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -480,7 +480,7 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) PGLOBAL32_INTERN pintern; BOOL locked; - if (ISPOINTER(hmem)) return FALSE; + if (ISPOINTER(hmem)) return TRUE; RtlLockHeap(GetProcessHeap()); __TRY diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 66155ef..34393e8 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -189,6 +189,14 @@ START_TEST(heap) ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + gbl = GlobalAlloc(GMEM_DDESHARE, 100); + + res = GlobalUnlock(gbl); + ok(res == 1, "Expected 1, got %d\n", res); + + res = GlobalUnlock(gbl); + ok(res == 1, "Expected 1, got %d\n", res); + /* ####################################### */ /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e51391f..b12eb15 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -492,10 +492,7 @@ static void test_PackDDElParam(void) ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); ret = GlobalUnlock((HGLOBAL)lparam); - todo_wine - { - ok(ret == 1, "Expected 1, got %d\n", ret); - } + ok(ret == 1, "Expected 1, got %d\n", ret); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_ADVISE, lparam, &lo, &hi); @@ -534,10 +531,7 @@ static void test_PackDDElParam(void) ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); ret = GlobalUnlock((HGLOBAL)lparam); - todo_wine - { - ok(ret == 1, "Expected 1, got %d\n", ret); - } + ok(ret == 1, "Expected 1, got %d\n", ret); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); @@ -560,10 +554,7 @@ static void test_PackDDElParam(void) ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); ret = GlobalUnlock((HGLOBAL)lparam); - todo_wine - { - ok(ret == 1, "Expected 1, got %d\n", ret); - } + ok(ret == 1, "Expected 1, got %d\n", ret); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_DATA, lparam, &lo, &hi); @@ -602,10 +593,7 @@ static void test_PackDDElParam(void) ok(ptr[1] == 0xbeef, "Expected 0xbeef, got %08lx\n", ptr[1]); ret = GlobalUnlock((HGLOBAL)lparam); - todo_wine - { - ok(ret == 1, "Expected 1, got %d\n", ret); - } + ok(ret == 1, "Expected 1, got %d\n", ret); lo = hi = 0; ret = UnpackDDElParam(WM_DDE_POKE, lparam, &lo, &hi);

1 0

James Hawkins : user32: Add tests for the DDE pack functions.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 1eaeb3e0cdaf0999ece753ae8d6058e7779f453e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eaeb3e0cdaf0999ece753ae8… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Sep 16 18:26:07 2007 -0500 user32: Add tests for the DDE pack functions. --- dlls/user32/tests/dde.c | 438 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 436 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1eaeb3e0cdaf0999ece75…

1 0

James Hawkins : user32: Set uiLo and uiHi to zero on error.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 2cd2f122568928452b132d43c09373f5a1bd030d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd2f122568928452b132d43c… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Sep 16 18:27:02 2007 -0500 user32: Set uiLo and uiHi to zero on error. --- dlls/user32/dde_misc.c | 6 +++--- dlls/user32/tests/dde.c | 35 ++++++++++------------------------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index cac3192..974fde3 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -126,10 +126,10 @@ BOOL WINAPI UnpackDDElParam(UINT msg, LPARAM lParam, case WM_DDE_ADVISE: case WM_DDE_DATA: case WM_DDE_POKE: - if (!lParam) return FALSE; - if (!(params = GlobalLock( (HGLOBAL)lParam ))) + if (!lParam || !(params = GlobalLock((HGLOBAL)lParam))) { - ERR("GlobalLock failed (%lx)\n", lParam); + if (uiLo) *uiLo = 0; + if (uiHi) *uiHi = 0; return FALSE; } TRACE("unpacked: low %08lx, high %08lx\n", params[0], params[1]); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 2175b1a..054c686 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -710,21 +710,15 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ADVISE, (LPARAM)NULL, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); - } + ok(lo == 0, "Expected 0, got %08lx\n", lo); + ok(hi == 0, "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ADVISE, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); - } + ok(lo == 0, "Expected 0, got %08lx\n", lo); + ok(hi == 0, "Expected 0, got %08lx\n", hi); hglobal = GlobalAlloc(GMEM_DDESHARE, 2); ptr = GlobalLock(hglobal); @@ -750,11 +744,8 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_ACK, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); - } + ok(lo == 0, "Expected 0, got %08lx\n", lo); + ok(hi == 0, "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef; @@ -767,11 +758,8 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_DATA, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); - } + ok(lo == 0, "Expected 0, got %08lx\n", lo); + ok(hi == 0, "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef; @@ -791,11 +779,8 @@ static void test_UnpackDDElParam(void) hi = 0xbeef; ret = UnpackDDElParam(WM_DDE_POKE, 0xcafebabe, &lo, &hi); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); - todo_wine - { - ok(lo == 0, "Expected 0, got %08lx\n", lo); - ok(hi == 0, "Expected 0, got %08lx\n", hi); - } + ok(lo == 0, "Expected 0, got %08lx\n", lo); + ok(hi == 0, "Expected 0, got %08lx\n", hi); lo = 0xdead; hi = 0xbeef;

1 0

Rob Shearman : widl: Add support for strings embedded in structures.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: f7fbfc7da5ce14a6b2548cc23c9971fa434d4ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fbfc7da5ce14a6b2548cc23… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Sep 17 09:46:01 2007 +0100 widl: Add support for strings embedded in structures. --- tools/widl/typegen.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 02b2cbc..a15a969 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2041,6 +2041,10 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty retmask |= 1; } } + else if (last_array(type) && is_attr(attrs, ATTR_STRING)) + { + write_string_tfs(file, attrs, type, name, tfsoff); + } else if (type->declarray && is_conformant_array(type)) ; /* conformant arrays and strings are handled specially */ else if (is_array(type))

1 0

Rob Shearman : widl: Fix write_string_tfs for strings declared as arrays.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: 9a28119dd8e6b9fc715fe5b2f16d3e7881823bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a28119dd8e6b9fc715fe5b2f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Sep 17 09:46:22 2007 +0100 widl: Fix write_string_tfs for strings declared as arrays. The immediate type will be FC_*ARRAY, so rtype needs to use the referred type to get the base type. Also update the typeformat-string offset of the type. --- tools/widl/typegen.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a15a969..f585c1f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1341,12 +1341,14 @@ static int is_declptr(const type_t *t) } static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, - const type_t *type, + type_t *type, const char *name, unsigned int *typestring_offset) { size_t start_offset = *typestring_offset; unsigned char rtype; + update_tfsoff(type, start_offset, file); + if (is_declptr(type)) { unsigned char flag = is_conformant_array(type) ? 0 : RPC_FC_P_SIMPLEPOINTER; @@ -1365,7 +1367,7 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, rtype = type->ref->type; } else - rtype = type->type; + rtype = type->ref->type; if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) {

1 0

Rob Shearman : widl: Fix detection of complex arrays.
by Alexandre Julliard 17 Sep '07

17 Sep '07

Module: wine Branch: master Commit: b7618f91d71c8f535e60005ae5616ea697f4bee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7618f91d71c8f535e60005ae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Sep 16 22:28:30 2007 +0100 widl: Fix detection of complex arrays. --- tools/widl/header.c | 1 + tools/widl/parser.y | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c04222b..971b30f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -250,6 +250,7 @@ void write_type_left(FILE *h, type_t *t) case RPC_FC_OP: case RPC_FC_CARRAY: case RPC_FC_CVARRAY: + case RPC_FC_BOGUS_ARRAY: write_type_left(h, t->ref); fprintf(h, "%s*", needs_space_after(t->ref) ? " " : ""); break; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index cc5aca5..ac24038 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1363,6 +1363,10 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) (*ptype)->type = RPC_FC_BOGUS_ARRAY; } } + + /* if the structure is complex, then so must be the encompassing array */ + if (is_array(v->type) && (v->type->ref->type == RPC_FC_BOGUS_STRUCT)) + v->type->type = RPC_FC_BOGUS_ARRAY; } static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface) @@ -1812,6 +1816,7 @@ static int get_struct_type(var_list_t *fields) case RPC_FC_PAD: case RPC_FC_EMBEDDED_COMPLEX: case RPC_FC_BOGUS_STRUCT: + case RPC_FC_BOGUS_ARRAY: return RPC_FC_BOGUS_STRUCT; } }

1 0