February 2010 - Wine-commits

Hans Leidekker : msi: Implement MSIRUNMODE_MAINTENANCE and MSIRUNMODE_REBOOTATEND for MsiGetMode .
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 65c68efc8dc2d211454857aba38271c0f956c209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c68efc8dc2d211454857aba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 18 12:47:21 2010 +0100 msi: Implement MSIRUNMODE_MAINTENANCE and MSIRUNMODE_REBOOTATEND for MsiGetMode. --- dlls/msi/install.c | 12 +++++++++++- dlls/msi/tests/automation.c | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 7a71867..6e19863 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -661,6 +661,8 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) MSIPACKAGE *package; BOOL r = FALSE; + TRACE("%d %d\n", hInstall, iRunMode); + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) { @@ -706,8 +708,16 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = package->commit_action_running; break; + case MSIRUNMODE_MAINTENANCE: + r = msi_get_property_int( package, szInstalled, 0 ) != 0; + break; + + case MSIRUNMODE_REBOOTATEND: + r = package->need_reboot; + break; + default: - FIXME("%d %d\n", hInstall, iRunMode); + FIXME("unimplemented run mode\n"); r = TRUE; } diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index cab6cb7..edc6cbe 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1863,11 +1863,11 @@ static void test_Session(IDispatch *pSession) /* Session::Mode, get */ hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); - todo_wine ok(!bool, "Reboot at end session mode is %d\n", bool); + ok(!bool, "Reboot at end session mode is %d\n", bool); hr = Session_ModeGet(pSession, MSIRUNMODE_MAINTENANCE, &bool); ok(hr == S_OK, "Session_ModeGet failed, hresult 0x%08x\n", hr); - todo_wine ok(!bool, "Maintenance mode is %d\n", bool); + ok(!bool, "Maintenance mode is %d\n", bool); /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE);

1 0

Huw Davies : fonts: Add a 9 ppem bitmap strike to Tahoma Bold.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: b10f8f254e7c424d80e503d00294de5ff880851f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10f8f254e7c424d80e503d00… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 18 12:36:36 2010 +0000 fonts: Add a 9 ppem bitmap strike to Tahoma Bold. --- fonts/tahomabd.sfd | 1009 ++++++++++++++++++++++++++++++++++++++++++++++++---- fonts/tahomabd.ttf | Bin 80408 -> 86440 bytes 2 files changed, 937 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b10f8f254e7c424d80e50…

1 0

Dmitry Timoshkov : comctl32: Listview should accept both unicode and ansi notifications.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: c1fd55d6c9b81ca2a3e1ae00b8078d83088ac56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fd55d6c9b81ca2a3e1ae00b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 18 20:46:27 2010 +0800 comctl32: Listview should accept both unicode and ansi notifications. Listview receives notifications not only from built-in header control, but also from custom or subclassed application controls, there is no need to assert(0) on application input, printing a FIXME is the maximum we can do on an unknown input. --- dlls/comctl32/listview.c | 18 +++++++++++++++--- dlls/comctl32/tests/listview.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cf06e09..2d39675 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -753,25 +753,37 @@ static int get_ansi_notification(UINT unicodeNotificationCode) { switch (unicodeNotificationCode) { + case LVN_BEGINLABELEDITA: case LVN_BEGINLABELEDITW: return LVN_BEGINLABELEDITA; + case LVN_ENDLABELEDITA: case LVN_ENDLABELEDITW: return LVN_ENDLABELEDITA; + case LVN_GETDISPINFOA: case LVN_GETDISPINFOW: return LVN_GETDISPINFOA; + case LVN_SETDISPINFOA: case LVN_SETDISPINFOW: return LVN_SETDISPINFOA; + case LVN_ODFINDITEMA: case LVN_ODFINDITEMW: return LVN_ODFINDITEMA; + case LVN_GETINFOTIPA: case LVN_GETINFOTIPW: return LVN_GETINFOTIPA; /* header forwards */ + case HDN_TRACKA: case HDN_TRACKW: return HDN_TRACKA; + case HDN_ENDTRACKA: case HDN_ENDTRACKW: return HDN_ENDTRACKA; case HDN_BEGINDRAG: return HDN_BEGINDRAG; case HDN_ENDDRAG: return HDN_ENDDRAG; + case HDN_ITEMCHANGINGA: case HDN_ITEMCHANGINGW: return HDN_ITEMCHANGINGA; + case HDN_ITEMCHANGEDA: case HDN_ITEMCHANGEDW: return HDN_ITEMCHANGEDA; + case HDN_ITEMCLICKA: case HDN_ITEMCLICKW: return HDN_ITEMCLICKA; + case HDN_DIVIDERDBLCLICKA: case HDN_DIVIDERDBLCLICKW: return HDN_DIVIDERDBLCLICKA; + default: break; } - ERR("unknown notification %x\n", unicodeNotificationCode); - assert(FALSE); - return 0; + FIXME("unknown notification %x\n", unicodeNotificationCode); + return unicodeNotificationCode; } /* forwards header notifications to listview parent */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9014f72..0a147b6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4290,6 +4290,45 @@ static void test_destroynotify(void) ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_destroy, "check destroy order", FALSE); } +static void test_header_notification(void) +{ + HWND list, header; + HDITEMA item; + NMHEADER nmh; + LVCOLUMNA col; + LRESULT ret; + + list = create_listview_control(LVS_REPORT); + ok(list != 0, "failed to create listview window\n"); + + memset(&col, 0, sizeof(col)); + col.mask = LVCF_WIDTH; + col.cx = 100; + ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); + ok(!ret, "expected 0, got %ld\n", ret); + + header = subclass_header(list); + + ret = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); + ok(ret == 1, "expected header item count 1, got %ld\n", ret); + + ret = SendMessage(header, HDM_GETITEMA, 0, (LPARAM)&item); + ok(ret, "HDM_GETITEM failed\n"); + + nmh.hdr.hwndFrom = header; + nmh.hdr.idFrom = GetWindowLongPtr(header, GWLP_ID); + nmh.hdr.code = HDN_ITEMCHANGEDA; + nmh.iItem = 0; + nmh.iButton = 0; + item.mask = HDI_WIDTH; + item.cxy = 50; + nmh.pitem = &item; + ret = SendMessage(list, WM_NOTIFY, 0, (LPARAM)&nmh); + ok(!ret, "WM_NOTIFY/HDN_ITEMCHANGED failed\n"); + + DestroyWindow(list); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4318,6 +4357,7 @@ START_TEST(listview) g_is_below_5 = is_below_comctl_5(); + test_header_notification(); test_images(); test_checkboxes(); test_items();

1 0

Andrew Nguyen : winnls32: Restore the correct export names.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: f8ae018423bb734a05029ed2acd97ba12aa4045d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ae018423bb734a05029ed2a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Feb 17 13:48:42 2010 -0600 winnls32: Restore the correct export names. --- dlls/winnls.dll16/winnls.c | 7 +++++-- dlls/winnls32/winnls.c | 8 ++++---- dlls/winnls32/winnls32.spec | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winnls.dll16/winnls.c b/dlls/winnls.dll16/winnls.c index 778c254..efe64ff 100644 --- a/dlls/winnls.dll16/winnls.c +++ b/dlls/winnls.dll16/winnls.c @@ -24,12 +24,15 @@ #include "wownt32.h" #include "wine/winuser16.h" +BOOL WINAPI WINNLS32EnableIME(HWND hWnd, BOOL fEnable); +BOOL WINAPI WINNLS32GetEnableStatus(HWND hWnd); + /*********************************************************************** * WINNLSEnableIME (WINNLS.16) */ BOOL WINAPI WINNLSEnableIME16( HWND16 hwnd, BOOL enable ) { - return WINNLSEnableIME( HWND_32(hwnd), enable ); + return WINNLS32EnableIME( HWND_32(hwnd), enable ); } /*********************************************************************** @@ -37,5 +40,5 @@ BOOL WINAPI WINNLSEnableIME16( HWND16 hwnd, BOOL enable ) */ BOOL WINAPI WINNLSGetEnableStatus16( HWND16 hwnd ) { - return WINNLSGetEnableStatus( HWND_32(hwnd) ); + return WINNLS32GetEnableStatus( HWND_32(hwnd) ); } diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 2366815..517a53c 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -39,17 +39,17 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } /*********************************************************************** - * WINNLSGetEnableStatus (WINNLS32.2) + * WINNLS32GetEnableStatus (WINNLS32.2) */ -BOOL WINAPI WINNLSGetEnableStatus(HWND hWnd) +BOOL WINAPI WINNLS32GetEnableStatus(HWND hWnd) { return FALSE; } /*********************************************************************** - * WINNLSEnableIME (WINNLS32.1) + * WINNLS32EnableIME (WINNLS32.1) */ -BOOL WINAPI WINNLSEnableIME(HWND hWnd, BOOL fEnable) +BOOL WINAPI WINNLS32EnableIME(HWND hWnd, BOOL fEnable) { /* fake return of previous status. is this what this function should do ? */ return !fEnable; diff --git a/dlls/winnls32/winnls32.spec b/dlls/winnls32/winnls32.spec index 18bffea..34e0d42 100644 --- a/dlls/winnls32/winnls32.spec +++ b/dlls/winnls32/winnls32.spec @@ -1,5 +1,5 @@ -1 stdcall WINNLSEnableIME(long long) -2 stdcall WINNLSGetEnableStatus(long) +1 stdcall WINNLS32EnableIME(long long) +2 stdcall WINNLS32GetEnableStatus(long) 3 stub WINNLS32GetIMEHotKey 21 stub IMP32GetIME 22 stub IMP32QueryIME

1 0

Marcus Meissner : winedbg: Segment registers are not affected by rex prefix (Coverity).
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: a3afe94831e23f1595a59b4258df9f5a23f3d8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3afe94831e23f1595a59b425… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 18 00:06:16 2010 +0100 winedbg: Segment registers are not affected by rex prefix (Coverity). --- programs/winedbg/db_disasm64.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 4d4e2eb..d7f7c03 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -1495,11 +1495,11 @@ db_disasm(db_addr_t loc, boolean_t altfmt) break; case S: - db_printf("%s", db_seg_reg[f_reg(rex, regmodrm)]); + db_printf("%s", db_seg_reg[f_reg(0, regmodrm)]); break; case Si: - db_printf("%s", db_seg_reg[f_reg(rex, inst)]); + db_printf("%s", db_seg_reg[f_reg(0, inst)]); break; case A:

1 0

Piotr Caban : oleaut32: Store CreateTypeInfo->typedata in list.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: d1c174837f8a93cedcb69b997f71f20de0041809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c174837f8a93cedcb69b997… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 03:19:41 2010 +0100 oleaut32: Store CreateTypeInfo->typedata in list. --- dlls/oleaut32/typelib2.c | 105 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 86 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 4c90f61..8c27916 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -116,6 +116,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(typelib2); /*================== Implementation Structures ===================================*/ +/* Used for storing cyclic list. Tail address is kept */ +typedef struct tagCyclicList { + struct tagCyclicList *next; + union { + int val; + int *data; + }u; +} CyclicList; + enum MSFT_segment_index { MSFT_SEG_TYPEINFO = 0, /* type information */ MSFT_SEG_IMPORTINFO, /* import information */ @@ -181,9 +190,7 @@ typedef struct tagICreateTypeInfo2Impl ICreateTypeLib2Impl *typelib; MSFT_TypeInfoBase *typeinfo; - INT *typedata; - int typedata_allocated; - int typedata_length; + struct tagCyclicList *typedata; /* tail of cyclic list */ int indices[42]; int names[42]; @@ -1376,6 +1383,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + CyclicList *insert; int offset; int *typedata; int i; @@ -1387,14 +1395,31 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* return E_OUTOFMEMORY; */ if (!This->typedata) { - This->typedata = HeapAlloc(GetProcessHeap(), 0, 0x2000); - This->typedata[0] = 0; + This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + if(!This->typedata) + return E_OUTOFMEMORY; + + This->typedata->next = This->typedata; + This->typedata->u.val = 0; } /* allocate type data space for us */ - offset = This->typedata[0]; - This->typedata[0] += 0x18 + (pFuncDesc->cParams * 12); - typedata = This->typedata + (offset >> 2) + 1; + insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + if(!insert) + return E_OUTOFMEMORY; + insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[3])*pFuncDesc->cParams); + if(!insert->u.data) { + HeapFree(GetProcessHeap(), 0, insert); + return E_OUTOFMEMORY; + } + + insert->next = This->typedata->next; + This->typedata->next = insert; + This->typedata = insert; + + offset = This->typedata->next->u.val; + This->typedata->next->u.val += 0x18 + (pFuncDesc->cParams * 12); + typedata = This->typedata->u.data; /* fill out the basic type information */ typedata[0] = (0x18 + (pFuncDesc->cParams * 12)) | (index << 16); @@ -1614,6 +1639,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( VARDESC* pVarDesc) { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + + CyclicList *insert; int offset; INT *typedata; int var_datawidth; @@ -1633,14 +1660,31 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( } if (!This->typedata) { - This->typedata = HeapAlloc(GetProcessHeap(), 0, 0x2000); - This->typedata[0] = 0; + This->typedata = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + if(!This->typedata) + return E_OUTOFMEMORY; + + This->typedata->next = This->typedata; + This->typedata->u.val = 0; } /* allocate type data space for us */ - offset = This->typedata[0]; - This->typedata[0] += 0x14; - typedata = This->typedata + (offset >> 2) + 1; + insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); + if(!insert) + return E_OUTOFMEMORY; + insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[5])); + if(!insert->u.data) { + HeapFree(GetProcessHeap(), 0, insert); + return E_OUTOFMEMORY; + } + + insert->next = This->typedata->next; + This->typedata->next = insert; + This->typedata = insert; + + offset = This->typedata->next->u.val; + This->typedata->next->u.val += 0x14; + typedata = This->typedata->u.data; /* fill out the basic type information */ typedata[0] = 0x14 | (index << 16); @@ -1708,6 +1752,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + CyclicList *iter; UINT i; int offset; char *namedata; @@ -1723,12 +1768,14 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; } + iter = This->typedata->next->next; + for(i=0; i<index; i++) + iter = iter->next; + for (i = 1; i < cNames; i++) { /* FIXME: Almost certainly easy to break */ - int *paramdata = &This->typedata[This->offsets[index] >> 2]; - offset = ctl2_alloc_name(This->typelib, rgszNames[i]); - paramdata[(i * 3) + 5] = offset; + iter->u.data[(i * 3) + 5] = offset; } return S_OK; @@ -3049,7 +3096,21 @@ static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) while (This->typeinfos) { ICreateTypeInfo2Impl *typeinfo = This->typeinfos; This->typeinfos = typeinfo->next_typeinfo; - HeapFree(GetProcessHeap(), 0, typeinfo->typedata); + if(typeinfo->typedata) { + CyclicList *iter, *rem; + + rem = typeinfo->typedata->next; + typeinfo->typedata->next = NULL; + iter = rem->next; + HeapFree(GetProcessHeap(), 0, rem); + + while(iter) { + rem = iter; + iter = iter->next; + HeapFree(GetProcessHeap(), 0, rem->u.data); + HeapFree(GetProcessHeap(), 0, rem); + } + } HeapFree(GetProcessHeap(), 0, typeinfo); } @@ -3273,7 +3334,7 @@ static void ctl2_finalize_typeinfos(ICreateTypeLib2Impl *This, int filesize) typeinfo->typeinfo->memoffset = filesize; if (typeinfo->typedata) { ICreateTypeInfo2_fnLayOut((ICreateTypeInfo2 *)typeinfo); - filesize += typeinfo->typedata[0] + ((typeinfo->typeinfo->cElement >> 16) * 12) + ((typeinfo->typeinfo->cElement & 0xffff) * 12) + 4; + filesize += typeinfo->typedata->next->u.val + ((typeinfo->typeinfo->cElement >> 16) * 12) + ((typeinfo->typeinfo->cElement & 0xffff) * 12) + 4; } } } @@ -3294,9 +3355,15 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) ICreateTypeInfo2Impl *typeinfo; for (typeinfo = This->typeinfos; typeinfo; typeinfo = typeinfo->next_typeinfo) { + CyclicList *iter; + if (!typeinfo->typedata) continue; - ctl2_write_chunk(hFile, typeinfo->typedata, typeinfo->typedata[0] + 4); + iter = typeinfo->typedata->next; + ctl2_write_chunk(hFile, &iter->u.val, sizeof(int)); + for(iter=iter->next; iter!=typeinfo->typedata->next; iter=iter->next) + ctl2_write_chunk(hFile, iter->u.data, iter->u.data[0] & 0xffff); + ctl2_write_chunk(hFile, typeinfo->indices, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); ctl2_write_chunk(hFile, typeinfo->names, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); ctl2_write_chunk(hFile, typeinfo->offsets, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4);

1 0

Piotr Caban : oleaut32: Compute TypeInfo offsets while writing data.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 21bfd64e6c3285972d43f28d912d270ee0be317e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfd64e6c3285972d43f28d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 03:20:33 2010 +0100 oleaut32: Compute TypeInfo offsets while writing data. --- dlls/oleaut32/typelib2.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8c27916..eb30724 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -194,7 +194,6 @@ typedef struct tagICreateTypeInfo2Impl int indices[42]; int names[42]; - int offsets[42]; int datawidth; @@ -1384,7 +1383,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; CyclicList *insert; - int offset; int *typedata; int i; int decoded_size; @@ -1417,7 +1415,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( This->typedata->next = insert; This->typedata = insert; - offset = This->typedata->next->u.val; This->typedata->next->u.val += 0x18 + (pFuncDesc->cParams * 12); typedata = This->typedata->u.data; @@ -1450,7 +1447,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* update the index data */ This->indices[index] = ((0x6000 | This->typeinfo->cImplTypes) << 16) | index; This->names[index] = -1; - This->offsets[index] = offset; /* ??? */ if (!This->typeinfo->res2) This->typeinfo->res2 = 0x20; @@ -1641,7 +1637,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; CyclicList *insert; - int offset; INT *typedata; int var_datawidth; int var_alignment; @@ -1682,7 +1677,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( This->typedata->next = insert; This->typedata = insert; - offset = This->typedata->next->u.val; This->typedata->next->u.val += 0x14; typedata = This->typedata->u.data; @@ -1694,7 +1688,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* update the index data */ This->indices[index] = 0x40000000 + index; This->names[index] = -1; - This->offsets[index] = offset; /* figure out type widths and whatnot */ ctl2_encode_typedesc(This->typelib, &pVarDesc->elemdescVar.tdesc, @@ -3356,6 +3349,7 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) for (typeinfo = This->typeinfos; typeinfo; typeinfo = typeinfo->next_typeinfo) { CyclicList *iter; + int offset = 0; if (!typeinfo->typedata) continue; @@ -3366,7 +3360,11 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) ctl2_write_chunk(hFile, typeinfo->indices, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); ctl2_write_chunk(hFile, typeinfo->names, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); - ctl2_write_chunk(hFile, typeinfo->offsets, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); + + for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) { + ctl2_write_chunk(hFile, &offset, sizeof(int)); + offset += iter->u.data[0] & 0xffff; + } } }

1 0

Piotr Caban : oleaut32: Store indices in list.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 8354e376282590f602abb9cdfe41acc715e02e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8354e376282590f602abb9cdf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 03:20:57 2010 +0100 oleaut32: Store indices in list. --- dlls/oleaut32/typelib2.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index eb30724..21e9c73 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -119,6 +119,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(typelib2); /* Used for storing cyclic list. Tail address is kept */ typedef struct tagCyclicList { struct tagCyclicList *next; + int indice; + union { int val; int *data; @@ -192,7 +194,6 @@ typedef struct tagICreateTypeInfo2Impl struct tagCyclicList *typedata; /* tail of cyclic list */ - int indices[42]; int names[42]; int datawidth; @@ -1445,7 +1446,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( } /* update the index data */ - This->indices[index] = ((0x6000 | This->typeinfo->cImplTypes) << 16) | index; + insert->indice = ((0x6000 | This->typeinfo->cImplTypes) << 16) | index; This->names[index] = -1; /* ??? */ @@ -1686,7 +1687,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( typedata[3] = (sizeof(VARDESC) << 16) | 0; /* update the index data */ - This->indices[index] = 0x40000000 + index; + insert->indice = 0x40000000 + index; This->names[index] = -1; /* figure out type widths and whatnot */ @@ -3358,7 +3359,9 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) for(iter=iter->next; iter!=typeinfo->typedata->next; iter=iter->next) ctl2_write_chunk(hFile, iter->u.data, iter->u.data[0] & 0xffff); - ctl2_write_chunk(hFile, typeinfo->indices, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); + for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) + ctl2_write_chunk(hFile, &iter->indice, sizeof(int)); + ctl2_write_chunk(hFile, typeinfo->names, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) {

1 0

Piotr Caban : oleaut32: Store names in list.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 12feffe49eef72abaef49a9e7067d24deedeeb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=12feffe49eef72abaef49a9e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 18 03:21:21 2010 +0100 oleaut32: Store names in list. --- dlls/oleaut32/typelib2.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 21e9c73..347ab7a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -120,6 +120,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(typelib2); typedef struct tagCyclicList { struct tagCyclicList *next; int indice; + int name; union { int val; @@ -194,8 +195,6 @@ typedef struct tagICreateTypeInfo2Impl struct tagCyclicList *typedata; /* tail of cyclic list */ - int names[42]; - int datawidth; struct tagICreateTypeInfo2Impl *next_typeinfo; @@ -1447,7 +1446,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* update the index data */ insert->indice = ((0x6000 | This->typeinfo->cImplTypes) << 16) | index; - This->names[index] = -1; + insert->name = -1; /* ??? */ if (!This->typeinfo->res2) This->typeinfo->res2 = 0x20; @@ -1688,7 +1687,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( /* update the index data */ insert->indice = 0x40000000 + index; - This->names[index] = -1; + insert->name = -1; /* figure out type widths and whatnot */ ctl2_encode_typedesc(This->typelib, &pVarDesc->elemdescVar.tdesc, @@ -1754,7 +1753,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( FIXME("(%p,%d,%s,%d), stub!\n", iface, index, debugstr_w(*rgszNames), cNames); offset = ctl2_alloc_name(This->typelib, rgszNames[0]); - This->names[index] = offset; namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; namedata[9] &= ~0x10; @@ -1766,6 +1764,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( for(i=0; i<index; i++) iter = iter->next; + iter->name = offset; + for (i = 1; i < cNames; i++) { /* FIXME: Almost certainly easy to break */ offset = ctl2_alloc_name(This->typelib, rgszNames[i]); @@ -1786,7 +1786,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName( LPOLESTR szName) { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; - int offset; + CyclicList *iter; + int offset, i; char *namedata; TRACE("(%p,%d,%s), stub!\n", iface, index, debugstr_w(szName)); @@ -1807,8 +1808,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName( if ((This->typeinfo->typekind & 15) == TKIND_ENUM) { namedata[9] |= 0x20; } - This->names[index] = offset; + iter = This->typedata->next->next; + for(i=0; i<index; i++) + iter = iter->next; + + iter->name = offset; return S_OK; } @@ -3362,7 +3367,8 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) ctl2_write_chunk(hFile, &iter->indice, sizeof(int)); - ctl2_write_chunk(hFile, typeinfo->names, ((typeinfo->typeinfo->cElement & 0xffff) + (typeinfo->typeinfo->cElement >> 16)) * 4); + for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) + ctl2_write_chunk(hFile, &iter->name, sizeof(int)); for(iter=typeinfo->typedata->next->next; iter!=typeinfo->typedata->next; iter=iter->next) { ctl2_write_chunk(hFile, &offset, sizeof(int));

1 0

Dan Kegel : cmd: Fix 'else', with tests.
by Alexandre Julliard 18 Feb '10

18 Feb '10

Module: wine Branch: master Commit: 8110dde8ae405081459b62ae2dbf0710c8332b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8110dde8ae405081459b62ae2… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Feb 17 23:11:04 2010 -0800 cmd: Fix 'else', with tests. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 13 +++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d1019cc..fdb4404 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1072,7 +1072,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, /* Execute any statements appended to the line */ /* FIXME: Only if previous call worked for && or failed for || */ if ((*cmdList)->prevDelim == CMD_ONFAILURE || - (*cmdList)->prevDelim != CMD_ONSUCCESS) { + (*cmdList)->prevDelim == CMD_ONSUCCESS) { if (processThese && (*cmdList)->command) { WCMD_execute ((*cmdList)->command, (*cmdList)->redirects, variable, value, cmdList); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2c30f6c..317fbdd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -23,3 +23,16 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir + +echo ------------ Testing if/else -------------- +echo if/else should work with blocks +if 0 == 0 ( + echo if seems to work +) else ( + echo if seems to be broken +) +if 1 == 0 ( + echo else seems to be broken +) else ( + echo else seems to work +) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a72e35d..c53aa1f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -16,3 +16,7 @@ bar ~dp0 should be directory containing batch file @pwd@\ @pwd@\ +------------ Testing if/else -------------- +if/else should work with blocks +if seems to work +else seems to work

1 0