August 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Correct GdipSaveImageToFile spec entry.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: af042f2754682fd7d819ee1bc6a3688048dea79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af042f2754682fd7d819ee1bc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 6 11:57:26 2012 +0900 gdiplus: Correct GdipSaveImageToFile spec entry. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7d6c51f..ccf47f9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -474,7 +474,7 @@ 474 stdcall GdipSaveAdd(ptr ptr) 475 stub GdipSaveAddImage 476 stdcall GdipSaveGraphics(ptr ptr) -477 stdcall GdipSaveImageToFile(ptr ptr ptr ptr) +477 stdcall GdipSaveImageToFile(ptr wstr ptr ptr) 478 stdcall GdipSaveImageToStream(ptr ptr ptr ptr) 479 stdcall GdipScaleLineTransform(ptr float float long) 480 stdcall GdipScaleMatrix(ptr float float long)

1 0

Dmitry Timoshkov : include/gdipluspixelformats.h: Avoid explicit TRUE/ FALSE in conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 017f802875ce0a4374eb6bc234a3c3dc0afeb8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=017f802875ce0a4374eb6bc23… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 8 17:20:51 2012 +0900 include/gdipluspixelformats.h: Avoid explicit TRUE/FALSE in conditional expressions. --- include/gdipluspixelformats.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index 7e6b327..9922b24 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -51,22 +51,22 @@ typedef INT PixelFormat; static inline BOOL IsIndexedPixelFormat(PixelFormat format) { - return (format & PixelFormatIndexed) ? TRUE : FALSE; + return (format & PixelFormatIndexed) != 0; } static inline BOOL IsAlphaPixelFormat(PixelFormat format) { - return (format & PixelFormatAlpha) ? TRUE : FALSE; + return (format & PixelFormatAlpha) != 0; } static inline BOOL IsCanonicalPixelFormat(PixelFormat format) { - return (format & PixelFormatCanonical) ? TRUE : FALSE; + return (format & PixelFormatCanonical) != 0; } static inline BOOL IsExtendedPixelFormat(PixelFormat format) { - return (format & PixelFormatExtended) ? TRUE : FALSE; + return (format & PixelFormatExtended) != 0; } static inline UINT GetPixelFormatSize(PixelFormat format)

1 0

Michael Stefaniuc : server: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 794ad909825763984979ef1d8a9f035c45d78a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=794ad909825763984979ef1d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 10:10:44 2012 +0200 server: Avoid TRUE:FALSE conditional expressions. --- server/security.h | 4 ++-- server/token.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/security.h b/server/security.h index d5f629d..38e36c0 100644 --- a/server/security.h +++ b/server/security.h @@ -90,7 +90,7 @@ extern int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) /* gets the discretionary access control list from a security descriptor */ static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int *present ) { - *present = (sd->control & SE_DACL_PRESENT ? TRUE : FALSE); + *present = (sd->control & SE_DACL_PRESENT) != 0; if (sd->dacl_len) return (const ACL *)((const char *)(sd + 1) + @@ -102,7 +102,7 @@ static inline const ACL *sd_get_dacl( const struct security_descriptor *sd, int /* gets the system access control list from a security descriptor */ static inline const ACL *sd_get_sacl( const struct security_descriptor *sd, int *present ) { - *present = (sd->control & SE_SACL_PRESENT ? TRUE : FALSE); + *present = (sd->control & SE_SACL_PRESENT) != 0; if (sd->sacl_len) return (const ACL *)((const char *)(sd + 1) + diff --git a/server/token.c b/server/token.c index a0ec143..b66a603 100644 --- a/server/token.c +++ b/server/token.c @@ -475,9 +475,9 @@ static struct token *create_token( unsigned primary, const SID *user, memcpy( &group->sid, groups[i].Sid, FIELD_OFFSET( SID, SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ) ); group->enabled = TRUE; group->def = TRUE; - group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) ? TRUE : FALSE; - group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) ? TRUE : FALSE; - group->owner = groups[i].Attributes & SE_GROUP_OWNER ? TRUE : FALSE; + group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; + group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0; + group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; group->resource = FALSE; group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry );

1 0

Lucas Zawacki : joy.cpl: Better arrangement of elements even with higher DPIs.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: dd3e54d49675445a396f6102b65e73ac453acdd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd3e54d49675445a396f6102b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Aug 1 17:37:45 2012 -0300 joy.cpl: Better arrangement of elements even with higher DPIs. --- dlls/joy.cpl/joy.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 708518b..f407aa6 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -34,11 +34,11 @@ CAPTION "Joysticks" FONT 8, "Ms Shell Dlg" { PUSHBUTTON "&Disable", IDC_BUTTONDISABLE, 200, 20, 50, 15 - PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 95, 50, 15 + PUSHBUTTON "&Enable", IDC_BUTTONENABLE, 200, 105, 50, 15 LTEXT "Connected", IDC_STATIC, 10, 10, 100, 10 LISTBOX IDC_JOYSTICKLIST, 10, 20, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Disabled", IDC_STATIC, 10, 85, 100, 10 - LISTBOX IDC_DISABLEDLIST, 10, 95, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY + LTEXT "Disabled", IDC_STATIC, 10, 95, 100, 10 + LISTBOX IDC_DISABLEDLIST, 10, 105, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY } IDD_TEST DIALOG 0, 0, 320, 220

1 0

Lucas Zawacki : joy.cpl: Remove uneeded FIXME message.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: fb939873ba31e461416ea2405274215c54d5c826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb939873ba31e461416ea2405… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Aug 1 17:36:01 2012 -0300 joy.cpl: Remove uneeded FIXME message. --- dlls/joy.cpl/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index c8b4a27..54771b0 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -657,9 +657,7 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp joy->cur_effect = 0; IDirectInputDevice8_EnumEffects(joy->device, ff_effects_callback, (void*) joy, 0); - FIXME("%d --- %d\n", joy->num_effects, joy->cur_effect); joy->num_effects = joy->cur_effect; - } }

1 0

Hans Leidekker : msi: Avoid an out of bounds access in msi_build_directory_name.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: b7cefc999701a5c2ff8ffc5c5f3da77ff82a874d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cefc999701a5c2ff8ffc5c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 1 11:54:18 2012 +0200 msi: Avoid an out of bounds access in msi_build_directory_name. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1ad3bc2..e1d2f2a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2154,7 +2154,7 @@ WCHAR *msi_build_directory_name( DWORD count, ... ) const WCHAR *str = va_arg( va, const WCHAR * ); if (!str) continue; strcatW( dir, str ); - if ( i + 1 != count && dir[strlenW( dir ) - 1] != '\\') strcatW( dir, szBackSlash ); + if ( i + 1 != count && dir[0] && dir[strlenW( dir ) - 1] != '\\') strcatW( dir, szBackSlash ); } va_end( va ); return dir;

1 0

Hans Leidekker : msi: Try the registered install location first when resolving the target directory .
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 842525f423b0c105eded22e0e7b613f7e5ffcd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842525f423b0c105eded22e0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 1 11:55:22 2012 +0200 msi: Try the registered install location first when resolving the target directory. --- dlls/msi/action.c | 18 +++++++++++++++--- dlls/msi/msipriv.h | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e1d2f2a..f874528 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2281,6 +2281,19 @@ WCHAR *msi_normalize_path( const WCHAR *in ) return ret; } +static WCHAR *get_install_location( MSIPACKAGE *package ) +{ + HKEY hkey; + WCHAR *path; + + if (!package->ProductCode) return NULL; + if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) + return NULL; + path = msi_reg_get_val_str( hkey, szInstallLocation ); + RegCloseKey( hkey ); + return path; +} + void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL load_prop ) { FolderList *fl; @@ -2293,7 +2306,8 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa if (!strcmpW( folder->Directory, szTargetDir )) /* special resolving for target root dir */ { - if (!load_prop || !(path = msi_dup_property( package->db, szTargetDir ))) + if (!(path = get_install_location( package )) && + (!load_prop || !(path = msi_dup_property( package->db, szTargetDir )))) { path = msi_dup_property( package->db, szRootDrive ); } @@ -4837,8 +4851,6 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) {'H','e','l','p','T','e','l','e','p','h','o','n','e',0}; static const WCHAR szARPINSTALLLOCATION[] = {'A','R','P','I','N','S','T','A','L','L','L','O','C','A','T','I','O','N',0}; - static const WCHAR szInstallLocation[] = - {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; static const WCHAR szManufacturer[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR szPublisher[] = diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a0657f4..43ac194 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1177,6 +1177,7 @@ static const WCHAR szRollbackDisabled[] = {'R','o','l','l','b','a','c','k','D',' static const WCHAR szName[] = {'N','a','m','e',0}; static const WCHAR szData[] = {'D','a','t','a',0}; static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; +static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Per Johansson : wineqtdecoder: Avoid CFSTR in global initializer.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 96d7fac2969b065a5aaaa4d7b35f0c2374d5057a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d7fac2969b065a5aaaa4d7b… Author: Per Johansson <per(a)morth.org> Date: Wed Aug 1 22:35:57 2012 +0300 wineqtdecoder: Avoid CFSTR in global initializer. --- dlls/wineqtdecoder/qtdatahandler.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index 9c839aa..bfbeab9 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -324,19 +324,19 @@ static pascal ComponentResult myDataHGetFileTypeOrdering ( DataHandler dh, } typedef struct { - const CFStringRef fname; + const char *const fname; const int sig_length; const BYTE sig[10]; } signature; static const signature stream_sigs[] = { - {CFSTR("video.asf"),4,{0x30,0x26,0xb2,0x75}}, - {CFSTR("video.mov"),8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}}, - {CFSTR("video.mp4"),8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}}, - {CFSTR("video.m4v"),8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}}, - {CFSTR("video.flv"),4,{0x46,0x4C,0x56,0x01}}, - {CFSTR("video.mpg"),3,{0x00,0x00,0x01}}, - {CFSTR("avideo.rm"),4,{0x2E,0x52,0x4D,0x46}} + {"video.asf",4,{0x30,0x26,0xb2,0x75}}, + {"video.mov",8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}}, + {"video.mp4",8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}}, + {"video.m4v",8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}}, + {"video.flv",4,{0x46,0x4C,0x56,0x01}}, + {"video.mpg",3,{0x00,0x00,0x01}}, + {"avideo.rm",4,{0x2E,0x52,0x4D,0x46}} }; static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) @@ -364,7 +364,8 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++) if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) { - CFStringGetPascalString(stream_sigs[i].fname,str,256,kCFStringEncodingMacRoman); + str[0] = strlen(stream_sigs[i].fname); + memcpy(str + 1, stream_sigs[i].fname, str[0]); return noErr; }

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.10
by Jeremy Newman Aug. 6, 2012

Aug. 6, 2012

Module: website Branch: master Commit: 0da6b2c5af357b413b9babca69fcb4bcd8ee8ae3 URL: http://source.winehq.org/git/website.git/?a=commit;h=0da6b2c5af357b413b9bab… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Wed Aug 1 15:42:01 2012 +0200 Polish translation for release 1.5.10 --- news/pl/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2012073101.xml b/news/pl/2012073101.xml new file mode 100644 index 0000000..db449ea --- /dev/null +++ b/news/pl/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 31, 2012</date> +<title>Wydano Wine 1.5.10</title> +<body> + Wydanie rozwojowe Wine 1.5.10 jest już dostępne. + <a href="{$root}/announce/1.5.10">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Gecko oparta o Firefox 14.</li> + <li>Wsparcie dla OpenGL w silniku DIB przy użyciu libOSMesa.</li> + <li>Renderowanie poza ekranem jest teraz domyślnie włączone w Direct3D.</li> + <li>Trochę więcej infrastruktury WMI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.10
by Jeremy Newman Aug. 6, 2012

Aug. 6, 2012

Module: website Branch: master Commit: 81c3c9961835bc5397d96c7adf9a8212ee898ba0 URL: http://source.winehq.org/git/website.git/?a=commit;h=81c3c9961835bc5397d96c… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 6 15:04:26 2012 -0300 Portuguese translation for release 1.5.10 --- news/pt/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2012073101.xml b/news/pt/2012073101.xml new file mode 100644 index 0000000..f0a73e5 --- /dev/null +++ b/news/pt/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>31 de Julho de 2012</date> +<title>Wine 1.5.10 lançado</title> +<body> + A versão de desenvolvmento 1.5.10 já está disponível. + <a href="{$root}/announce/1.5.10">Novidades nesta</a> versão: +<ul> + <li>Nova versão da engine Gecko baseada no Firefox 14.</li> + <li>Suporte a OpenGL na engine DIB usando a libOSMesa.</li> + <li>Off-screen rendering agora é a opção padrão do Direct3D.</li> + <li>Um pouco mais de infra-estrutura WMI.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0