wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

André Hentschel : cacls: Print out arguments.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 04f40b7059ef99238573152d6257df450e0e6cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f40b7059ef99238573152d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 25 17:30:51 2012 +0100 cacls: Print out arguments. --- programs/cacls/cacls_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/cacls/cacls_main.c b/programs/cacls/cacls_main.c index a6a2949..eebd6d0 100644 --- a/programs/cacls/cacls_main.c +++ b/programs/cacls/cacls_main.c @@ -26,6 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cacls); int main(int argc, char** argv) { + int i; + WINE_FIXME("This is dummy cacls, not performing ACL manipulations\n"); + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_a(argv[i])); + WINE_FIXME("\n"); + return 0; }

1 0

Ričardas Barkauskas : comctl32: Avoid code duplication by reusing PROPSHEET_GetPageIndex.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 2c8ea6ebff21428dc407d85af3f516083d544bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8ea6ebff21428dc407d85af… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Dec 21 19:07:17 2012 +0200 comctl32: Avoid code duplication by reusing PROPSHEET_GetPageIndex. --- dlls/comctl32/propsheet.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index c3db7e3..f2c55ab 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2561,16 +2561,11 @@ static LRESULT PROPSHEET_IndexToHwnd(HWND hwndDlg, int iPageIndex) */ static LRESULT PROPSHEET_PageToIndex(HWND hwndDlg, HPROPSHEETPAGE hPage) { - int index; PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); TRACE("(%p, %p)\n", hwndDlg, hPage); - for (index = 0; index < psInfo->nPages; index++) - if (psInfo->proppage[index].hpage == hPage) - return index; - WARN("%p not found\n", hPage); - return -1; + return PROPSHEET_GetPageIndex(hPage, psInfo, -1); } /******************************************************************************

1 0

Ričardas Barkauskas : comctl32: Use index value if property sheet page isn't found.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 379d492b12b25e16b7c83872658042bf99d30c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379d492b12b25e16b7c838726… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Dec 21 19:06:45 2012 +0200 comctl32: Use index value if property sheet page isn't found. --- dlls/comctl32/propsheet.c | 40 +++++++++++++------------------------- dlls/comctl32/tests/propsheet.c | 2 +- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b73c448..c3db7e3 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -168,7 +168,7 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, int index, int skipdir, HPROPSHEETPAGE hpage); -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo); +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo, int original_index); static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheetInfo* psInfo); static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID); static BOOL PROPSHEET_RemovePage(HWND hwndDlg, int index, HPROPSHEETPAGE hpage); @@ -1998,9 +1998,8 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage); - /* hpage takes precedence over index */ - if (hpage != NULL) - index = PROPSHEET_GetPageIndex(hpage, psInfo); + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); if (index < 0 || index >= psInfo->nPages) { @@ -2331,13 +2330,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, if (!psInfo) { return FALSE; } - /* - * hpage takes precedence over index. - */ - if (hpage != 0) - { - index = PROPSHEET_GetPageIndex(hpage, psInfo); - } + + index = PROPSHEET_GetPageIndex(hpage, psInfo, index); /* Make sure that index is within range */ if (index < 0 || index >= psInfo->nPages) @@ -2652,26 +2646,20 @@ static BOOL PROPSHEET_RecalcPageSizes(HWND hwndDlg) * PROPSHEET_GetPageIndex * * Given a HPROPSHEETPAGE, returns the index of the corresponding page from - * the array of PropPageInfo. + * the array of PropPageInfo. If page is not found original index is used + * (page takes precedence over index). */ -static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE hpage, const PropSheetInfo* psInfo) +static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psInfo, int original_index) { - BOOL found = FALSE; - int index = 0; + int index; - TRACE("hpage %p\n", hpage); - while ((index < psInfo->nPages) && (found == FALSE)) - { - if (psInfo->proppage[index].hpage == hpage) - found = TRUE; - else - index++; - } + TRACE("page %p index %d\n", page, original_index); - if (found == FALSE) - index = -1; + for (index = 0; index < psInfo->nPages; index++) + if (psInfo->proppage[index].hpage == page) + return index; - return index; + return original_index; } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 992b60f..f235791 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -821,7 +821,7 @@ if (0) ok(r == 4, "got %d\n", r); /* select page that can't be created */ - ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 0); + ret = SendMessageA(hdlg, PSM_SETCURSEL, 3, 1); ok(ret == TRUE, "got %d\n", ret); r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0);

1 0

Nikolay Sivov : xmllite: Shrink buffer when enough data processed.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: beffac006ce867c51da145ec28648432eaa9fb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beffac006ce867c51da145ec2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 21 09:35:30 2012 +0400 xmllite: Shrink buffer when enough data processed. --- dlls/xmllite/reader.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9e32216..38c7a5e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -481,6 +481,7 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding { readerinput_grow(readerinput, len); memcpy(dest->data, src->cur, len); + dest->written += len*sizeof(WCHAR); readerinput->buffer->code_page = cp; return; } @@ -491,6 +492,22 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); ptr[dest_len] = 0; readerinput->buffer->code_page = cp; + dest->written += dest_len*sizeof(WCHAR); +} + +/* shrinks parsed data a buffer begins with */ +static void reader_shrink(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + /* avoid to move too often using threshold shrink length */ + if (buffer->cur - buffer->data > buffer->written / 2) + { + buffer->written -= buffer->cur - buffer->data; + memmove(buffer->data, buffer->cur, buffer->written); + buffer->cur = buffer->data; + *(WCHAR*)&buffer->cur[buffer->written] = 0; + } } static inline const WCHAR *reader_get_cur(xmlreader *reader) @@ -772,6 +789,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip '<!--' */ reader_skipn(reader, 4); + reader_shrink(reader); ptr = start = reader_get_cur(reader); while (*ptr)

1 0

Ken Thomases : winemac.drv: Implement GetMonitorInfo.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: d8a0da9d8f28cb5aad99c35aa7398b77b1e9dd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a0da9d8f28cb5aad99c35aa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:32 2012 -0600 winemac.drv: Implement GetMonitorInfo. --- dlls/winemac.drv/display.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1b791e4..a1bea38 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -105,3 +105,54 @@ BOOL CDECL macdrv_EnumDisplayMonitors(HDC hdc, LPRECT rect, MONITORENUMPROC proc return ret; } + + +/*********************************************************************** + * GetMonitorInfo (MACDRV.@) + */ +BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) +{ + static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 }; + struct macdrv_display *displays; + int num_displays; + CGDirectDisplayID display_id; + int i; + + TRACE("%p, %p\n", monitor, info); + + if (macdrv_get_displays(&displays, &num_displays)) + { + ERR("couldn't get display list\n"); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + display_id = monitor_to_display_id(monitor); + for (i = 0; i < num_displays; i++) + { + if (displays[i].displayID == display_id) + break; + } + + if (i < num_displays) + { + info->rcMonitor = rect_from_cgrect(displays[i].frame); + info->rcWork = rect_from_cgrect(displays[i].work_frame); + + info->dwFlags = (i == 0) ? MONITORINFOF_PRIMARY : 0; + + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW(((MONITORINFOEXW*)info)->szDevice, adapter_name); + + TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x\n", wine_dbgstr_rect(&info->rcMonitor), + wine_dbgstr_rect(&info->rcWork), info->dwFlags); + } + else + { + ERR("invalid monitor handle\n"); + SetLastError(ERROR_INVALID_HANDLE); + } + + macdrv_free_displays(displays); + return (i < num_displays); +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 25b43e0..03fa490 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -5,3 +5,4 @@ # USER driver @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo

1 0

Ken Thomases : winemac.drv: Implement EnumDisplayMonitors.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 21c4fc3326eedeab996e7021235b58477227ec7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c4fc3326eedeab996e70212… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:28 2012 -0600 winemac.drv: Implement EnumDisplayMonitors. --- dlls/winemac.drv/Makefile.in | 6 ++- dlls/winemac.drv/cocoa_display.m | 103 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 107 +++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 79 +++++++------------------- dlls/winemac.drv/macdrv_cocoa.h | 111 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 4 + 6 files changed, 352 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c4fc3326eedeab996e7…

1 0

Ken Thomases : makefiles: Allow use of Objective-C source files in modules.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: 49dc686ae99a630460cfafcbfbbed8f43280610b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dc686ae99a630460cfafcbf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:24 2012 -0600 makefiles: Allow use of Objective-C source files in modules. --- Make.rules.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7c4a65c..38231a8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -2,6 +2,7 @@ # # Each individual makefile may define the following variables: # C_SRCS : C sources for the module +# OBJC_SRCS : Objective-C sources for the module # RC_SRCS : resource source files # EXTRA_SRCS : extra source files for make depend # EXTRA_OBJS : extra object files @@ -29,7 +30,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) @@ -47,6 +48,9 @@ filter: dummy .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< +.m.o: + $(CC) -c $(ALLCFLAGS) -o $@ $< + .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< @@ -137,7 +141,7 @@ winapi_check:: dummy # Rules for dependencies -DEPEND_SRCS = $(C_SRCS) $(RC_SRCS) $(MC_SRCS) \ +DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)

1 0

Ken Thomases : makedep: Add support for Objective-C . m files and #import directive.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: dd2f2e4ee582a825632d43b753f62c33ecbdf299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2f2e4ee582a825632d43b75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:20 2012 -0600 makedep: Add support for Objective-C .m files and #import directive. --- tools/makedep.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2d3e5b4..c70b5a9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -653,8 +653,9 @@ static void parse_c_file( INCL_FILE *pFile, FILE *file ) while (*p && isspace(*p)) p++; if (*p++ != '#') continue; while (*p && isspace(*p)) p++; - if (strncmp( p, "include", 7 )) continue; - p += 7; + if (!strncmp( p, "include", 7 )) p += 7; + else if (!strncmp( p, "import", 6 )) p += 6; + else continue; while (*p && isspace(*p)) p++; if (*p != '\"' && *p != '<' ) continue; quote = *p++; @@ -805,6 +806,7 @@ static void parse_file( INCL_FILE *pFile, int src ) else if (strendswith( pFile->filename, ".idl" )) parse_idl_file( pFile, file, 0 ); else if (strendswith( pFile->filename, ".c" ) || + strendswith( pFile->filename, ".m" ) || strendswith( pFile->filename, ".h" ) || strendswith( pFile->filename, ".l" ) || strendswith( pFile->filename, ".y" ))

1 0

Ken Thomases : winemac.drv: Tell git' s diff engine to recognize Objective-C source files.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: ce0f9b3128cf2955b3430ff294c5de28bcf3b9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0f9b3128cf2955b3430ff29… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:14 2012 -0600 winemac.drv: Tell git's diff engine to recognize Objective-C source files. --- dlls/winemac.drv/.gitattributes | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/.gitattributes b/dlls/winemac.drv/.gitattributes new file mode 100644 index 0000000..4e9525e --- /dev/null +++ b/dlls/winemac.drv/.gitattributes @@ -0,0 +1,2 @@ +*.m diff=objc +*.h diff=objc

1 0

Charles Davis : loader: Build with -fno-builtin.
by Alexandre Julliard 26 Dec '12

26 Dec '12

Module: wine Branch: master Commit: a6fdf73233d3df4435680d921f68089630bc9c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fdf73233d3df4435680d921… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Dec 24 09:38:06 2012 -0700 loader: Build with -fno-builtin. This prevents Clang from optimizing wld_memset() into a memset(3) call. --- loader/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 41d69c7..ecc20ab 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,4 +1,5 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) +MODCFLAGS = @BUILTINFLAG@ C_SRCS = \ main.c \

1 0

← Newer
1
2
3
4
5
6
7
8
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012