February 2009 - Wine-Commits

Rob Shearman : ole32: Output the size that we didn' t expect in the HGLOBAL marshalling tests.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: db851a1d2a14b78b49fe5f34778471719c34d589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db851a1d2a14b78b49fe5f347… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Feb 8 18:02:07 2009 +0000 ole32: Output the size that we didn't expect in the HGLOBAL marshalling tests. --- dlls/ole32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index aa81e35..03ced75 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -199,11 +199,11 @@ static void test_marshal_HGLOBAL(void) wirehglobal += sizeof(ULONG); ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0x4 should be HGLOBAL\n"); wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == 4, "buffer+0x8 should be size of HGLOBAL\n"); + ok(*(ULONG *)wirehglobal == 4, "buffer+0x8 should be size of HGLOBAL instead of %d\n", *(ULONG *)wirehglobal); wirehglobal += sizeof(ULONG); ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0xc should be HGLOBAL\n"); wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == 4, "buffer+0x10 should be size of HGLOBAL\n"); + ok(*(ULONG *)wirehglobal == 4, "buffer+0x10 should be size of HGLOBAL instead of %d\n", *(ULONG *)wirehglobal); wirehglobal += sizeof(ULONG); for (i = 0; i < 4; i++) ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i);

1 0

Rob Shearman : ole32: Add framework in the ole2 tests for having optionally called methods.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: d26250fd0841a4bdbf463359bf633352a18ddcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26250fd0841a4bdbf463359b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Feb 8 18:03:13 2009 +0000 ole32: Add framework in the ole2 tests for having optionally called methods. --- dlls/ole32/tests/ole2.c | 306 +++++++++++++++++++++++++---------------------- 1 files changed, 162 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d26250fd0841a4bdbf463…

1 0

Rob Shearman : ole32: Fix some test failures in the HGLOBAL marshalling tests on 64-bit Windows.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: f2b17029aa8635dc83569980acdb567f72760e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b17029aa8635dc83569980a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Feb 8 18:01:14 2009 +0000 ole32: Fix some test failures in the HGLOBAL marshalling tests on 64-bit Windows. --- dlls/ole32/tests/usrmarshal.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index ef588ee..aa81e35 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -164,16 +164,16 @@ static void test_marshal_HGLOBAL(void) hglobal = NULL; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); - /* native is poorly programmed and allocates 4 bytes more than it needs to + /* native is poorly programmed and allocates 4/8 bytes more than it needs to * here - Wine doesn't have to emulate that */ - ok((size == 8) || (size == 12), "Size should be 12, instead of %d\n", size); + ok((size == 8) || broken(size == 12) || broken(size == 16), "Size should be 8, instead of %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); HGLOBAL_UserMarshal(&umcb.Flags, buffer, &hglobal); wirehglobal = buffer; ok(*(ULONG *)wirehglobal == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)wirehglobal); wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)hglobal, "buffer+4 should be HGLOBAL\n"); + ok(*(ULONG *)wirehglobal == 0, "buffer+4 should be HGLOBAL\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); ok(hglobal2 == hglobal, "Didn't unmarshal properly\n"); @@ -188,20 +188,20 @@ static void test_marshal_HGLOBAL(void) GlobalUnlock(hglobal); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); - /* native is poorly programmed and allocates 4 bytes more than it needs to + /* native is poorly programmed and allocates 4/8 bytes more than it needs to * here - Wine doesn't have to emulate that */ - ok((size == 24) || (size == 28), "Size should be 24 or 28, instead of %d\n", size); + ok((size == 24) || broken(size == 28) || broken(size == 32), "Size should be 24, instead of %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); HGLOBAL_UserMarshal(&umcb.Flags, buffer, &hglobal); wirehglobal = buffer; ok(*(ULONG *)wirehglobal == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)wirehglobal); wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)hglobal, "buffer+0x4 should be HGLOBAL\n"); + ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0x4 should be HGLOBAL\n"); wirehglobal += sizeof(ULONG); ok(*(ULONG *)wirehglobal == 4, "buffer+0x8 should be size of HGLOBAL\n"); wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)hglobal, "buffer+0xc should be HGLOBAL\n"); + ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0xc should be HGLOBAL\n"); wirehglobal += sizeof(ULONG); ok(*(ULONG *)wirehglobal == 4, "buffer+0x10 should be size of HGLOBAL\n"); wirehglobal += sizeof(ULONG);

1 0

Rob Shearman : ole32: Fix CLIPFORMAT marshalling on 64-bit platforms by not using the wireCLIPFORMAT type .
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 2eca96af67c607ad4c41f75794005471f1423e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eca96af67c607ad4c41f7579… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Feb 8 18:00:26 2009 +0000 ole32: Fix CLIPFORMAT marshalling on 64-bit platforms by not using the wireCLIPFORMAT type. The wireCLIPFORMAT represents the memory equivalent format of the wire format and not the wire format itself. Also update the tests to do the same. --- dlls/ole32/tests/usrmarshal.c | 12 +++---- dlls/ole32/usrmarshal.c | 71 +++++++++++++++++++++++++--------------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index cbb7dc3..ef588ee 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -95,25 +95,23 @@ static void test_marshal_CLIPFORMAT(void) RPC_MESSAGE rpc_msg; unsigned char *buffer; ULONG size; - wireCLIPFORMAT wirecf; CLIPFORMAT cf = RegisterClipboardFormatA("MyFormat"); CLIPFORMAT cf2; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = CLIPFORMAT_UserSize(&umcb.Flags, 0, &cf); - ok(size == sizeof(*wirecf) + sizeof(cf_marshaled), "Wrong size %d\n", size); + ok(size == 8 + sizeof(cf_marshaled), "CLIPFORMAT: Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); CLIPFORMAT_UserMarshal(&umcb.Flags, buffer, &cf); - wirecf = (wireCLIPFORMAT)buffer; - ok(wirecf->fContext == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08lx\n", wirecf->fContext); - ok(wirecf->u.dwValue == cf, "Marshaled value should be 0x%04x instead of 0x%04x\n", cf, wirecf->u.dwValue); - ok(!memcmp(wirecf+1, cf_marshaled, sizeof(cf_marshaled)), "Marshaled data differs\n"); + ok(*(LONG *)(buffer + 0) == WDT_REMOTE_CALL, "CLIPFORMAT: Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(LONG *)(buffer + 0)); + ok(*(DWORD *)(buffer + 4) == cf, "CLIPFORMAT: Marshaled value should be 0x%04x instead of 0x%04x\n", cf, *(DWORD *)(buffer + 4)); + ok(!memcmp(buffer + 8, cf_marshaled, sizeof(cf_marshaled)), "Marshaled data differs\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); CLIPFORMAT_UserUnmarshal(&umcb.Flags, buffer, &cf2); - ok(cf == cf2, "Didn't unmarshal properly\n"); + ok(cf == cf2, "CLIPFORMAT: Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 3af71df..afe456b 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -105,7 +105,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG StartingSize, CLIPFORM TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, pCF); - size += sizeof(userCLIPFORMAT); + size += 8; /* only need to marshal the name if it is not a pre-defined type and * we are going remote */ @@ -113,7 +113,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG StartingSize, CLIPFORM { WCHAR format[255]; INT ret; - size += 3 * sizeof(INT); + size += 3 * sizeof(UINT); /* urg! this function is badly designed because it won't tell us how * much space is needed without doing a dummy run of storing the * name into a buffer */ @@ -146,30 +146,30 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG StartingSize, CLIPFORM */ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF) { - wireCLIPFORMAT wirecf = (wireCLIPFORMAT)pBuffer; - TRACE("(%s, %p, &0x%04x\n", debugstr_user_flags(pFlags), pBuffer, *pCF); - wirecf->u.dwValue = *pCF; - pBuffer += sizeof(*wirecf); - /* only need to marshal the name if it is not a pre-defined type and * we are going remote */ if ((*pCF >= 0xc000) && (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE)) { WCHAR format[255]; - INT len; - wirecf->fContext = WDT_REMOTE_CALL; + UINT len; + + *(DWORD *)pBuffer = WDT_REMOTE_CALL; + pBuffer += 4; + *(DWORD *)pBuffer = *pCF; + pBuffer += 4; + len = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); if (!len) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); len += 1; - *(INT *)pBuffer = len; - pBuffer += sizeof(INT); - *(INT *)pBuffer = 0; - pBuffer += sizeof(INT); - *(INT *)pBuffer = len; - pBuffer += sizeof(INT); + *(UINT *)pBuffer = len; + pBuffer += sizeof(UINT); + *(UINT *)pBuffer = 0; + pBuffer += sizeof(UINT); + *(UINT *)pBuffer = len; + pBuffer += sizeof(UINT); TRACE("marshaling format name %s\n", debugstr_wn(format, len-1)); lstrcpynW((LPWSTR)pBuffer, format, len); pBuffer += len * sizeof(WCHAR); @@ -177,7 +177,12 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * pBuffer += sizeof(WCHAR); } else - wirecf->fContext = WDT_INPROC_CALL; + { + *(DWORD *)pBuffer = WDT_INPROC_CALL; + pBuffer += 4; + *(DWORD *)pBuffer = *pCF; + pBuffer += 4; + } return pBuffer; } @@ -203,24 +208,36 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * */ unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF) { - wireCLIPFORMAT wirecf = (wireCLIPFORMAT)pBuffer; + LONG fContext; TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, pCF); - pBuffer += sizeof(*wirecf); - if (wirecf->fContext == WDT_INPROC_CALL) - *pCF = (CLIPFORMAT)wirecf->u.dwValue; - else if (wirecf->fContext == WDT_REMOTE_CALL) + fContext = *(DWORD *)pBuffer; + pBuffer += 4; + + if (fContext == WDT_INPROC_CALL) + { + *pCF = *(CLIPFORMAT *)pBuffer; + pBuffer += 4; + } + else if (fContext == WDT_REMOTE_CALL) { CLIPFORMAT cf; - INT len = *(INT *)pBuffer; - pBuffer += sizeof(INT); - if (*(INT *)pBuffer != 0) + UINT len; + + /* pointer ID for registered clip format string */ + if (*(DWORD *)pBuffer == 0) + RaiseException(RPC_S_INVALID_BOUND, 0, 0, NULL); + pBuffer += 4; + + len = *(UINT *)pBuffer; + pBuffer += sizeof(UINT); + if (*(UINT *)pBuffer != 0) RaiseException(RPC_S_INVALID_BOUND, 0, 0, NULL); - pBuffer += sizeof(INT); - if (*(INT *)pBuffer != len) + pBuffer += sizeof(UINT); + if (*(UINT *)pBuffer != len) RaiseException(RPC_S_INVALID_BOUND, 0, 0, NULL); - pBuffer += sizeof(INT); + pBuffer += sizeof(UINT); if (((WCHAR *)pBuffer)[len] != '\0') RaiseException(RPC_S_INVALID_BOUND, 0, 0, NULL); TRACE("unmarshaling clip format %s\n", debugstr_w((LPCWSTR)pBuffer));

1 0

Nikolay Sivov : reg: Don't close not open reg key (Coverity).
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 5276d886f91fb97682f81f7abc9e5175e1b0cf8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5276d886f91fb97682f81f7ab… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Feb 8 16:27:48 2009 +0300 reg: Don't close not open reg key (Coverity). --- programs/reg/reg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 4a278d4..823b4d9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -240,14 +240,12 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, if (value_name && value_empty) { - RegCloseKey(subkey); reg_message(STRING_INVALID_CMDLINE); return 0; } if (value_empty && value_all) { - RegCloseKey(subkey); reg_message(STRING_INVALID_CMDLINE); return 0; }

1 0

Andrew Talbot : riched20: Remove unused functions.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: edca49f6aaae947ba8716790a09930463a9a7d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=edca49f6aaae947ba8716790a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 7 19:38:54 2009 +0000 riched20: Remove unused functions. --- dlls/riched20/editor.h | 3 --- dlls/riched20/list.c | 10 ---------- dlls/riched20/row.c | 44 -------------------------------------------- dlls/riched20/style.c | 6 ------ 4 files changed, 0 insertions(+), 63 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68ab596..77b33d2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -70,7 +70,6 @@ void ME_ClearTempStyle(ME_TextEditor *editor); void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]); void ME_DumpStyle(ME_Style *s); CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from); -void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc); /* only works with 2W structs */ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt); /* ditto */ @@ -81,7 +80,6 @@ void ME_Remove(ME_DisplayItem *diWhere); ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass); ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass); ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass); -ME_DisplayItem *ME_FindItemFwdOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass); ME_DisplayItem *ME_MakeDI(ME_DIType type); void ME_DestroyDisplayItem(ME_DisplayItem *item); void ME_DumpDocument(ME_TextBuffer *buffer); @@ -121,7 +119,6 @@ int ME_ReverseFindNonWhitespaceV(const ME_String *s, int nVChar); int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar); /* row.c */ -ME_DisplayItem *ME_FindRowStart(ME_Context *c, ME_DisplayItem *run, int nRelPos); ME_DisplayItem *ME_RowStart(ME_DisplayItem *item); /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ void ME_RenumberParagraphs(ME_DisplayItem *item); /* TODO */ diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index f9a9032..d3d9463 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -98,16 +98,6 @@ ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) return NULL; } -ME_DisplayItem *ME_FindItemFwdOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass) -{ - while(di!=NULL) { - if (ME_DITypesEqual(di->type, nTypeOrClass)) - return di; - di = di->next; - } - return NULL; -} - void ME_DestroyDisplayItem(ME_DisplayItem *item) { /* TRACE("type=%s\n", ME_GetDITypeName(item->type)); */ if (item->type==diParagraph || item->type == diUndoSetParagraphFormat) { diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index d3ef3de..1bf153f 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -24,50 +24,6 @@ #include "editor.h" -ME_DisplayItem *ME_FindRowStart(ME_Context *c, ME_DisplayItem *item, - int nRelPos) { - ME_DisplayItem *para = ME_GetParagraph(item); - ME_MustBeWrapped(c, para); - if(nRelPos<=0) { /* if this or preceding row */ - do { - ME_DisplayItem *item2 = ME_FindItemBack(item, diStartRowOrParagraph); - if (item2->type == diParagraph) - { - if (item2->member.para.prev_para == NULL) - return item; - /* if skipping to the preceding paragraph, ensure it's wrapped */ - ME_MustBeWrapped(c, item2->member.para.prev_para); - item = item2; - continue; - } - else if (item2->type == diStartRow) - { - nRelPos++; - if (nRelPos>0) - return item; - item = item2; - continue; - } - assert(0 == "bug in FindItemBack(item, diStartRowOrParagraph)"); - item = item2; - } while(1); - } - while(nRelPos>0) { /* if one of the next rows */ - ME_DisplayItem *item2 = ME_FindItemFwd(item, diStartRowOrParagraph); - if (!item2) - return item; - if (item2->type == diParagraph) - { - if (item2->member.para.next_para == NULL) - return item; - continue; - } - item = item2; - nRelPos--; - } - return item; -} - /* I'm sure these functions would simplify some code in caret ops etc, * I just didn't remember them when I wrote that code */ diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 3980400..a3b532e 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -71,12 +71,6 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) return (from->cbSize >= sizeof(CHARFORMAT2W)) ? from : NULL; } -void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) -{ - if (ME_ToCF2W(to, from) == from) - *to = *from; -} - static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) { assert(from->cbSize == sizeof(CHARFORMAT2W));

1 0

Vitaliy Margolen : comctl32: Use style to distinguish between embedded and standalone propsheets.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: c80fdb881a33a2cf9b2727400ecb67c296beed0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80fdb881a33a2cf9b2727400… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Feb 8 15:43:00 2009 -0700 comctl32: Use style to distinguish between embedded and standalone propsheets. Some programs alter propsheet style in the callback during creation to make "embedded" propsheets. PSH_MODELESS controls modal/modeless operation only. --- dlls/comctl32/propsheet.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 785643d..4640e9f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -743,6 +743,7 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) int buttonHeight; PADDING_INFO padding = PROPSHEET_GetPaddingInfo(hwndDlg); RECT units; + LONG style; /* Get the height of buttons */ GetClientRect(hwndButton, &rc); @@ -798,8 +799,9 @@ static BOOL PROPSHEET_AdjustSize(HWND hwndDlg, PropSheetInfo* psInfo) rc.right += (padding.x * 2); rc.bottom += buttonHeight + (3 * padding.y); - if (!psInfo->isModeless) - AdjustWindowRect(&rc, GetWindowLongW(hwndDlg, GWL_STYLE), FALSE); + style = GetWindowLongW(hwndDlg, GWL_STYLE); + if (!(style & WS_CHILD)) + AdjustWindowRect(&rc, style, FALSE); rc.right -= rc.left; rc.bottom -= rc.top;

1 0

Francois Gouget : user32: LookupIconIdFromDirectory16() is unused so remove it.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 53f9b31afd02b88a96acfafa33e526cc7679b158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f9b31afd02b88a96acfafa3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 20:18:40 2009 +0100 user32: LookupIconIdFromDirectory16() is unused so remove it. --- dlls/user32/cursoricon.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8049a67..478e0c6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1807,16 +1807,6 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, } /********************************************************************** - * LookupIconIdFromDirectory (USER.?) - */ -INT16 WINAPI LookupIconIdFromDirectory16( LPBYTE dir, BOOL16 bIcon ) -{ - return LookupIconIdFromDirectoryEx16( dir, bIcon, - bIcon ? GetSystemMetrics(SM_CXICON) : GetSystemMetrics(SM_CXCURSOR), - bIcon ? GetSystemMetrics(SM_CYICON) : GetSystemMetrics(SM_CYCURSOR), bIcon ? 0 : LR_MONOCHROME ); -} - -/********************************************************************** * LookupIconIdFromDirectory (USER32.@) */ INT WINAPI LookupIconIdFromDirectory( LPBYTE dir, BOOL bIcon )

1 0

Francois Gouget : uxtheme: UXINI_ResetINI() is unused so remove it.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 55dccf28595f84767a4731c1e6aacf3a43521f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55dccf28595f84767a4731c1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:04:49 2009 +0100 uxtheme: UXINI_ResetINI() is unused so remove it. --- dlls/uxtheme/msstyles.h | 1 - dlls/uxtheme/uxini.c | 14 -------------- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 1d02725..6cd73ac 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -110,7 +110,6 @@ HRESULT MSSTYLES_GetPropertyMargins(PTHEME_PROPERTY tp, RECT *prc, MARGINS *pMar PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName); void UXINI_CloseINI(PUXINI_FILE uf); -void UXINI_ResetINI(PUXINI_FILE uf); LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen); BOOL UXINI_FindSection(PUXINI_FILE uf, LPCWSTR lpName); LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD *dwValueLen); diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 02c5443..a2dfabf 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -96,19 +96,6 @@ void UXINI_CloseINI(PUXINI_FILE uf) } /********************************************************************** - * UXINI_ResetINI - * - * Reset the current pointer into INI file to the beginning of the file - * - * PARAMS - * uf Theme INI file to reset - */ -void UXINI_ResetINI(PUXINI_FILE uf) -{ - uf->lpCurLoc = uf->lpIni; -} - -/********************************************************************** * UXINI_eof * * Determines if we are at the end of the INI file @@ -212,7 +199,6 @@ LPCWSTR UXINI_GetNextSection(PUXINI_FILE uf, DWORD *dwLen) * * Locate a section with the specified name, search starts * at current location in ini file - * to start search from start, call UXINI_ResetINI * * PARAMS * uf INI file to search, search starts at current location

1 0

Francois Gouget : progman: Make DIALOG_Symbol() static.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 7274de8888a64eefe3175fee2e57538619e929e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7274de8888a64eefe3175fee2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:10:33 2009 +0100 progman: Make DIALOG_Symbol() static. --- programs/progman/dialog.c | 2 +- programs/progman/progman.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index f862b08..fc7c7fd 100644 --- a/programs/progman/dialog.c +++ b/programs/progman/dialog.c @@ -406,7 +406,7 @@ static INT_PTR CALLBACK DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT msg, WPARAM wParam * * DIALOG_Symbol */ -VOID DIALOG_Symbol(HICON *lphIcon, LPSTR lpszIconFile, +static VOID DIALOG_Symbol(HICON *lphIcon, LPSTR lpszIconFile, INT *lpnIconIndex, INT nSize) { DLGPROC lpfnDlg = MakeProcInstance(DIALOG_SYMBOL_DlgProc, Globals.hInstance); diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 59004b9..5f7504b 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -184,8 +184,6 @@ BOOL DIALOG_ProgramAttributes(LPSTR lpszTitle, LPSTR lpszCmdLine, LPSTR lpszWorkDir, LPSTR lpszIconFile, HICON *lphIcon, INT *nIconIndex, INT *lpnHotKey, INT *lpnCmdShow, INT nSize); -VOID DIALOG_Symbol(HICON *lphIcon, LPSTR lpszIconFile, - INT *lpnIconIndex, INT nSize); VOID DIALOG_Execute(void); VOID STRING_LoadMenus(VOID);

1 0