wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Alexandre Julliard : configure: Correctly install binaries even when the tools are disabled.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 62beaad8737b7aac7acc2352933c02e33c1aa9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=62beaad8737b7aac7acc23529… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 7 13:12:25 2013 +0200 configure: Correctly install binaries even when the tools are disabled. --- aclocal.m4 | 14 +++++++------- configure | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5240a52..3de9199 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -557,23 +557,23 @@ __uninstall__: $ac_dir/__uninstall__" $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi - if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext) diff --git a/configure b/configure index b53ae91..56f2fab 100755 --- a/configure +++ b/configure @@ -16474,23 +16474,23 @@ __uninstall__: $ac_dir/__uninstall__" $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(dlldir)/$DLLPREFIX$ac_program$DLLEXT \$(DESTDIR)\$(fakedlldir)/$ac_program" - if test "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule \ -"$ac_dir/__install__:: tools \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name +"$ac_dir/__install__:: __tooldeps__ \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) \$(TOOLSDIR)/tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_name $ac_dir/__uninstall__:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_name" fi else wine_fn_append_rule \ -"$ac_dir/__install-lib__:: $ac_dir \$(DESTDIR)\$(dlldir) - \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(dlldir)/$ac_program +"$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(bindir) + \$(INSTALL_PROGRAM) $ac_dir/$ac_program \$(DESTDIR)\$(bindir)/$ac_program $ac_dir/__uninstall__:: - \$(RM) \$(DESTDIR)\$(dlldir)/$ac_program" + \$(RM) \$(DESTDIR)\$(bindir)/$ac_program" fi - if test "x$enable_tools" != xno && wine_fn_has_flag manpage $ac_flags + if test -z "$with_wine64" && wine_fn_has_flag manpage $ac_flags then wine_fn_append_rule \ "$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(mandir)/man\$(prog_manext)

1 0

Alexandre Julliard : configure: Simplify the generation of the install and clean rules.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 204105ade494c93d6cce1026058b7bbc30b0b799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204105ade494c93d6cce10260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 19:31:33 2013 +0200 configure: Simplify the generation of the install and clean rules. --- Make.rules.in | 2 +- aclocal.m4 | 120 +++++++++++++++++++++++++--------------------- configure | 130 ++++++++++++++++++++++++++------------------------ tools/make_makefiles | 8 +++ 4 files changed, 142 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=204105ade494c93d6cce1…

1 0

Alexandre Julliard : winspool: Store generic. ppd in a resource instead of depending on an external file.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 8c959d6c560563d1c7b746e5e28e7245d0b34b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c959d6c560563d1c7b746e5e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 5 12:54:38 2013 +0200 winspool: Store generic.ppd in a resource instead of depending on an external file. --- configure | 5 +-- configure.ac | 3 +- dlls/wineps.drv/Makefile.in | 10 ----- dlls/{wineps.drv => winspool.drv}/generic.ppd | 0 dlls/winspool.drv/info.c | 48 ++++++++++++++---------- dlls/winspool.drv/winspool.rc | 3 ++ 6 files changed, 33 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 24ed2a8..c25d104 100755 --- a/configure +++ b/configure @@ -16598,8 +16598,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS -ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" -test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" @@ -17228,7 +17226,7 @@ wine_fn_config_dll winemac.drv enable_winemac_drv wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv -wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po +wine_fn_config_dll wineps.drv enable_wineps_drv po wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder wine_fn_config_dll winex11.drv enable_winex11_drv @@ -18217,7 +18215,6 @@ do "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; "dlls/shell32/AUTHORS") CONFIG_LINKS="$CONFIG_LINKS dlls/shell32/AUTHORS:AUTHORS" ;; - "dlls/wineps.drv/generic.ppd") CONFIG_LINKS="$CONFIG_LINKS dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" ;; "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; diff --git a/configure.ac b/configure.ac index a508f8b..763889b 100644 --- a/configure.ac +++ b/configure.ac @@ -2617,7 +2617,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile]) WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) -WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) @@ -3198,7 +3197,7 @@ WINE_CONFIG_DLL(winemac.drv) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) -WINE_CONFIG_DLL(wineps.drv,,[install-lib,po]) +WINE_CONFIG_DLL(wineps.drv,,[po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) WINE_CONFIG_DLL(winex11.drv) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index bd810f9..3775f28 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -67,13 +67,3 @@ RC_SRCS = wineps.rc EXTRASUBDIRS = data @MAKE_DLL_RULES@ - -install-ppd:: $(DESTDIR)$(datadir)/wine dummy - $(INSTALL_DATA) $(srcdir)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd - -.PHONY: install-ppd - -@WOW64_DISABLE@ install install-lib:: install-ppd - -uninstall:: - $(RM) $(DESTDIR)$(datadir)/wine/generic.ppd diff --git a/dlls/wineps.drv/generic.ppd b/dlls/winspool.drv/generic.ppd similarity index 100% rename from dlls/wineps.drv/generic.ppd rename to dlls/winspool.drv/generic.ppd diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2ab2401..ed4b314 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -646,7 +646,6 @@ static char *get_fallback_ppd_name( const char *printer_name ) HKEY hkey; DWORD needed, type; char *ret = NULL; - const char *data_dir, *filename; if (RegOpenKeyW( HKEY_CURRENT_USER, ppds_key, &hkey ) == ERROR_SUCCESS ) { @@ -666,22 +665,7 @@ static char *get_fallback_ppd_name( const char *printer_name ) RegCloseKey( hkey ); if (ret) return expand_env_string( ret, type ); } - - if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; - else - { - ERR( "Error getting PPD file name for printer '%s'\n", debugstr_a(printer_name) ); - return NULL; - } - ret = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + strlen(filename) + 1 ); - if (ret) - { - strcpy( ret, data_dir ); - strcat( ret, filename ); - } - - return ret; + return NULL; } static BOOL copy_file( const char *src, const char *dst ) @@ -707,15 +691,39 @@ fail: return ret; } +static BOOL get_internal_fallback_ppd( const WCHAR *ppd ) +{ + static const WCHAR typeW[] = {'P','P','D','F','I','L','E',0}; + + char *ptr, *end; + DWORD size, written; + HANDLE file; + BOOL ret; + HRSRC res = FindResourceW( WINSPOOL_hInstance, MAKEINTRESOURCEW(1), typeW ); + + if (!res || !(ptr = LoadResource( WINSPOOL_hInstance, res ))) return FALSE; + size = SizeofResource( WINSPOOL_hInstance, res ); + end = memchr( ptr, 0, size ); /* resource file may contain additional nulls */ + if (end) size = end - ptr; + file = CreateFileW( ppd, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0 ); + if (file == INVALID_HANDLE_VALUE) return FALSE; + ret = WriteFile( file, ptr, size, &written, NULL ) && written == size; + CloseHandle( file ); + if (ret) TRACE( "using internal fallback for %s\n", debugstr_w( ppd )); + else DeleteFileW( ppd ); + return ret; +} + static BOOL get_fallback_ppd( const char *printer_name, const WCHAR *ppd ) { - char *src = get_fallback_ppd_name( printer_name ); - char *dst = wine_get_unix_file_name( ppd ); + char *dst, *src = get_fallback_ppd_name( printer_name ); BOOL ret = FALSE; + if (!src) return get_internal_fallback_ppd( ppd ); + TRACE( "(%s %s) found %s\n", debugstr_a(printer_name), debugstr_w(ppd), debugstr_a(src) ); - if (!src || !dst) goto fail; + if (!(dst = wine_get_unix_file_name( ppd ))) goto fail; if (symlink( src, dst ) == -1) if (errno != ENOSYS || !copy_file( src, dst )) diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 9b88b8d..6936353 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -42,6 +42,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: generic.ppd */ +1 PPDFILE generic.ppd + #define WINE_FILENAME_STR "winspool.drv" #define WINE_FILEDESCRIPTION_STR "Wine core printer driver"

1 0

Frédéric Delanoy : ws2_32: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: aedb86a46f48626839f3ae9253470a13bd9c29a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedb86a46f48626839f3ae925… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:40 2013 +0200 ws2_32: Use BOOL type where appropriate. --- dlls/ws2_32/socket.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1b1815c..679258b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5065,7 +5065,8 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) for (n = 0; n < routes->dwNumEntries; n++) { IF_INDEX ifindex; - DWORD ifmetric, exists = FALSE; + DWORD ifmetric; + BOOL exists = FALSE; if (routes->table[n].u1.ForwardType != MIB_IPROUTE_TYPE_DIRECT) continue;

1 0

Frédéric Delanoy : mscoree: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 1214fb41dd2040a3269e60790668ffd064959cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1214fb41dd2040a3269e60790… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:39 2013 +0200 mscoree: Use BOOL type where appropriate. --- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/metahost.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 76b7d65..14854d1 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -60,7 +60,7 @@ static struct list dll_fixups; struct dll_fixup { struct list entry; - int done; + BOOL done; HMODULE dll; void *thunk_code; /* pointer into dll_fixup_heap */ VTableFixup *fixup; @@ -939,7 +939,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) } } - fixup->done = 1; + fixup->done = TRUE; } if (info != NULL) @@ -972,7 +972,7 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) fixup->thunk_code = HeapAlloc(dll_fixup_heap, 0, sizeof(struct vtable_fixup_thunk) * vtable_fixup->count); fixup->fixup = vtable_fixup; fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; - fixup->done = 0; + fixup->done = FALSE; if (vtable_fixup->type & COR_VTABLE_32BIT) { diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 519e991..f6558d9 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -59,7 +59,7 @@ static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} }; -static int runtimes_initialized; +static BOOL runtimes_initialized = FALSE; static CRITICAL_SECTION runtime_list_cs; static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = @@ -818,7 +818,7 @@ static void find_runtimes(void) runtimes[i].mono_abi_version = -1; } - runtimes_initialized = 1; + runtimes_initialized = TRUE; end: LeaveCriticalSection(&runtime_list_cs); @@ -1335,7 +1335,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (config_file) { - int found=0; + BOOL found = FALSE; hr = parse_config_file(config_file, &parsed_config); if (SUCCEEDED(hr)) @@ -1346,7 +1346,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, hr = CLRMetaHost_GetRuntime(0, entry->version, &IID_ICLRRuntimeInfo, (void**)result); if (SUCCEEDED(hr)) { - found = 1; + found = TRUE; break; } }

1 0

Frédéric Delanoy : riched20/tests: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c388cce8aa75a4c724a51d956844c08d06744366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c388cce8aa75a4c724a51d956… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:38 2013 +0200 riched20/tests: Use BOOL type where appropriate. --- dlls/riched20/tests/editor.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4d9fde6..2fc228b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1637,27 +1637,27 @@ static void test_EM_SETOPTIONS(void) DestroyWindow(hwndRichEdit); } -static int check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) +static BOOL check_CFE_LINK_selection(HWND hwnd, int sel_start, int sel_end) { CHARFORMAT2W text_format; text_format.cbSize = sizeof(text_format); SendMessage(hwnd, EM_SETSEL, sel_start, sel_end); SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); - return (text_format.dwEffects & CFE_LINK) ? 1 : 0; + return (text_format.dwEffects & CFE_LINK) != 0; } -static void check_CFE_LINK_rcvd(HWND hwnd, int is_url, const char * url) +static void check_CFE_LINK_rcvd(HWND hwnd, BOOL is_url, const char * url) { - int link_present = 0; + BOOL link_present = FALSE; link_present = check_CFE_LINK_selection(hwnd, 0, 1); if (is_url) { /* control text is url; should get CFE_LINK */ - ok(0 != link_present, "URL Case: CFE_LINK not set for [%s].\n", url); + ok(link_present, "URL Case: CFE_LINK not set for [%s].\n", url); } else { - ok(0 == link_present, "Non-URL Case: CFE_LINK set for [%s].\n", url); + ok(!link_present, "Non-URL Case: CFE_LINK set for [%s].\n", url); } } @@ -1672,20 +1672,20 @@ static void test_EM_AUTOURLDETECT(void) one non-URL and one URL */ struct urls_s { const char *text; - int is_url; + BOOL is_url; } urls[12] = { - {"winehq.org", 0}, - {"http://www.winehq.org", 1}, - {"http//winehq.org", 0}, - {"ww.winehq.org", 0}, - {"www.winehq.org", 1}, - {"ftp://192.168.1.1", 1}, - {"ftp//192.168.1.1", 0}, - {"mailto:your@email.com", 1}, - {"prospero:prosperoserver", 1}, - {"telnet:test", 1}, - {"news:newserver", 1}, - {"wais:waisserver", 1} + {"winehq.org", FALSE}, + {"http://www.winehq.org", TRUE}, + {"http//winehq.org", FALSE}, + {"ww.winehq.org", FALSE}, + {"www.winehq.org", TRUE}, + {"ftp://192.168.1.1", TRUE}, + {"ftp//192.168.1.1", FALSE}, + {"mailto:your@email.com", TRUE}, + {"prospero:prosperoserver", TRUE}, + {"telnet:test", TRUE}, + {"news:newserver", TRUE}, + {"wais:waisserver", TRUE} }; int i, j; @@ -1769,7 +1769,7 @@ static void test_EM_AUTOURLDETECT(void) SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); - check_CFE_LINK_rcvd(hwndRichEdit, 0, urls[i].text); + check_CFE_LINK_rcvd(hwndRichEdit, FALSE, urls[i].text); /* Link detection should happen immediately upon WM_SETTEXT */ SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0);

1 0

Frédéric Delanoy : riched20: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: f03d251ef2b19813729a1d3313268f4db599f37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03d251ef2b19813729a1d331… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:37 2013 +0200 riched20: Use BOOL type where appropriate. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6e7ffae..4e3d978 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -253,7 +253,7 @@ HANDLE me_heap = NULL; static BOOL ME_ListBoxRegistered = FALSE; static BOOL ME_ComboBoxRegistered = FALSE; -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); }

1 0

Frédéric Delanoy : msi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: e21abfe07a7be233993cc52612b29597f419379c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21abfe07a7be233993cc5261… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:36 2013 +0200 msi/tests: Use BOOL type where appropriate. --- dlls/msi/tests/msi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 5df72e9..066b1d4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -12766,7 +12766,7 @@ static void test_MsiGetPatchInfo(void) static void test_MsiEnumProducts(void) { UINT r; - int found1, found2, found3; + BOOL found1, found2, found3; DWORD index; char product1[39], product2[39], product3[39], guid[39]; char product_squashed1[33], product_squashed2[33], product_squashed3[33]; @@ -12824,12 +12824,12 @@ static void test_MsiEnumProducts(void) r = MsiEnumProductsA(index, guid); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - found1 = found2 = found3 = 0; + found1 = found2 = found3 = FALSE; while ((r = MsiEnumProductsA(index, guid)) == ERROR_SUCCESS) { - if (!strcmp(product1, guid)) found1 = 1; - if (!strcmp(product2, guid)) found2 = 1; - if (!strcmp(product3, guid)) found3 = 1; + if (!strcmp(product1, guid)) found1 = TRUE; + if (!strcmp(product2, guid)) found2 = TRUE; + if (!strcmp(product3, guid)) found3 = TRUE; index++; } ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r);

1 0

Frédéric Delanoy : dinput: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: b95272e2d5f761e0994286f9996882fbf6c1c318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95272e2d5f761e0994286f99… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:35 2013 +0200 dinput: Use BOOL type where appropriate. --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fc5ad5d..08ebfd7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -575,7 +575,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DWORD type = (0x0000ff00 & dwSemantic) >> 8; DWORD offset = 0x000000ff & dwSemantic; DWORD obj_instance = 0; - DWORD found = 0; + BOOL found = FALSE; int i; for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) @@ -585,7 +585,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) if (odf->dwOfs == offset) { obj_instance = DIDFT_GETINSTANCE(odf->dwType); - found = 1; + found = TRUE; break; } }

1 0

Henri Verbeet : d3drm: Get rid of the IDirect3DRMLightArrayImpl typedef.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: e9f2fce16b96cb469173363902da7e5145a0a66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f2fce16b96cb46917336390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:51 2013 +0200 d3drm: Get rid of the IDirect3DRMLightArrayImpl typedef. --- dlls/d3drm/frame.c | 163 +++++++++++++++++++++++---------------------------- 1 files changed, 74 insertions(+), 89 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6cd6c0e..fb0c22d 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -72,12 +72,13 @@ typedef struct { IDirect3DRMVisual **visuals; } IDirect3DRMVisualArrayImpl; -typedef struct { +struct d3drm_light_array +{ IDirect3DRMLightArray IDirect3DRMLightArray_iface; LONG ref; ULONG size; IDirect3DRMLight **lights; -} IDirect3DRMLightArrayImpl; +}; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -91,9 +92,9 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); -static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) +static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) { - return CONTAINING_RECORD(iface, IDirect3DRMLightArrayImpl, IDirect3DRMLightArray_iface); + return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); } /*** IUnknown methods ***/ @@ -328,122 +329,106 @@ static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) return S_OK; } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirect3DRMLightArrayImpl_QueryInterface(IDirect3DRMLightArray* iface, - REFIID riid, void** object) +static HRESULT WINAPI d3drm_light_array_QueryInterface(IDirect3DRMLightArray *iface, REFIID riid, void **out) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object); - - *object = NULL; + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirect3DRMLightArray)) - { - *object = &This->IDirect3DRMLightArray_iface; - } - else + if (IsEqualGUID(riid, &IID_IDirect3DRMLightArray) + || IsEqualGUID(riid, &IID_IUnknown)) { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IDirect3DRMLightArray_AddRef(iface); + *out = iface; + return S_OK; } - IDirect3DRMLightArray_AddRef(iface); - return S_OK; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DRMLightArrayImpl_AddRef(IDirect3DRMLightArray* iface) +static ULONG WINAPI d3drm_light_array_AddRef(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); + ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DRMLightArrayImpl_Release(IDirect3DRMLightArray* iface) +static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); + ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - for (i = 0; i < This->size; i++) - IDirect3DRMLight_Release(This->lights[i]); - HeapFree(GetProcessHeap(), 0, This->lights); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < array->size; ++i) + { + IDirect3DRMLight_Release(array->lights[i]); + } + HeapFree(GetProcessHeap(), 0, array->lights); + HeapFree(GetProcessHeap(), 0, array); } - return ref; + return refcount; } -/*** IDirect3DRMArray methods ***/ -static DWORD WINAPI IDirect3DRMLightArrayImpl_GetSize(IDirect3DRMLightArray* iface) +static DWORD WINAPI d3drm_light_array_GetSize(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("(%p)->() = %d\n", This, This->size); + TRACE("iface %p.\n", iface); - return This->size; + return array->size; } -/*** IDirect3DRMLightArray methods ***/ -static HRESULT WINAPI IDirect3DRMLightArrayImpl_GetElement(IDirect3DRMLightArray *iface, +static HRESULT WINAPI d3drm_light_array_GetElement(IDirect3DRMLightArray *iface, DWORD index, IDirect3DRMLight **light) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("(%p)->(%u, %p)\n", This, index, light); + TRACE("iface %p, index %u, light %p.\n", iface, index, light); if (!light) return D3DRMERR_BADVALUE; - *light = NULL; - - if (index >= This->size) + if (index >= array->size) + { + *light = NULL; return D3DRMERR_BADVALUE; + } - IDirect3DRMLight_AddRef(This->lights[index]); - *light = This->lights[index]; + IDirect3DRMLight_AddRef(array->lights[index]); + *light = array->lights[index]; return D3DRM_OK; } -static const struct IDirect3DRMLightArrayVtbl Direct3DRMLightArray_Vtbl = +static const struct IDirect3DRMLightArrayVtbl d3drm_light_array_vtbl = { - /*** IUnknown methods ***/ - IDirect3DRMLightArrayImpl_QueryInterface, - IDirect3DRMLightArrayImpl_AddRef, - IDirect3DRMLightArrayImpl_Release, - /*** IDirect3DRMArray methods ***/ - IDirect3DRMLightArrayImpl_GetSize, - /*** IDirect3DRMLightArray methods ***/ - IDirect3DRMLightArrayImpl_GetElement + d3drm_light_array_QueryInterface, + d3drm_light_array_AddRef, + d3drm_light_array_Release, + d3drm_light_array_GetSize, + d3drm_light_array_GetElement, }; -static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) +static struct d3drm_light_array *d3drm_light_array_create(void) { - IDirect3DRMLightArrayImpl* object; - - TRACE("(%p)\n", obj); - - *obj = NULL; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); - if (!object) - return E_OUTOFMEMORY; + struct d3drm_light_array *array; - object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; - object->ref = 1; + if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + return NULL; - *obj = &object->IDirect3DRMLightArray_iface; + array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; + array->ref = 1; - return S_OK; + return array; } /*** IUnknown methods ***/ @@ -1678,32 +1663,32 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetColor(IDirect3DRMFrame3* iface) static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3 *iface, IDirect3DRMLightArray **lights) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - IDirect3DRMLightArrayImpl* obj; - HRESULT hr; + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_light_array *array; - TRACE("(%p/%p)->(%p)\n", iface, This, lights); + TRACE("iface %p, lights %p.\n", iface, lights); if (!lights) return D3DRMERR_BADVALUE; - hr = Direct3DRMLightArray_create(lights); - - if (hr != D3DRM_OK) - return hr; - - obj = (IDirect3DRMLightArrayImpl*)*lights; + if (!(array = d3drm_light_array_create())) + return E_OUTOFMEMORY; - obj->size = This->nb_lights; - if (This->nb_lights) + array->size = frame->nb_lights; + if (frame->nb_lights) { ULONG i; - if (!(obj->lights = HeapAlloc(GetProcessHeap(), 0, This->nb_lights * sizeof(*obj->lights)))) + + if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights)))) return E_OUTOFMEMORY; - for (i = 0; i < This->nb_lights; i++) - IDirect3DRMLight_QueryInterface(This->lights[i], &IID_IDirect3DRMLight, (void**)&obj->lights[i]); + for (i = 0; i < frame->nb_lights; ++i) + { + IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]); + } } + *lights = &array->IDirect3DRMLightArray_iface; + return D3DRM_OK; }

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
76
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 October 2013