March 2011 - Wine-Commits - list.winehq.org

Peter Schellenbach : oleaut32: Corrected registration flag inversion in RegisterActiveObject.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 99af2f56ba972f062acb389f802e417c8d310dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=99af2f56ba972f062acb389f8… Author: Peter Schellenbach <pjs(a)asent.com> Date: Thu Mar 3 17:03:40 2011 -0800 oleaut32: Corrected registration flag inversion in RegisterActiveObject. --- dlls/oleaut32/oleaut.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index ac2d666..f93339a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -471,6 +471,7 @@ HRESULT WINAPI RegisterActiveObject( HRESULT ret; LPRUNNINGOBJECTTABLE runobtable; LPMONIKER moniker; + DWORD rot_flags = ROTFLAGS_REGISTRATIONKEEPSALIVE; /* default registration is strong */ StringFromGUID2(rcid,guidbuf,39); ret = CreateItemMoniker(pdelimiter,guidbuf,&moniker); @@ -481,7 +482,9 @@ HRESULT WINAPI RegisterActiveObject( IMoniker_Release(moniker); return ret; } - ret = IRunningObjectTable_Register(runobtable,dwFlags,punk,moniker,pdwRegister); + if(dwFlags == ACTIVEOBJECT_WEAK) + rot_flags = 0; + ret = IRunningObjectTable_Register(runobtable,rot_flags,punk,moniker,pdwRegister); IRunningObjectTable_Release(runobtable); IMoniker_Release(moniker); return ret;

1 0

Alexandre Julliard : winex11: Register clipboard formats only once they are actually used.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 59fb0ad174de1a37bab218ace163f717adf809ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=59fb0ad174de1a37bab218ace… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 17:02:21 2011 +0100 winex11: Register clipboard formats only once they are actually used. --- dlls/winex11.drv/clipboard.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2789724..225c23c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -336,11 +336,11 @@ void X11DRV_InitClipboard(void) /* Register known mapping between window formats and X properties */ for (i = 0; i < sizeof(PropertyFormatMap)/sizeof(PropertyFormatMap[0]); i++) - X11DRV_CLIPBOARD_InsertClipboardFormat( GlobalAddAtomW(PropertyFormatMap[i].lpszFormat), + X11DRV_CLIPBOARD_InsertClipboardFormat( RegisterClipboardFormatW(PropertyFormatMap[i].lpszFormat), GET_ATOM(PropertyFormatMap[i].prop)); /* Set up a conversion function from "HTML Format" to "text/html" */ - format = X11DRV_CLIPBOARD_InsertClipboardFormat( GlobalAddAtomW(wszHTMLFormat), + format = X11DRV_CLIPBOARD_InsertClipboardFormat( RegisterClipboardFormatW(wszHTMLFormat), GET_ATOM(XATOM_text_html)); format->lpDrvExportFunc = X11DRV_CLIPBOARD_ExportTextHtml; } @@ -552,6 +552,9 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE hData, D TRACE("format=%04x lpData=%p hData=%p flags=0x%08x lpFormat=%p override=%d\n", wFormatID, lpData, hData, flags, lpFormat, override); + /* make sure the format exists */ + if (!lpFormat) register_format( wFormatID, 0 ); + if (lpData && !override) return TRUE; @@ -1945,7 +1948,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p wname = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); MultiByteToWideChar(CP_UNIXCP, 0, names[i], -1, wname, len); - lpFormat = register_format( GlobalAddAtomW(wname), atoms[i] ); + lpFormat = register_format( RegisterClipboardFormatW(wname), atoms[i] ); HeapFree(GetProcessHeap(), 0, wname); if (!lpFormat) { @@ -2486,11 +2489,7 @@ static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void) */ UINT CDECL X11DRV_RegisterClipboardFormat(LPCWSTR FormatName) { - UINT id = GlobalAddAtomW( FormatName ); - - if (!id) return 0; - if (!register_format( id, 0 )) return 0; - return id; + return GlobalAddAtomW( FormatName ); }

1 0

Alexandre Julliard : user32: Get rid of the RegisterClipboardFormat driver entry point.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 7879b8e349e2a8e81d684a78939865cbf758e00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7879b8e349e2a8e81d684a789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 17:05:32 2011 +0100 user32: Get rid of the RegisterClipboardFormat driver entry point. --- dlls/user32/clipboard.c | 18 ++++-------------- dlls/user32/driver.c | 13 ------------- dlls/user32/tests/clipboard.c | 3 +++ dlls/user32/user_private.h | 1 - dlls/winex11.drv/clipboard.c | 12 ------------ dlls/winex11.drv/winex11.drv.spec | 1 - 6 files changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 875a027..0985e6f 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -213,28 +213,18 @@ static HWND CLIPBOARD_SetClipboardViewer( HWND hWnd ) /************************************************************************** * RegisterClipboardFormatW (USER32.@) */ -UINT WINAPI RegisterClipboardFormatW(LPCWSTR FormatName) +UINT WINAPI RegisterClipboardFormatW( LPCWSTR name ) { - return USER_Driver->pRegisterClipboardFormat(FormatName); + return GlobalAddAtomW( name ); } /************************************************************************** * RegisterClipboardFormatA (USER32.@) */ -UINT WINAPI RegisterClipboardFormatA(LPCSTR formatName) +UINT WINAPI RegisterClipboardFormatA( LPCSTR name ) { - int len; - LPWSTR wFormat; - UINT ret; - - len = MultiByteToWideChar(CP_ACP, 0, formatName, -1, NULL, 0); - wFormat = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, formatName, -1, wFormat, len); - - ret = RegisterClipboardFormatW(wFormat); - HeapFree(GetProcessHeap(), 0, wFormat); - return ret; + return GlobalAddAtomA( name ); } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d40789c..d152f86 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -98,7 +98,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(CountClipboardFormats); GET_USER_FUNC(EnumClipboardFormats); GET_USER_FUNC(IsClipboardFormatAvailable); - GET_USER_FUNC(RegisterClipboardFormat); GET_USER_FUNC(EndClipboardUpdate); GET_USER_FUNC(ChangeDisplaySettingsEx); GET_USER_FUNC(EnumDisplayMonitors); @@ -279,11 +278,6 @@ static BOOL CDECL nulldrv_IsClipboardFormatAvailable( UINT format ) return FALSE; } -static UINT CDECL nulldrv_RegisterClipboardFormat( LPCWSTR name ) -{ - return 0; -} - static BOOL CDECL nulldrv_SetClipboardData( UINT format, HANDLE handle, BOOL owner ) { return FALSE; @@ -457,7 +451,6 @@ static USER_DRIVER null_driver = nulldrv_EnumClipboardFormats, nulldrv_GetClipboardData, nulldrv_IsClipboardFormatAvailable, - nulldrv_RegisterClipboardFormat, nulldrv_SetClipboardData, /* display modes */ nulldrv_ChangeDisplaySettingsEx, @@ -626,11 +619,6 @@ static BOOL CDECL loaderdrv_IsClipboardFormatAvailable( UINT format ) return load_driver()->pIsClipboardFormatAvailable( format ); } -static UINT CDECL loaderdrv_RegisterClipboardFormat( LPCWSTR name ) -{ - return load_driver()->pRegisterClipboardFormat( name ); -} - static BOOL CDECL loaderdrv_SetClipboardData( UINT format, HANDLE handle, BOOL owner ) { return load_driver()->pSetClipboardData( format, handle, owner ); @@ -798,7 +786,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_EnumClipboardFormats, loaderdrv_GetClipboardData, loaderdrv_IsClipboardFormatAvailable, - loaderdrv_RegisterClipboardFormat, loaderdrv_SetClipboardData, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index c461df4..158ff3f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -183,6 +183,9 @@ todo_wine ok(!EmptyClipboard(), "EmptyClipboard should fail if clipboard wasn't open\n"); ok(GetLastError() == ERROR_CLIPBOARD_NOT_OPEN || broken(GetLastError() == 0xdeadbeef), /* wow64 */ "Wrong error %u\n", GetLastError()); + + format_id = RegisterClipboardFormatA("#1234"); + ok(format_id == 1234, "invalid clipboard format id %04x\n", format_id); } static HGLOBAL create_text(void) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f7b79b3..6d668ba 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -82,7 +82,6 @@ typedef struct tagUSER_DRIVER { UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */ HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ BOOL (CDECL *pIsClipboardFormatAvailable)(UINT); /* Check if specified format is available */ - UINT (CDECL *pRegisterClipboardFormat)(LPCWSTR); /* Register a clipboard format */ BOOL (CDECL *pSetClipboardData)(UINT, HANDLE, BOOL); /* Set specified selection data */ /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 225c23c..0899815 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2481,18 +2481,6 @@ static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void) **************************************************************************/ -/************************************************************************** - * RegisterClipboardFormat (X11DRV.@) - * - * Registers a custom X clipboard format - * Returns: Format id or 0 on failure - */ -UINT CDECL X11DRV_RegisterClipboardFormat(LPCWSTR FormatName) -{ - return GlobalAddAtomW( FormatName ); -} - - static void selection_acquire(void) { Window owner; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index cc5cf43..c4a7672 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -94,7 +94,6 @@ @ cdecl GetDC(long long long ptr ptr long) X11DRV_GetDC @ cdecl IsClipboardFormatAvailable(long) X11DRV_IsClipboardFormatAvailable @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) X11DRV_MsgWaitForMultipleObjectsEx -@ cdecl RegisterClipboardFormat(wstr) X11DRV_RegisterClipboardFormat @ cdecl ReleaseDC(long long) X11DRV_ReleaseDC @ cdecl ScrollDC(long long long ptr ptr long ptr) X11DRV_ScrollDC @ cdecl SetClipboardData(long long long) X11DRV_SetClipboardData

1 0

Alexandre Julliard : winex11: Remove the unused clipboard format flags.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: c7d2a4dddf0ead2f0f23ddd1924d81d3e93430f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d2a4dddf0ead2f0f23ddd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 7 16:59:39 2011 +0100 winex11: Remove the unused clipboard format flags. --- dlls/winex11.drv/clipboard.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1a3704d..2789724 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -114,7 +114,6 @@ typedef struct tagWINE_CLIPFORMAT { struct list entry; UINT wFormatID; UINT drvData; - UINT wFlags; DRVIMPORTFUNC lpDrvImportFunc; DRVEXPORTFUNC lpDrvExportFunc; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; @@ -128,10 +127,8 @@ typedef struct tagWINE_CLIPDATA { LPWINE_CLIPFORMAT lpFormat; } WINE_CLIPDATA, *LPWINE_CLIPDATA; -#define CF_FLAG_BUILTINFMT 0x0001 /* Built-in windows format */ -#define CF_FLAG_UNOWNED 0x0002 /* cached data is not owned */ -#define CF_FLAG_SYNTHESIZED 0x0004 /* Implicitly converted data */ -#define CF_FLAG_UNICODE 0x0008 /* Data is in unicode */ +#define CF_FLAG_UNOWNED 0x0001 /* cached data is not owned */ +#define CF_FLAG_SYNTHESIZED 0x0002 /* Implicitly converted data */ static int selectionAcquired = 0; /* Contains the current selection masks */ static Window selectionWindow = None; /* The top level X window which owns the selection */ @@ -332,7 +329,6 @@ void X11DRV_InitClipboard(void) if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format )))) break; format->wFormatID = builtin_formats[i].id; format->drvData = GET_ATOM(builtin_formats[i].data); - format->wFlags = CF_FLAG_BUILTINFMT; format->lpDrvImportFunc = builtin_formats[i].import; format->lpDrvExportFunc = builtin_formats[i].export; list_add_tail( &format_list, &format->entry ); @@ -410,8 +406,7 @@ static WINE_CLIPFORMAT *register_format( UINT id, Atom prop ) /* walk format chain to see if it's already registered */ LIST_FOR_EACH_ENTRY( lpFormat, &format_list, WINE_CLIPFORMAT, entry ) - if ((lpFormat->wFormatID == id) && (lpFormat->wFlags & CF_FLAG_BUILTINFMT) == 0) - return lpFormat; + if (lpFormat->wFormatID == id) return lpFormat; return X11DRV_CLIPBOARD_InsertClipboardFormat(id, prop); } @@ -469,7 +464,6 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr WARN("No more memory for a new format!\n"); return NULL; } - lpNewFormat->wFlags = 0; lpNewFormat->wFormatID = id; lpNewFormat->drvData = prop; lpNewFormat->lpDrvImportFunc = X11DRV_CLIPBOARD_ImportClipboardData;

1 0

Erich Hoover : winex11: Use GetCursorFrameInfo to obtain animated frame delay.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 2a026493415771e0560f26cb2e12518ffe1dc876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a026493415771e0560f26cb2… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Mar 5 22:42:31 2011 -0700 winex11: Use GetCursorFrameInfo to obtain animated frame delay. --- dlls/winex11.drv/mouse.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7778203..a527a2e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -296,6 +296,7 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA int width, int height, int istep ) { XcursorImage *image, *ret = NULL; + DWORD delay_jiffies, is_static; int x, y, i, has_alpha; XcursorPixel *ptr; @@ -310,7 +311,13 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA image->xhot = iinfo->xHotspot; image->yhot = iinfo->yHotspot; - image->delay = 100; /* TODO: find a way to get the proper delay */ + + /* TODO: Handle animated cursors that use multiple rates */ + image->delay = 100; /* fallback delay, 100 ms */ + if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0 /* obtain first rate */, &delay_jiffies, &is_static) != 0) + image->delay = (100 * delay_jiffies) / 6; /* convert jiffies (1/60s) to milliseconds */ + else + WARN("Failed to retrieve animated cursor framerate.\n"); /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ memset( color_bits, 0x00, color_size );

1 0

Juan Lang : wininet: Rename a variable based on publicly available information.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 9d5ca542b317acdbe84decb62999bffb9734c2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5ca542b317acdbe84decb62… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:52:42 2011 -0800 wininet: Rename a variable based on publicly available information. --- dlls/wininet/urlcache.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 18ed426..ad439dd 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -142,7 +142,7 @@ typedef struct _HASH_CACHEFILE_ENTRY typedef struct _DIRECTORY_DATA { - DWORD dwUnknown; + DWORD dwNumFiles; char filename[DIR_LENGTH]; } DIRECTORY_DATA; @@ -346,12 +346,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) for (i = 0; !dwError && i < pHeader->DirectoryCount; ++i) { - /* The following values were copied from a Windows index. - * I don't know what the values are supposed to mean but - * have made them the same in the hope that this will - * be better for compatibility - */ - pHeader->directory_data[i].dwUnknown = (i > 1) ? 0xfe : 0xff; + pHeader->directory_data[i].dwNumFiles = 0; for (j = 0;; ++j) { int k;

1 0

Juan Lang : wininet: Change a type based on publicly available information.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: ad45ebf3fa7c7dc02f276bc915ccf18324e5dbf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad45ebf3fa7c7dc02f276bc91… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:50:42 2011 -0800 wininet: Change a type based on publicly available information. --- dlls/wininet/urlcache.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4614f93..18ed426 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -160,8 +160,7 @@ typedef struct _URLCACHE_HEADER DWORD dwCacheUsageHigh; DWORD dwExemptUsageLow; DWORD dwExemptUsageHigh; - BYTE DirectoryCount; /* number of directory_data's */ - BYTE Unknown8[3]; /* just padding? */ + DWORD DirectoryCount; /* number of directory_data's */ DIRECTORY_DATA directory_data[1]; /* first directory entry */ } URLCACHE_HEADER, *LPURLCACHE_HEADER; typedef const URLCACHE_HEADER *LPCURLCACHE_HEADER;

1 0

Andrew Eikum : oleaut32: Convert TLBFuncDesc to be stored as an array.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 19fca2728bcfa0a51e8ae747c97e436158ced2d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fca2728bcfa0a51e8ae747c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 4 15:53:56 2011 -0600 oleaut32: Convert TLBFuncDesc to be stored as an array. --- dlls/oleaut32/typelib.c | 481 ++++++++++++++++++++++++---------------------- 1 files changed, 251 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19fca2728bcfa0a51e8ae…

1 0

Akihiro Sagawa : regedit: Export a decent newline in Unicode format.
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 3c6de3b3485e8ee3a622ef990c5b9042ad28e237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6de3b3485e8ee3a622ef990… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 4 23:00:51 2011 +0900 regedit: Export a decent newline in Unicode format. --- programs/regedit/regproc.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f753947..841ab79 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -23,6 +23,8 @@ #include <limits.h> #include <stdio.h> +#include <fcntl.h> +#include <io.h> #include <windows.h> #include <winnt.h> #include <winreg.h> @@ -987,9 +989,9 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD const WCHAR *hex_prefix; const WCHAR hex[] = {'h','e','x',':',0}; WCHAR hex_buf[17]; - const WCHAR concat[] = {'\\','\n',' ',' ',0}; + const WCHAR concat[] = {'\\','\r','\n',' ',' ',0}; DWORD concat_prefix, concat_len; - const WCHAR newline[] = {'\n',0}; + const WCHAR newline[] = {'\r','\n',0}; CHAR* value_multibyte = NULL; if (type == REG_BINARY) { @@ -1098,7 +1100,7 @@ static void export_hkey(FILE *file, HKEY key, DWORD i; BOOL more_data; LONG ret; - WCHAR key_format[] = {'\n','[','%','s',']','\n',0}; + WCHAR key_format[] = {'\r','\n','[','%','s',']','\r','\n',0}; /* get size information and resize the buffers if necessary */ if (RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, @@ -1168,7 +1170,7 @@ static void export_hkey(FILE *file, HKEY key, REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } else { const WCHAR start[] = {'"',0}; - const WCHAR end[] = {'"','\n',0}; + const WCHAR end[] = {'"','\r','\n',0}; DWORD len; len = lstrlenW(start); @@ -1189,7 +1191,7 @@ static void export_hkey(FILE *file, HKEY key, case REG_DWORD: { - WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\n',0}; + WCHAR format[] = {'d','w','o','r','d',':','%','0','8','x','\r','\n',0}; REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + 15); sprintfW(*line_buf + line_len, format, *((DWORD *)*val_buf)); @@ -1254,19 +1256,20 @@ static void export_hkey(FILE *file, HKEY key, } /****************************************************************************** - * Open file for export. + * Open file in binary mode for export. */ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) { FILE *file; WCHAR dash = '-'; - if (strncmpW(file_name,&dash,1)==0) + if (strncmpW(file_name,&dash,1)==0) { file=stdout; - else + _setmode(_fileno(file), _O_BINARY); + } else { CHAR* file_nameA = GetMultiByteString(file_name); - file = fopen(file_nameA, "w"); + file = fopen(file_nameA, "wb"); if (!file) { perror(""); fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_nameA); @@ -1278,12 +1281,12 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if(unicode) { const BYTE unicode_seq[] = {0xff,0xfe}; - const WCHAR header[] = {'W','i','n','d','o','w','s',' ','R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s','i','o','n',' ','5','.','0','0','\n'}; + const WCHAR header[] = {'W','i','n','d','o','w','s',' ','R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; fwrite(unicode_seq, sizeof(BYTE), sizeof(unicode_seq)/sizeof(unicode_seq[0]), file); fwrite(header, sizeof(WCHAR), sizeof(header)/sizeof(header[0]), file); } else { - fputs("REGEDIT4\n", file); + fputs("REGEDIT4\r\n", file); } return file;

1 0

Erich Hoover : user32: Permit loading animated cursors with CreateIconFromResource(Ex).
by Alexandre Julliard March 7, 2011

March 7, 2011

Module: wine Branch: master Commit: 7b0ab606e24159e76dec0b309513c18dca4f52df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0ab606e24159e76dec0b309… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Mar 5 22:34:15 2011 -0700 user32: Permit loading animated cursors with CreateIconFromResource(Ex). --- dlls/user32/cursoricon.c | 4 + dlls/user32/tests/cursoricon.c | 160 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index cd7d3ed..1139256 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1120,6 +1120,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, return 0; } + /* Check if the resource is an animated icon/cursor */ + if (!memcmp(bits, "RIFF", 4)) + return CURSORICON_CreateIconFromANI( bits, cbSize, width, height, 0 /* default depth */, cFlag ); + if (bIcon) { hotspot.x = width / 2; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index da748b6..8d6ceb7 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -54,6 +54,135 @@ typedef struct CURSORICONFILEDIRENTRY idEntries[1]; } CURSORICONFILEDIR; +#define RIFF_FOURCC( c0, c1, c2, c3 ) \ + ( (DWORD)(BYTE)(c0) | ( (DWORD)(BYTE)(c1) << 8 ) | \ + ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) + +#define ANI_RIFF_ID RIFF_FOURCC('R', 'I', 'F', 'F') +#define ANI_LIST_ID RIFF_FOURCC('L', 'I', 'S', 'T') +#define ANI_ACON_ID RIFF_FOURCC('A', 'C', 'O', 'N') +#define ANI_anih_ID RIFF_FOURCC('a', 'n', 'i', 'h') +#define ANI_seq__ID RIFF_FOURCC('s', 'e', 'q', ' ') +#define ANI_fram_ID RIFF_FOURCC('f', 'r', 'a', 'm') +#define ANI_icon_ID RIFF_FOURCC('i', 'c', 'o', 'n') + +#define ANI_FLAG_ICON 0x1 +#define ANI_FLAG_SEQUENCE 0x2 + +typedef struct { + DWORD header_size; + DWORD num_frames; + DWORD num_steps; + DWORD width; + DWORD height; + DWORD bpp; + DWORD num_planes; + DWORD display_rate; + DWORD flags; +} ani_header; + +typedef struct { + BYTE data[32*32*4]; +} ani_data32x32x32; + +typedef struct { + CURSORICONFILEDIR icon_info; /* animated cursor frame information */ + BITMAPINFOHEADER bmi_header; /* animated cursor frame header */ + ani_data32x32x32 bmi_data; /* animated cursor frame DIB data */ +} ani_frame32x32x32; + +typedef struct { + DWORD chunk_id; /* ANI_anih_ID */ + DWORD chunk_size; /* actual size of data */ + ani_header header; /* animated cursor header */ +} riff_header_t; + +typedef struct { + DWORD chunk_id; /* ANI_LIST_ID */ + DWORD chunk_size; /* actual size of data */ + DWORD chunk_type; /* ANI_fram_ID */ +} riff_list_t; + +typedef struct { + DWORD chunk_id; /* ANI_icon_ID */ + DWORD chunk_size; /* actual size of data */ + ani_frame32x32x32 data; /* animated cursor frame */ +} riff_icon32x32x32_t; + +typedef struct { + DWORD chunk_id; /* ANI_RIFF_ID */ + DWORD chunk_size; /* actual size of data */ + DWORD chunk_type; /* ANI_ACON_ID */ + riff_header_t header; /* RIFF animated cursor header */ + riff_list_t frame_list; /* RIFF animated cursor frame list info */ + riff_icon32x32x32_t frames[1]; /* array of animated cursor frames */ +} riff_cursor_t; + +riff_cursor_t empty_anicursor = { + ANI_RIFF_ID, + sizeof(empty_anicursor) - sizeof(DWORD)*2, + ANI_ACON_ID, + { + ANI_anih_ID, + sizeof(ani_header), + { + sizeof(ani_header), + 1, /* frames */ + 1, /* steps */ + 32, /* width */ + 32, /* height */ + 32, /* depth */ + 1, /* planes */ + 10, /* display rate in jiffies */ + ANI_FLAG_ICON /* flags */ + } + }, + { + ANI_LIST_ID, + sizeof(riff_icon32x32x32_t)*1 + sizeof(DWORD), + ANI_fram_ID, + }, + { + { + ANI_icon_ID, + sizeof(ani_frame32x32x32), + { + { + 0x0, /* reserved */ + 0, /* type: icon(1), cursor(2) */ + 1, /* count */ + { + { + 32, /* width */ + 32, /* height */ + 0, /* color count */ + 0x0, /* reserved */ + 16, /* x hotspot */ + 16, /* y hotspot */ + sizeof(ani_data32x32x32), /* DIB size */ + sizeof(CURSORICONFILEDIR) /* DIB offset */ + } + } + }, + { + sizeof(BITMAPINFOHEADER), /* structure for DIB-type data */ + 32, /* width */ + 32*2, /* actual height times two */ + 1, /* planes */ + 32, /* bpp */ + BI_RGB, /* compression */ + 0, /* image size */ + 0, /* biXPelsPerMeter */ + 0, /* biYPelsPerMeter */ + 0, /* biClrUsed */ + 0 /* biClrImportant */ + }, + { /* DIB data: left uninitialized */ } + } + } + } +}; + #include "poppack.h" static char **test_argv; @@ -1129,6 +1258,37 @@ static void test_CreateIconFromResource(void) * ok(handle == NULL, "Invalid pointer accepted (%p)\n", handle); */ HeapFree(GetProcessHeap(), 0, hotspot); + + /* Test creating an animated cursor. */ + empty_anicursor.frames[0].data.icon_info.idType = 2; /* type: cursor */ + empty_anicursor.frames[0].data.icon_info.idEntries[0].xHotspot = 3; + empty_anicursor.frames[0].data.icon_info.idEntries[0].yHotspot = 3; + handle = CreateIconFromResource((PBYTE) &empty_anicursor, sizeof(empty_anicursor), FALSE, 0x00030000); + ok(handle != NULL, "Create cursor failed.\n"); + + /* Test the animated cursor's information. */ + SetLastError(0xdeadbeef); + ret = GetIconInfo(handle, &icon_info); + ok(ret, "GetIconInfo() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + if (ret) + { + ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); + ok(icon_info.xHotspot == 3, "xHotspot is %u.\n", icon_info.xHotspot); + ok(icon_info.yHotspot == 3, "yHotspot is %u.\n", icon_info.yHotspot); + ok(icon_info.hbmColor != NULL || broken(!icon_info.hbmColor) /* no color cursor support */, + "No hbmColor!\n"); + ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); + } + + /* Clean up. */ + SetLastError(0xdeadbeef); + ret = DestroyCursor(handle); + ok(ret, "DestroyCursor() failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); } static HICON create_test_icon(HDC hdc, int width, int height, int bpp,

1 0