March 2009 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : mshtml: Add missing IHTMLTable interfaces.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 5cadd7e480c5b30642485d1f1e2424b8a583f6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cadd7e480c5b30642485d1f1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 11 10:36:30 2009 +1100 mshtml: Add missing IHTMLTable interfaces. --- dlls/mshtml/htmltable.c | 4 +- include/mshtml.idl | 283 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 285 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cadd7e480c5b30642485…

1 0

Michael Stefaniuc : mlang: Change long to LONG in mlang.idl.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: d8b4dd7ab6219d35a61294597f152cc8cddd75c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b4dd7ab6219d35a61294597… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 11 00:31:43 2009 +0100 mlang: Change long to LONG in mlang.idl. --- dlls/mlang/mlang.c | 48 +++++++++++++++++++------------------- dlls/mlang/tests/mlang.c | 20 ++++++++-------- include/mlang.idl | 56 +++++++++++++++++++++++----------------------- 3 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8b4dd7ab6219d35a6129…

1 0

Dylan Smith : richedit: Count graphics towards line width.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 1a2ccfe9c79973f499e38321bd5267a2cddee59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2ccfe9c79973f499e38321b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Mar 10 19:01:09 2009 -0400 richedit: Count graphics towards line width. Images that are inserted into richedit controls store a space for the text, since that is the character returned when getting the plain text from the control. When calculating the width of a line, the space character is skipped, but images should not be skipped. This can be seen by inserting an image into wordpad on a line by it's own, then centering the line. The image will start from the center rather than being centered in the control. --- dlls/riched20/wrap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 54c90eb..579f33a 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -115,7 +115,8 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) WCHAR *text = p->member.run.strText->szData + len - 1; assert (len); - while (len && *(text--) == ' ') + if (~p->member.run.nFlags & MERF_GRAPHICS) + while (len && *(text--) == ' ') len--; if (len) {

1 0

Nikolay Sivov : comctl32: Fix item selection with VK_SPACE when Ctrl is pressed.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 24dc6600fccf13b41ae035ea61315cfe7ac3f0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dc6600fccf13b41ae035ea6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Mar 10 19:05:03 2009 -0400 comctl32: Fix item selection with VK_SPACE when Ctrl is pressed. --- dlls/comctl32/listview.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 66b45b4..5379561 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -425,7 +425,7 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *, INT, BOOL); static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *, WPARAM, LPARAM); static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *, PFNLVCOMPARE, LPARAM); static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); -static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT); +static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT, HWND); @@ -1590,7 +1590,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L nItem = notify_hdr(infoPtr, LVN_ODFINDITEMW, (LPNMHDR)&nmlv.hdr); if (nItem != -1) - LISTVIEW_KeySelection(infoPtr, nItem); + LISTVIEW_KeySelection(infoPtr, nItem, FALSE); return 0; } @@ -1623,7 +1623,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L } while (idx != endidx); if (nItem != -1) - LISTVIEW_KeySelection(infoPtr, nItem); + LISTVIEW_KeySelection(infoPtr, nItem, FALSE); return 0; } @@ -3220,12 +3220,13 @@ static void LISTVIEW_SetSelection(LISTVIEW_INFO *infoPtr, INT nItem) * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] nItem : item index + * [I] space : VK_SPACE code sent * * RETURN: * SUCCESS : TRUE (needs to be repainted) * FAILURE : FALSE (nothing has changed) */ -static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem) +static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem, BOOL space) { /* FIXME: pass in the state */ WORD wShift = HIWORD(GetKeyState(VK_SHIFT)); @@ -3252,11 +3253,12 @@ static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *infoPtr, INT nItem) LVITEMW lvItem; lvItem.state = ~LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED); lvItem.stateMask = LVIS_SELECTED; - LISTVIEW_SetItemState(infoPtr, nItem, &lvItem); - - if (lvItem.state & LVIS_SELECTED) - infoPtr->nSelectionMark = nItem; - + if (space) + { + LISTVIEW_SetItemState(infoPtr, nItem, &lvItem); + if (lvItem.state & LVIS_SELECTED) + infoPtr->nSelectionMark = nItem; + } bResult = LISTVIEW_SetItemFocus(infoPtr, nItem); } else @@ -8560,7 +8562,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK } if ((nItem != -1) && (nItem != infoPtr->nFocusedItem || nVirtualKey == VK_SPACE)) - LISTVIEW_KeySelection(infoPtr, nItem); + LISTVIEW_KeySelection(infoPtr, nItem, nVirtualKey == VK_SPACE); return 0; }

1 0

Michael Stefaniuc : quartz: Change long to LONG in control.idl.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: a3269bdc40c7267f3dc882fd95184c5cdeee8ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3269bdc40c7267f3dc882fd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 11 00:31:26 2009 +0100 quartz: Change long to LONG in control.idl. --- dlls/quartz/dsoundrender.c | 12 +- dlls/quartz/filtergraph.c | 278 +++++++++++++++++++++--------------------- dlls/quartz/videorenderer.c | 236 ++++++++++++++++++------------------ include/control.idl | 154 ++++++++++++------------ 4 files changed, 340 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3269bdc40c7267f3dc88…

1 0

Rob Shearman : rpcrt4: Add a check for a NULL ref pointer to NdrPointerUnmarshall.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 689a49b52ac462b9988429cd89423faa10b1c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=689a49b52ac462b9988429cd8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 10 23:41:39 2009 +0000 rpcrt4: Add a check for a NULL ref pointer to NdrPointerUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 05eb638..b29186c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1500,18 +1500,28 @@ unsigned char * WINAPI NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); - /* Increment the buffer here instead of in PointerUnmarshall, - * as that is used by embedded pointers which already handle the incrementing - * the buffer, and shouldn't read any additional pointer data from the - * buffer */ - if (*pFormat != RPC_FC_RP) + if (*pFormat == RPC_FC_RP) { - ALIGN_POINTER(pStubMsg->Buffer, 4); Buffer = pStubMsg->Buffer; - safe_buffer_increment(pStubMsg, 4); + /* Do the NULL ref pointer check here because embedded pointers can be + * NULL if the type the pointer is embedded in was allocated rather than + * being passed in by the client */ + if (pStubMsg->IsClient && !*ppMemory) + { + ERR("NULL ref pointer is not allowed\n"); + RpcRaiseException(RPC_X_NULL_REF_POINTER); + } } else + { + /* Increment the buffer here instead of in PointerUnmarshall, + * as that is used by embedded pointers which already handle the incrementing + * the buffer, and shouldn't read any additional pointer data from the + * buffer */ + ALIGN_POINTER(pStubMsg->Buffer, 4); Buffer = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, 4); + } PointerUnmarshall(pStubMsg, Buffer, ppMemory, *ppMemory, pFormat, fMustAlloc);

1 0

Jeremy White : sane.ds: Move a few static functions so they can be shared.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 782ea74acc56b27077ddefcd7c5efae246b2fc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782ea74acc56b27077ddefcd7… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Mar 10 15:48:18 2009 -0500 sane.ds: Move a few static functions so they can be shared. --- dlls/sane.ds/capability.c | 52 --------------------------------------------- dlls/sane.ds/options.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/sane.ds/sane_i.h | 2 + 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 859b4be..20fd2c3 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -315,33 +315,6 @@ static BOOL sane_mode_to_pixeltype(SANE_String_Const mode, TW_UINT16 *pixeltype) return TRUE; } - -static TW_UINT16 sane_status_to_twcc(SANE_Status rc) -{ - switch (rc) - { - case SANE_STATUS_GOOD: - return TWCC_SUCCESS; - case SANE_STATUS_UNSUPPORTED: - return TWCC_CAPUNSUPPORTED; - case SANE_STATUS_JAMMED: - return TWCC_PAPERJAM; - case SANE_STATUS_NO_MEM: - return TWCC_LOWMEMORY; - case SANE_STATUS_ACCESS_DENIED: - return TWCC_DENIED; - - case SANE_STATUS_IO_ERROR: - case SANE_STATUS_NO_DOCS: - case SANE_STATUS_COVER_OPEN: - case SANE_STATUS_EOF: - case SANE_STATUS_INVAL: - case SANE_STATUS_CANCELLED: - case SANE_STATUS_DEVICE_BUSY: - default: - return TWCC_BUMMER; - } -} #endif /* ICAP_PIXELTYPE */ @@ -696,31 +669,6 @@ static TW_UINT16 SANE_ICAPResolution (pTW_CAPABILITY pCapability, TW_UINT16 acti return twCC; } -#ifdef SONAME_LIBSANE -static void convert_double_fix32(double d, TW_FIX32 *fix32) -{ - TW_INT32 value = (TW_INT32) (d * 65536.0 + 0.5); - fix32->Whole = value >> 16; - fix32->Frac = value & 0x0000ffffL; -} - -static BOOL convert_sane_res_to_twain(double sane_res, SANE_Unit unit, TW_FIX32 *twain_res, TW_UINT16 twtype) -{ - double d; - - if (unit != SANE_UNIT_MM) - return FALSE; - - if (twtype != TWUN_INCHES) - return FALSE; - - d = (sane_res / 10.0) / 2.54; - convert_double_fix32((sane_res / 10.0) / 2.54, twain_res); - - return TRUE; -} -#endif - /* ICAP_PHYSICALHEIGHT, ICAP_PHYSICALWIDTH */ static TW_UINT16 SANE_ICAPPhysical (pTW_CAPABILITY pCapability, TW_UINT16 action, TW_UINT16 cap) { diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 44cd34e..c2e5020 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -218,4 +218,53 @@ SANE_Status sane_option_probe_scan_area(SANE_Handle h, const char *option_name, return rc; } + +TW_UINT16 sane_status_to_twcc(SANE_Status rc) +{ + switch (rc) + { + case SANE_STATUS_GOOD: + return TWCC_SUCCESS; + case SANE_STATUS_UNSUPPORTED: + return TWCC_CAPUNSUPPORTED; + case SANE_STATUS_JAMMED: + return TWCC_PAPERJAM; + case SANE_STATUS_NO_MEM: + return TWCC_LOWMEMORY; + case SANE_STATUS_ACCESS_DENIED: + return TWCC_DENIED; + + case SANE_STATUS_IO_ERROR: + case SANE_STATUS_NO_DOCS: + case SANE_STATUS_COVER_OPEN: + case SANE_STATUS_EOF: + case SANE_STATUS_INVAL: + case SANE_STATUS_CANCELLED: + case SANE_STATUS_DEVICE_BUSY: + default: + return TWCC_BUMMER; + } +} +static void convert_double_fix32(double d, TW_FIX32 *fix32) +{ + TW_INT32 value = (TW_INT32) (d * 65536.0 + 0.5); + fix32->Whole = value >> 16; + fix32->Frac = value & 0x0000ffffL; +} + +BOOL convert_sane_res_to_twain(double sane_res, SANE_Unit unit, TW_FIX32 *twain_res, TW_UINT16 twtype) +{ + double d; + + if (unit != SANE_UNIT_MM) + return FALSE; + + if (twtype != TWUN_INCHES) + return FALSE; + + d = (sane_res / 10.0) / 2.54; + convert_double_fix32((sane_res / 10.0) / 2.54, twain_res); + + return TRUE; +} #endif diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 72b4b79..30fde23 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -234,6 +234,8 @@ SANE_Status sane_option_probe_scan_area(SANE_Handle h, const char *option_name, SANE_Status sane_option_get_bool(SANE_Handle h, const char *option_name, SANE_Bool *val, SANE_Int *status); SANE_Status sane_option_set_bool(SANE_Handle h, const char *option_name, SANE_Bool val, SANE_Int *status); SANE_Status sane_option_set_fixed(SANE_Handle h, const char *option_name, SANE_Fixed val, SANE_Int *status); +TW_UINT16 sane_status_to_twcc(SANE_Status rc); +BOOL convert_sane_res_to_twain(double sane_res, SANE_Unit unit, TW_FIX32 *twain_res, TW_UINT16 twtype); #endif

1 0

Alexandre Julliard : dbghelp: The main executable is now always named "wine ".
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: d2682f57f8bc64489d5e0770237858e89f5ebe31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2682f57f8bc64489d5e07702… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 18:22:43 2009 +0100 dbghelp: The main executable is now always named "wine". --- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/elf_module.c | 7 ++----- dlls/dbghelp/module.c | 16 +++++----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0345a3f..132a6b9 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -431,8 +431,7 @@ extern DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* add /* module.c */ extern const WCHAR S_ElfW[]; extern const WCHAR S_WineLoaderW[]; -extern const WCHAR S_WinePThreadW[]; -extern const WCHAR S_WineKThreadW[]; +extern const WCHAR S_WineW[]; extern const WCHAR S_SlashW[]; extern struct module* diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 30b7a3c..820c972 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1492,9 +1492,7 @@ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) const char* ptr; /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable (either wine-kthread or wine-pthread) - * FIXME: the heuristic used to know whether we need to load wine-pthread - * or wine-kthread is not 100% safe + * main executable */ if ((ptr = getenv("WINELOADER"))) { @@ -1504,8 +1502,7 @@ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) } else { - ret = elf_search_and_load_file(pcs, S_WineKThreadW, 0, elf_info) || - elf_search_and_load_file(pcs, S_WinePThreadW, 0, elf_info); + ret = elf_search_and_load_file(pcs, S_WineW, 0, elf_info); } return ret; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index fcdea2e..a7af0f5 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -37,8 +37,7 @@ const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d',' static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; -const WCHAR S_WinePThreadW[] = {'w','i','n','e','-','p','t','h','r','e','a','d','\0'}; -const WCHAR S_WineKThreadW[] = {'w','i','n','e','-','k','t','h','r','e','a','d','\0'}; +const WCHAR S_WineW[] = {'w','i','n','e',0}; const WCHAR S_SlashW[] = {'/','\0'}; static const WCHAR S_AcmW[] = {'.','a','c','m','\0'}; @@ -87,9 +86,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > 12 && - (!strcmpiW(out + len - 12, S_WinePThreadW) || - !strcmpiW(out + len - 12, S_WineKThreadW))) + else if (len > 4 && !strcmpiW(out + len - 4, S_WineW)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -428,13 +425,10 @@ enum module_type module_get_type_by_name(const WCHAR* name) if (len > 4 && !strncmpiW(name + len - 4, S_DotDbgW, 4)) return DMT_DBG; - /* wine-[kp]thread is also an ELF module */ - if (((len > 12 && name[len - 13] == '/') || len == 12) && - (!strncmpiW(name + len - 12, S_WinePThreadW, 12) || - !strncmpiW(name + len - 12, S_WineKThreadW, 12))) - { + /* wine is also an ELF module */ + if (((len > 4 && name[len - 5] == '/') || len == 4) && !strcmpiW(name + len - 4, S_WineW)) return DMT_ELF; - } + return DMT_PE; }

1 0

Rob Shearman : widl: Returned pointers should default to being unique, not reference.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 8cdda2689746cd0c50409e7be9fe2e54941c5e4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdda2689746cd0c50409e7be… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 10 23:39:56 2009 +0000 widl: Returned pointers should default to being unique, not reference. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ce4d3d7..2709b68 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2844,7 +2844,7 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, write_typeformatstring_var( file, 2, NULL, type_function_get_rettype(func->type), - &v, TRUE, typeformat_offset), + &v, FALSE, typeformat_offset), file); }

1 0

Alexandre Julliard : loader: Merge the first and second stage loaders into a single wine binary.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: f4a19c8463abcc367256b5f36e358df9701eb28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a19c8463abcc367256b5f36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 18:22:38 2009 +0100 loader: Merge the first and second stage loaders into a single wine binary. --- .gitignore | 8 +-- configure | 13 +---- configure.ac | 7 +-- dlls/kernel32/process.c | 1 + loader/Makefile.in | 55 ++++------------- loader/freebsd.c | 61 ------------------- loader/glibc.c | 153 ----------------------------------------------- loader/main.c | 115 ++++++++++++++++++++++++++++++++++- 8 files changed, 131 insertions(+), 282 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4a19c8463abcc367256b…

1 0