March 2011 - wine-commits

Alexandre Julliard : gdi32: Add a mechanism for stacking gdi drivers.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: 6419edfb6db84df31f392315c32489e4299d31b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6419edfb6db84df31f392315c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 20:10:25 2011 +0100 gdi32: Add a mechanism for stacking gdi drivers. --- dlls/gdi32/dc.c | 52 ++++++++++++++++++++++++++++++++++--------- dlls/gdi32/enhmfdrv/init.c | 3 +- dlls/gdi32/gdi_private.h | 12 +++++++++- dlls/gdi32/mfdrv/init.c | 3 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 6 files changed, 56 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 088f6c7..f25eb8d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -79,7 +79,8 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->funcs = funcs; dc->nulldrv.funcs = &null_driver; - dc->physDev = NULL; + dc->nulldrv.next = NULL; + dc->physDev = &dc->nulldrv; dc->thread = GetCurrentThreadId(); dc->refcount = 1; dc->dirty = 0; @@ -229,6 +230,34 @@ void update_dc( DC *dc ) /*********************************************************************** + * push_dc_driver + * + * Push a driver on top of the DC driver stack. + */ +void push_dc_driver( DC * dc, PHYSDEV physdev ) +{ + physdev->next = dc->physDev; + physdev->hdc = dc->hSelf; + dc->physDev = physdev; + dc->funcs = physdev->funcs; +} + + +/*********************************************************************** + * pop_dc_driver + * + * Pop the top driver from the DC driver stack. + */ +void pop_dc_driver( DC * dc, PHYSDEV physdev ) +{ + assert( physdev == dc->physDev ); + assert( physdev != &dc->nulldrv ); + dc->physDev = physdev->next; + dc->funcs = dc->physDev->funcs; +} + + +/*********************************************************************** * DC_DeleteObject */ static BOOL DC_DeleteObject( HGDIOBJ handle ) @@ -633,6 +662,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, { HDC hdc; DC * dc; + PHYSDEV physdev; const DC_FUNCTIONS *funcs; WCHAR buf[300]; @@ -663,14 +693,15 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); if (dc->funcs->pCreateDC && - !dc->funcs->pCreateDC( hdc, &dc->physDev, buf, device, output, initData )) + !dc->funcs->pCreateDC( hdc, &physdev, buf, device, output, initData )) { WARN("creation aborted by device\n" ); goto error; } - dc->physDev->funcs = funcs; - dc->physDev->hdc = hdc; + physdev->funcs = funcs; + push_dc_driver( dc, physdev ); + dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); @@ -782,21 +813,20 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) dc->vis_rect.bottom = 1; if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ - /* Copy the driver-specific physical device info into - * the new DC. The driver may use this read-only info - * while creating the compatible DC below. */ - dc->physDev = physDev; ret = dc->hSelf; + /* Pass the driver-specific physical device info into + * the new DC. The driver may use this read-only info + * while creating the compatible DC. */ if (dc->funcs->pCreateDC && - !dc->funcs->pCreateDC( dc->hSelf, &dc->physDev, NULL, NULL, NULL, NULL )) + !dc->funcs->pCreateDC( dc->hSelf, &physDev, NULL, NULL, NULL, NULL )) { WARN("creation aborted by device\n"); goto error; } - dc->physDev->funcs = funcs; - dc->physDev->hdc = hdc; + physDev->funcs = funcs; + push_dc_driver( dc, physDev ); DC_InitDC( dc ); release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index efa91ee..241bd7e 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -319,9 +319,8 @@ HDC WINAPI CreateEnhMetaFileW( free_dc_ptr( dc ); return 0; } - dc->physDev = (PHYSDEV)physDev; physDev->dev.funcs = &EMFDRV_Funcs; - physDev->dev.hdc = dc->hSelf; + push_dc_driver( dc, &physDev->dev ); physDev->hdc = dc->hSelf; if(description) { /* App name\0Title\0\0 */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index efa61a0..7b72c45 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -75,6 +75,7 @@ typedef struct tagGDIOBJHDR typedef struct gdi_physdev { const struct tagDC_FUNCS *funcs; + struct gdi_physdev *next; HDC hdc; } *PHYSDEV; @@ -377,6 +378,8 @@ extern BOOL free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; +extern void push_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN; +extern void pop_dc_driver( DC * dc, PHYSDEV physdev ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; extern INT save_dc_state( HDC hdc ) DECLSPEC_HIDDEN; @@ -395,7 +398,14 @@ extern const DC_FUNCTIONS *DRIVER_get_display_driver(void) DECLSPEC_HIDDEN; extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; -#define GET_DC_PHYSDEV(dc,func) ((dc)->physDev->funcs->func ? (dc)->physDev : &(dc)->nulldrv) +static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) +{ + while (!((void **)dev->funcs)[offset / sizeof(void *)]) dev = dev->next; + return dev; +} + +#define GET_DC_PHYSDEV(dc,func) get_physdev_entry_point( (dc)->physDev, FIELD_OFFSET(DC_FUNCTIONS,func)) +#define GET_NEXT_PHYSDEV(dev,func) get_physdev_entry_point( (dev)->next, FIELD_OFFSET(DC_FUNCTIONS,func)) /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4659e73..3bb815b 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -171,9 +171,8 @@ static DC *MFDRV_AllocMetaFile(void) free_dc_ptr( dc ); return NULL; } - dc->physDev = (PHYSDEV)physDev; physDev->dev.funcs = &MFDRV_Funcs; - physDev->dev.hdc = dc->hSelf; + push_dc_driver( dc, &physDev->dev ); physDev->hdc = dc->hSelf; if (!(physDev->mh = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev->mh) ))) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 62f9ccc..c6c7571 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -353,7 +353,7 @@ typedef struct { typedef struct { - void *reserved[2]; /* reserved for gdi */ + void *reserved[3]; /* reserved for gdi */ HDC hdc; PSFONT font; /* Current PS font */ DOWNLOAD *downloaded_fonts; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index da59d7e..6048096 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -144,7 +144,7 @@ struct xrender_info; /* X physical device */ typedef struct { - void *reserved[2]; /* reserved for gdi */ + void *reserved[3]; /* reserved for gdi */ HDC hdc; GC gc; /* X Window GC */ Drawable drawable;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the clipping functions.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: ec54c80ee555539fa92e0538de436d0e78388bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec54c80ee555539fa92e0538d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 16:21:45 2011 +0100 gdi32: Add null driver entry points for the clipping functions. --- dlls/gdi32/clipping.c | 237 +++++++++++++++++++++++---------------------- dlls/gdi32/driver.c | 14 ++- dlls/gdi32/gdi_private.h | 9 ++ 3 files changed, 139 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec54c80ee555539fa92e0…

1 0

Austin English : mapi32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 2520a363bdd915db4028e707c062afe0e1bb9678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2520a363bdd915db4028e707c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:32 2011 -0800 mapi32: Avoid shadowing a parameter. --- dlls/mapi32/sendmail.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index e115649..89daf0f 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -298,7 +298,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (IMAPISession_PrepareForm(session, NULL, msg, &token) == S_OK) { - ULONG access = 0, status = 0, flags = 0, pc = 0; + ULONG access = 0, status = 0, message_flags = 0, pc = 0; ULONG pT[2] = {1, PR_MSG_STATUS}; /* Retrieve message status, flags, access rights and class */ @@ -313,7 +313,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (IMessage_GetProps(msg, (LPSPropTagArray) pT, 0, &pc, &props) == S_OK) { - flags = props->Value.ul; + message_flags = props->Value.ul; MAPIFreeBuffer(props); } @@ -332,7 +332,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Show the message form (edit window) */ ret = IMAPISession_ShowForm(session, 0, msg_store, draft_folder, NULL, - token, NULL, 0, status, flags, access, + token, NULL, 0, status, message_flags, access, props->Value.lpszA); switch (ret)

1 0

Austin English : wininet: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 249f4562d9163e609a1c6c13a10a1244f8794c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=249f4562d9163e609a1c6c13a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:52 2011 -0800 wininet: Avoid shadowing a parameter. --- dlls/wininet/internet.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0dbc5af..84d1770 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2334,27 +2334,27 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * } for (i = 0; i < con->dwOptionCount; i++) { - INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i; + INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i; INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i; - switch (option->dwOption) { + switch (optionW->dwOption) { case INTERNET_PER_CONN_FLAGS: if(pi.dwProxyEnabled) - option->Value.dwValue = PROXY_TYPE_PROXY; + optionW->Value.dwValue = PROXY_TYPE_PROXY; else - option->Value.dwValue = PROXY_TYPE_DIRECT; + optionW->Value.dwValue = PROXY_TYPE_DIRECT; break; case INTERNET_PER_CONN_PROXY_SERVER: if (unicode) - option->Value.pszValue = heap_strdupW(pi.lpszProxyServer); + optionW->Value.pszValue = heap_strdupW(pi.lpszProxyServer); else optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyServer); break; case INTERNET_PER_CONN_PROXY_BYPASS: if (unicode) - option->Value.pszValue = heap_strdupW(pi.lpszProxyBypass); + optionW->Value.pszValue = heap_strdupW(pi.lpszProxyBypass); else optionA->Value.pszValue = heap_strdupWtoA(pi.lpszProxyBypass); break; @@ -2365,12 +2365,12 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: - FIXME("Unhandled dwOption %d\n", option->dwOption); - memset(&option->Value, 0, sizeof(option->Value)); + FIXME("Unhandled dwOption %d\n", optionW->dwOption); + memset(&optionW->Value, 0, sizeof(optionW->Value)); break; default: - FIXME("Unknown dwOption %d\n", option->dwOption); + FIXME("Unknown dwOption %d\n", optionW->dwOption); res = ERROR_INVALID_PARAMETER; break; }

1 0

Austin English : shell32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: b9cc7987cb594b72092e08791a58f787e25392d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cc7987cb594b72092e08791… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:19 2011 -0800 shell32: Avoid shadowing a parameter. --- dlls/shell32/trash.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 99e7d7e..3352c0a 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -423,10 +423,10 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN else { /* show only the file name */ - char *filename = strrchr(original_file_name, '/'); - if (filename == NULL) - filename = original_file_name; - MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, data->cFileName, MAX_PATH); + char *file = strrchr(original_file_name, '/'); + if (file == NULL) + file = original_file_name; + MultiByteToWideChar(CP_UNIXCP, 0, file, -1, data->cFileName, MAX_PATH); } deletion_date = XDG_GetStringValue(parsed, trashinfo_group, "DeletionDate", 0);

1 0

Austin English : setupapi: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a326c9ee67d5a66b9634ae8e0850a99ba5fec26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a326c9ee67d5a66b9634ae8e0… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:16 2011 -0800 setupapi: Avoid shadowing a parameter. --- dlls/setupapi/install.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index a71f274..8f52a58 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -532,7 +532,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * { /* file is an executable, not a dll */ STARTUPINFOW startup; - PROCESS_INFORMATION info; + PROCESS_INFORMATION process_info; WCHAR *cmd_line; BOOL res; static const WCHAR format[] = {'"','%','s','"',' ','%','s',0}; @@ -546,7 +546,7 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * memset( &startup, 0, sizeof(startup) ); startup.cb = sizeof(startup); TRACE( "executing %s\n", debugstr_w(cmd_line) ); - res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ); + res = CreateProcessW( NULL, cmd_line, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &process_info ); HeapFree( GetProcessHeap(), 0, cmd_line ); if (!res) { @@ -554,16 +554,16 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * status.Win32Error = GetLastError(); goto done; } - CloseHandle( info.hThread ); + CloseHandle( process_info.hThread ); - if (WaitForSingleObject( info.hProcess, timeout*1000 ) == WAIT_TIMEOUT) + if (WaitForSingleObject( process_info.hProcess, timeout*1000 ) == WAIT_TIMEOUT) { /* timed out, kill the process */ - TerminateProcess( info.hProcess, 1 ); + TerminateProcess( process_info.hProcess, 1 ); status.FailureCode = SPREG_TIMEOUT; status.Win32Error = ERROR_TIMEOUT; } - CloseHandle( info.hProcess ); + CloseHandle( process_info.hProcess ); goto done; }

1 0

Austin English : cmd: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 3631ee051ebbf4e54a2f7ab3ce135b127bf82a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3631ee051ebbf4e54a2f7ab3c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:20 2011 -0800 cmd: Avoid shadowing a parameter. --- programs/cmd/batch.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 585ea5e..f012eaf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,14 +399,14 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (memchrW(firstModifier, '$', modifierLen) != NULL) { /* Special Case: Search envar specified in $[envvar] for outputparam Note both $ and : are guaranteed otherwise check above would fail */ - WCHAR *start = strchrW(firstModifier, '$') + 1; + WCHAR *begin = strchrW(firstModifier, '$') + 1; WCHAR *end = strchrW(firstModifier, ':'); WCHAR env[MAX_PATH]; WCHAR fullpath[MAX_PATH]; /* Extract the env var */ - memcpy(env, start, (end-start) * sizeof(WCHAR)); - env[(end-start)] = 0x00; + memcpy(env, begin, (end-begin) * sizeof(WCHAR)); + env[(end-begin)] = 0x00; /* If env var not found, return empty string */ if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) ||

1 0

Austin English : user32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 38a87ecfeac35b30783668feb5ec35458ed70dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a87ecfeac35b30783668feb… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:24 2011 -0800 user32: Avoid shadowing a parameter. --- dlls/user32/desktop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 6313292..92ee21a 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -228,12 +228,12 @@ BOOL DESKTOP_SetPattern( LPCWSTR pattern ) &pat[0], &pat[1], &pat[2], &pat[3], &pat[4], &pat[5], &pat[6], &pat[7] )) { - WORD pattern[8]; + WORD ptrn[8]; HBITMAP hbitmap; int i; - for (i = 0; i < 8; i++) pattern[i] = pat[i] & 0xffff; - hbitmap = CreateBitmap( 8, 8, 1, 1, pattern ); + for (i = 0; i < 8; i++) ptrn[i] = pat[i] & 0xffff; + hbitmap = CreateBitmap( 8, 8, 1, 1, ptrn ); hbrushPattern = CreatePatternBrush( hbitmap ); DeleteObject( hbitmap ); }

1 0

Austin English : oleaut32: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 651adc7fc8c7ec55c1be0b540e8775d75e5cb666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=651adc7fc8c7ec55c1be0b540… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:08:09 2011 -0800 oleaut32: Avoid shadowing a parameter. --- dlls/oleaut32/varformat.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e21ce96..351529c 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2490,11 +2490,11 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, if (nGrouping == -2) { - WCHAR nGrouping[16]; - nGrouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, nGrouping, - sizeof(nGrouping)/sizeof(WCHAR)); - numfmt.Grouping = nGrouping[2] == '2' ? 32 : nGrouping[0] - '0'; + WCHAR grouping[16]; + grouping[2] = '\0'; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, + sizeof(grouping)/sizeof(WCHAR)); + numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) numfmt.Grouping = 3; /* 3 = "n,nnn.nn" */

1 0

Austin English : msxml3: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 4ace7b2127b85562b2c1893a6337326a999e612e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ace7b2127b85562b2c1893a6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:56 2011 -0800 msxml3: Avoid shadowing a parameter. --- dlls/msxml3/dispex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 5addcd7..fbbc35b 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -134,16 +134,16 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) } if(!typeinfos[tid]) { - ITypeInfo *typeinfo; + ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres; } - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) - ITypeInfo_Release(typeinfo); + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); } *typeinfo = typeinfos[tid];

1 0

Austin English : mshtml: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a71f3683afe719895dcf71b73d81ef5c5c36e037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71f3683afe719895dcf71b73… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:39 2011 -0800 mshtml: Avoid shadowing a parameter. --- dlls/mshtml/dispex.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4706309..327b5db 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -106,16 +106,16 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } if(!typeinfos[tid]) { - ITypeInfo *typeinfo; + ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); return hres; } - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) - ITypeInfo_Release(typeinfo); + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); } *typeinfo = typeinfos[tid];

1 0

Austin English : gdiplus: Avoid shadowing a parameter.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 3ac2c9eea03550dfee70254e25536ebd9863e023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac2c9eea03550dfee70254e2… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 9 01:07:14 2011 -0800 gdiplus: Avoid shadowing a parameter. --- dlls/gdiplus/graphicspath.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 992bd7c..971ab31 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -384,8 +384,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *po /* close figure */ if(stat == Ok){ - INT count = path->pathdata.Count; - path->pathdata.Types[count - 1] |= PathPointTypeCloseSubpath; + path->pathdata.Types[path->pathdata.Count - 1] |= PathPointTypeCloseSubpath; path->newfigure = TRUE; }

1 0

Eric Pouech : dbghelp: Fix bug in managing COFF files array.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 1d4381664c238157268f1ac80593c9fd163df71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4381664c238157268f1ac80… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:52 2011 +0100 dbghelp: Fix bug in managing COFF files array. --- dlls/dbghelp/coff.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index b0a085c..17ba7be 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -138,12 +138,18 @@ static void coff_add_symbol(struct CoffFile* coff_file, struct symt* sym) { if (coff_file->neps + 1 >= coff_file->neps_alloc) { - coff_file->neps_alloc *= 2; - coff_file->entries = (coff_file->entries) ? - HeapReAlloc(GetProcessHeap(), 0, coff_file->entries, - coff_file->neps_alloc * sizeof(struct symt*)) : - HeapAlloc(GetProcessHeap(), 0, - coff_file->neps_alloc * sizeof(struct symt*)); + if (coff_file->entries) + { + coff_file->neps_alloc *= 2; + coff_file->entries = HeapReAlloc(GetProcessHeap(), 0, coff_file->entries, + coff_file->neps_alloc * sizeof(struct symt*)); + } + else + { + coff_file->neps_alloc = 32; + coff_file->entries = HeapAlloc(GetProcessHeap(), 0, + coff_file->neps_alloc * sizeof(struct symt*)); + } } coff_file->entries[coff_file->neps++] = sym; }

1 0

Eric Pouech : dbghelp: When building the by address lookup table, speed up resorting by always taking into account that existing symbols are already sorted .
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 9d3be00df22d87bc3aa328afc0a393fc721528b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3be00df22d87bc3aa328afc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:47 2011 +0100 dbghelp: When building the by address lookup table, speed up resorting by always taking into account that existing symbols are already sorted. --- dlls/dbghelp/symbol.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 64bc4eb..e92d998 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -879,16 +879,38 @@ static inline unsigned where_to_insert(struct module* module, unsigned high, con */ static BOOL resort_symbols(struct module* module) { + int delta; + if (!(module->module.NumSyms = module->num_symbols)) return FALSE; - /* FIXME: what's the optimal value here ??? */ - if (module->num_sorttab && module->num_symbols <= module->num_sorttab + 30) + /* we know that set from 0 up to num_sorttab is already sorted + * so sort the remaining (new) symbols, and merge the two sets + * (unless the first set is empty) + */ + delta = module->num_symbols - module->num_sorttab; + qsort(&module->addr_sorttab[module->num_sorttab], delta, sizeof(struct symt_ht*), symt_cmp_addr); + if (module->num_sorttab) { - int i, delta, ins_idx = module->num_sorttab, prev_ins_idx; - struct symt_ht* tmp[30]; + int i, ins_idx = module->num_sorttab, prev_ins_idx; + static struct symt_ht** tmp; + static unsigned num_tmp; - delta = module->num_symbols - module->num_sorttab; + if (num_tmp < delta) + { + static struct symt_ht** new; + if (tmp) + new = HeapReAlloc(GetProcessHeap(), 0, tmp, delta * sizeof(struct symt_ht*)); + else + new = HeapAlloc(GetProcessHeap(), 0, delta * sizeof(struct symt_ht*)); + if (!new) + { + module->num_sorttab = 0; + return resort_symbols(module); + } + tmp = new; + num_tmp = delta; + } memcpy(tmp, &module->addr_sorttab[module->num_sorttab], delta * sizeof(struct symt_ht*)); qsort(tmp, delta, sizeof(struct symt_ht*), symt_cmp_addr); @@ -902,10 +924,6 @@ static BOOL resort_symbols(struct module* module) module->addr_sorttab[ins_idx + i] = tmp[i]; } } - else - { - qsort(module->addr_sorttab, module->num_symbols, sizeof(struct symt_ht*), symt_cmp_addr); - } module->num_sorttab = module->num_symbols; return module->sortlist_valid = TRUE; }

1 0

Eric Pouech : dbghelp: Add helper to get global address out of symt, instead of going though symt_get_info.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: dca2d350adbee357cad6f61dcc0607491435652c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca2d350adbee357cad6f61dc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:38 2011 +0100 dbghelp: Add helper to get global address out of symt, instead of going though symt_get_info. --- dlls/dbghelp/coff.c | 7 +-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 4 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/symbol.c | 37 ++++++++---------- dlls/dbghelp/type.c | 80 +++++++++++++++++++++------------------- 6 files changed, 65 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dca2d350adbee357cad6f…

1 0

Eric Pouech : dbghelp: Quirk for supporting anonymous UDT (class, struct, enum...).
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: d52e42e985784693f3b68c00a2869bf1dbe24fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52e42e985784693f3b68c00a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:32 2011 +0100 dbghelp: Quirk for supporting anonymous UDT (class, struct, enum...). --- dlls/dbghelp/dwarf.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ac20442..8714c90 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1406,7 +1406,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; + /* quirk... FIXME provide real support for anonymous UDTs */ + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) + name.u.string = "zz_anon_zz"; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_udt(ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string),

1 0

Eric Pouech : dbghelp: When parsing a subprogram in dwarf debug format, properly handle scoping for functions with both declaration & definition.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: e21062f9fa676b229c002a44a85c68d013f78e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21062f9fa676b229c002a44a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:26 2011 +0100 dbghelp: When parsing a subprogram in dwarf debug format, properly handle scoping for functions with both declaration & definition. --- dlls/dbghelp/dwarf.c | 52 ++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 343c54b..ac20442 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2,7 +2,7 @@ * File dwarf.c - read dwarf2 information from the ELF modules * * Copyright (C) 2005, Raphael Junqueira - * Copyright (C) 2006-2010, Eric Pouech + * Copyright (C) 2006-2011, Eric Pouech * Copyright (C) 2010, Alexandre Julliard * * This library is free software; you can redistribute it and/or @@ -957,12 +957,27 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug { char* last; struct attribute diname; + struct attribute spec; if (di->abbrev->tag == DW_TAG_compile_unit) return name; if (!ctx->cpp_name) ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); last = ctx->cpp_name + MAX_SYM_NAME - strlen(name); strcpy(last, name); + + /* if the di is a definition, but has also a (previous) declaration, then scope must + * be gotten from declaration not definition + */ + if (dwarf2_find_attribute(ctx, di, DW_AT_specification, &spec) && spec.gotten_from == attr_direct) + { + di = sparse_array_find(&ctx->debug_info_table, spec.u.uvalue); + if (!di) + { + FIXME("Should have found the debug info entry\n"); + return NULL; + } + } + for (di = di->parent; di; di = di->parent) { switch (di->abbrev->tag) @@ -1033,10 +1048,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc) || !dwarf2_find_attribute(ctx, di, DW_AT_high_pc, &high_pc)) - { - FIXME("missing low or high value\n"); return FALSE; - } *plow = low_pc.u.uvalue; *phigh = high_pc.u.uvalue; return TRUE; @@ -1834,43 +1846,35 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, return NULL; } + if (dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl) && + is_decl.u.uvalue && is_decl.gotten_from == attr_direct) + { + /* it's a real declaration, skip it */ + return NULL; + } if (!dwarf2_read_range(ctx, di, &low_pc, &high_pc)) { - FIXME("cannot get range\n"); + WARN("cannot get range for %s\n", name.u.string); return NULL; } - /* As functions (defined as inline assembly) get debug info with dwarf * (not the case for stabs), we just drop Wine's thunks here... * Actual thunks will be created in elf_module from the symbol table */ if (elf_is_in_thunk_area(ctx->load_offset + low_pc, ctx->thunks) >= 0) return NULL; - if (!dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl)) - is_decl.u.uvalue = 0; - if (!(ret_type = dwarf2_lookup_type(ctx, di))) { ret_type = ctx->symt_cache[sc_void]; assert(ret_type); } - /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); - if (!is_decl.u.uvalue || is_decl.gotten_from != attr_direct) - { - subpgm.func = symt_new_function(ctx->module, ctx->compiland, - dwarf2_get_cpp_name(ctx, di, name.u.string), - ctx->load_offset + low_pc, high_pc - low_pc, - &sig_type->symt); - di->symt = &subpgm.func->symt; - } - else - { - WARN("no location for '%s::%s'\n", ctx->name_space, name.u.string); - subpgm.func = NULL; - } - + subpgm.func = symt_new_function(ctx->module, ctx->compiland, + dwarf2_get_cpp_name(ctx, di, name.u.string), + ctx->load_offset + low_pc, high_pc - low_pc, + &sig_type->symt); + di->symt = &subpgm.func->symt; subpgm.ctx = ctx; if (!dwarf2_compute_location_attr(ctx, di, DW_AT_frame_base, &subpgm.frame, NULL))

1 0

Eric Pouech : dbghelp: Add support for parsing methods (in C++ classes) for dwarf debug format.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a575351b3019ad86628c8325af62920b75c5d2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a575351b3019ad86628c8325a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:20 2011 +0100 dbghelp: Add support for parsing methods (in C++ classes) for dwarf debug format. --- dlls/dbghelp/dwarf.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4e72a5c..343c54b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1377,6 +1377,9 @@ static void dwarf2_parse_udt_member(dwarf2_parse_context_t* ctx, if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); } +static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di); + static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, enum UdtKind udt) @@ -1411,13 +1414,15 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_enumeration_type: dwarf2_parse_enumeration_type(ctx, child); break; + case DW_TAG_subprogram: + dwarf2_parse_subprogram(ctx, child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: case DW_TAG_typedef: /* FIXME: we need to handle nested udt definitions */ case DW_TAG_inheritance: - case DW_TAG_subprogram: case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_variable: @@ -1860,7 +1865,11 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, &sig_type->symt); di->symt = &subpgm.func->symt; } - else subpgm.func = NULL; + else + { + WARN("no location for '%s::%s'\n", ctx->name_space, name.u.string); + subpgm.func = NULL; + } subpgm.ctx = ctx; if (!dwarf2_compute_location_attr(ctx, di, DW_AT_frame_base,

1 0

Eric Pouech : dbghelp: Store the compiland into the parse context.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 395d734d3301a7ef91189f4786508a92b259e320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395d734d3301a7ef91189f478… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:14 2011 +0100 dbghelp: Store the compiland into the parse context. --- dlls/dbghelp/dwarf.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index cc30ffd..4e72a5c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -187,6 +187,7 @@ typedef struct dwarf2_parse_context_s unsigned section; struct pool pool; struct module* module; + struct symt_compiland* compiland; const struct elf_thunk_area*thunks; struct sparse_array abbrev_table; struct sparse_array debug_info_table; @@ -634,8 +635,7 @@ static BOOL dwarf2_find_attribute(const dwarf2_parse_context_t* ctx, return FALSE; } -static void dwarf2_load_one_entry(dwarf2_parse_context_t*, dwarf2_debug_info_t*, - struct symt_compiland*); +static void dwarf2_load_one_entry(dwarf2_parse_context_t*, dwarf2_debug_info_t*); #define Wine_DW_no_register 0x7FFFFFFF @@ -946,7 +946,7 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!type->symt) { /* load the debug info entity */ - dwarf2_load_one_entry(ctx, type, NULL); + dwarf2_load_one_entry(ctx, type); } return type->symt; } @@ -1501,7 +1501,6 @@ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, typedef struct dwarf2_subprogram_s { dwarf2_parse_context_t* ctx; - struct symt_compiland* compiland; struct symt_function* func; BOOL non_computed_variable; struct location frame; @@ -1549,7 +1548,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_external, &ext)) ext.u.uvalue = 0; loc.offset += subpgm->ctx->load_offset; - symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, + symt_new_global_variable(subpgm->ctx->module, subpgm->ctx->compiland, dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; @@ -1625,7 +1624,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, name.u.string, value.form); v.n1.n2.vt = VT_EMPTY; } - di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->compiland, + di->symt = &symt_new_constant(subpgm->ctx->module, subpgm->ctx->compiland, name.u.string, param_type, &v)->symt; } else @@ -1797,8 +1796,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, } static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, - struct symt_compiland* compiland) + dwarf2_debug_info_t* di) { struct attribute name; unsigned long low_pc, high_pc; @@ -1856,7 +1854,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); if (!is_decl.u.uvalue || is_decl.gotten_from != attr_direct) { - subpgm.func = symt_new_function(ctx->module, compiland, + subpgm.func = symt_new_function(ctx->module, ctx->compiland, dwarf2_get_cpp_name(ctx, di, name.u.string), ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); @@ -1865,7 +1863,6 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, else subpgm.func = NULL; subpgm.ctx = ctx; - subpgm.compiland = compiland; if (!dwarf2_compute_location_attr(ctx, di, DW_AT_frame_base, &subpgm.frame, NULL)) { @@ -1972,8 +1969,7 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, } static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, - struct symt_compiland* compiland) + dwarf2_debug_info_t* di) { struct vector* children; dwarf2_debug_info_t* child; @@ -1989,13 +1985,12 @@ static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, if (children) for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(ctx, child, compiland); + dwarf2_load_one_entry(ctx, child); } } static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, - dwarf2_debug_info_t* di, - struct symt_compiland* compiland) + dwarf2_debug_info_t* di) { switch (di->abbrev->tag) { @@ -2033,7 +2028,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_parse_enumeration_type(ctx, di); break; case DW_TAG_subprogram: - dwarf2_parse_subprogram(ctx, di, compiland); + dwarf2_parse_subprogram(ctx, di); break; case DW_TAG_subroutine_type: dwarf2_parse_subroutine_type(ctx, di); @@ -2043,7 +2038,6 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_subprogram_t subpgm; subpgm.ctx = ctx; - subpgm.compiland = compiland; subpgm.func = NULL; subpgm.frame.kind = loc_absolute; subpgm.frame.offset = 0; @@ -2052,7 +2046,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, } break; case DW_TAG_namespace: - dwarf2_parse_namespace(ctx, di, compiland); + dwarf2_parse_namespace(ctx, di); break; /* silence a couple of C++ defines */ case DW_TAG_imported_module: @@ -2336,15 +2330,14 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - di->symt = &symt_new_compiland(module, - ctx.load_offset + low_pc.u.uvalue, - source_new(module, comp_dir.u.string, name.u.string))->symt; - + ctx.compiland = symt_new_compiland(module, ctx.load_offset + low_pc.u.uvalue, + source_new(module, comp_dir.u.string, name.u.string)); + di->symt = &ctx.compiland->symt; children = dwarf2_get_di_children(&ctx, di); if (children) for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(&ctx, child, (struct symt_compiland*)di->symt); + dwarf2_load_one_entry(&ctx, child); } if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) {

1 0

Eric Pouech : dbghelp: In dwarf debug format, correctly manage the DW_AT_specification attribute.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0d4a9757c245397f6f8a37e8fe7dc8ab1fb3f96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4a9757c245397f6f8a37e8f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:31:02 2011 +0100 dbghelp: In dwarf debug format, correctly manage the DW_AT_specification attribute. --- dlls/dbghelp/dwarf.c | 453 ++++++++++++++++++++++++++------------------------ 1 files changed, 232 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d4a9757c245397f6f8a3…

1 0

Eric Pouech : dbghelp: Add support for namespace support out of dwarf debug format.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0035d5df3fc1424c126386f0717a233047e5421c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0035d5df3fc1424c126386f07… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:56 2011 +0100 dbghelp: Add support for namespace support out of dwarf debug format. --- dlls/dbghelp/dwarf.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c61ec9c..f8eaad4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -192,6 +192,7 @@ typedef struct dwarf2_parse_context_s unsigned long load_offset; unsigned long ref_offset; struct symt* symt_cache[sc_num]; /* void, int1, int2, int4 */ + char* cpp_name; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -945,6 +946,41 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, return NULL; } +static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name) +{ + char* last; + struct attribute diname; + + if (di->abbrev->tag == DW_TAG_compile_unit) return name; + if (!ctx->cpp_name) + ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); + last = ctx->cpp_name + MAX_SYM_NAME - strlen(name); + strcpy(last, name); + for (di = di->parent; di; di = di->parent) + { + switch (di->abbrev->tag) + { + case DW_TAG_namespace: + case DW_TAG_structure_type: + case DW_TAG_class_type: + case DW_TAG_interface_type: + case DW_TAG_union_type: + if (dwarf2_find_attribute(ctx, di, DW_AT_name, &diname)) + { + size_t len = strlen(diname.u.string); + last -= 2 + len; + if (last < ctx->cpp_name) return NULL; + memcpy(last, diname.u.string, len); + last[len] = last[len + 1] = ':'; + } + break; + default: + break; + } + } + return last; +} + /****************************************************************** * dwarf2_read_range * @@ -1331,7 +1367,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; - di->symt = &symt_new_udt(ctx->module, name.u.string, size.u.uvalue, udt)->symt; + di->symt = &symt_new_udt(ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string), + size.u.uvalue, udt)->symt; if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1493,7 +1530,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, ext.u.uvalue = 0; loc.offset += subpgm->ctx->load_offset; symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, - name.u.string, !ext.u.uvalue, + dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; default: @@ -1800,7 +1837,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); if (!is_decl.u.uvalue) { - subpgm.func = symt_new_function(ctx->module, compiland, name.u.string, + subpgm.func = symt_new_function(ctx->module, compiland, + dwarf2_get_cpp_name(ctx, di, name.u.string), ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); di->symt = &subpgm.func->symt; @@ -1921,6 +1959,28 @@ static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, return di->symt = &sig_type->symt; } +static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di, + struct symt_compiland* compiland) +{ + if (di->symt) return; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + di->symt = ctx->symt_cache[sc_void]; + if (di->abbrev->have_child) /** any interest to not have child ? */ + { + dwarf2_debug_info_t* child; + unsigned int i; + + for (i = 0; i < vector_length(&di->children); i++) + { + child = *(dwarf2_debug_info_t**)vector_at(&di->children, i); + dwarf2_load_one_entry(ctx, child, compiland); + } + } +} + static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, struct symt_compiland* compiland) @@ -1979,8 +2039,10 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_parse_variable(&subpgm, NULL, di); } break; - /* silence a couple of C++ defines */ case DW_TAG_namespace: + dwarf2_parse_namespace(ctx, di, compiland); + break; + /* silence a couple of C++ defines */ case DW_TAG_imported_module: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: @@ -2234,6 +2296,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, ctx.ref_offset = comp_unit_start - sections[section_debug].address; memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; + ctx.cpp_name = NULL; abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size;

1 0

Eric Pouech : dbghelp: Add hierarchical information in die object.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 770e3b5ddf9e0bdf8b3250fb8a75a1a3e4ac143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=770e3b5ddf9e0bdf8b3250fb8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:47 2011 +0100 dbghelp: Add hierarchical information in die object. --- dlls/dbghelp/dwarf.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 7299314..c61ec9c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -154,6 +154,7 @@ typedef struct dwarf2_debug_info_s struct symt* symt; const unsigned char** data; struct vector children; + struct dwarf2_debug_info_s* parent; } dwarf2_debug_info_t; typedef struct dwarf2_section_s @@ -1006,6 +1007,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in */ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* traverse, + dwarf2_debug_info_t* parent_di, dwarf2_debug_info_t** pdi) { const dwarf2_abbrev_entry_t*abbrev; @@ -1036,6 +1038,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, if (!di) return FALSE; di->abbrev = abbrev; di->symt = NULL; + di->parent = parent_di; if (abbrev->num_attr) { @@ -1052,7 +1055,7 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, vector_init(&di->children, sizeof(dwarf2_debug_info_t*), 16); while (traverse->data < traverse->end_data) { - if (!dwarf2_read_one_debug_info(ctx, traverse, &child)) return FALSE; + if (!dwarf2_read_one_debug_info(ctx, traverse, di, &child)) return FALSE; if (!child) break; where = vector_add(&di->children, &ctx->pool); if (!where) return FALSE; @@ -2238,7 +2241,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); - dwarf2_read_one_debug_info(&ctx, &cu_ctx, &di); + dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di); if (di->abbrev->tag == DW_TAG_compile_unit) {

1 0

Eric Pouech : dbghelp: More precisely manage the inline attribute.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 6d49f958de0de5665c3d9028d53652fa579027ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d49f958de0de5665c3d9028d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:42 2011 +0100 dbghelp: More precisely manage the inline attribute. --- dlls/dbghelp/dwarf.c | 3 ++- dlls/dbghelp/dwarf.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 776031e..7299314 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1764,7 +1764,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* if it's an abstract representation of an inline function, there should be * a concrete object that we'll handle */ - if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags)) + if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags) && + inline_flags.u.uvalue != DW_INL_not_inlined) { TRACE("Function %s declared as inlined (%ld)... skipping\n", name.u.string ? name.u.string : "(null)", inline_flags.u.uvalue); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 9864ecc..f0557be 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -475,3 +475,8 @@ enum dwarf_call_frame_info #define DW_EH_PE_aligned 0x50 #define DW_EH_PE_indirect 0x80 #define DW_EH_PE_omit 0xff + +#define DW_INL_not_inlined 0x00 +#define DW_INL_inlined 0x01 +#define DW_INL_declared_not_inlined 0x02 +#define DW_INL_declared_inlined 0x03

1 0

Eric Pouech : dbghelp: When parsing dwarf debug info, silence ptr_to_member and imported_declaration entries.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0816d8f4bfee9d30c45ec0a290f5e1b835b0a5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0816d8f4bfee9d30c45ec0a29… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Mar 8 21:30:36 2011 +0100 dbghelp: When parsing dwarf debug info, silence ptr_to_member and imported_declaration entries. --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 585ea6c..776031e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1358,6 +1358,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_variable: + case DW_TAG_imported_declaration: + case DW_TAG_ptr_to_member_type: /* FIXME: some C++ related stuff */ break; default: @@ -1715,6 +1717,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, * Skip it for now */ break; + case DW_TAG_imported_module: + /* C++ stuff to be silenced (for now) */ + break; case DW_TAG_label: dwarf2_parse_subprogram_label(subpgm, child); break; @@ -1974,6 +1979,7 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, case DW_TAG_namespace: case DW_TAG_imported_module: case DW_TAG_imported_declaration: + case DW_TAG_ptr_to_member_type: break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %lu\n",

1 0

Alexandre Julliard : ntdll: Fix RtlGetSacl/ DaclSecurityDescriptor for relative descriptors on 64-bit.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: ab7efe727363b52e31ff7a29763a1bcaa623efe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7efe727363b52e31ff7a297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 13:44:11 2011 +0100 ntdll: Fix RtlGetSacl/DaclSecurityDescriptor for relative descriptors on 64-bit. --- dlls/ntdll/sec.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 6784848..c8e8a4d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -604,12 +604,15 @@ NTSTATUS WINAPI RtlGetDaclSecurityDescriptor( if ( (*lpbDaclPresent = (SE_DACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Dacl) - *pDacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Dacl ); - else - *pDacl = lpsd->Dacl; + if (lpsd->Control & SE_SELF_RELATIVE) + { + SECURITY_DESCRIPTOR_RELATIVE *sdr = pSecurityDescriptor; + if (sdr->Dacl) *pDacl = (PACL)SELF_RELATIVE_FIELD( sdr, Dacl ); + else *pDacl = NULL; + } + else *pDacl = lpsd->Dacl; - *lpbDaclDefaulted = (( SE_DACL_DEFAULTED & lpsd->Control ) ? 1 : 0); + *lpbDaclDefaulted = (lpsd->Control & SE_DACL_DEFAULTED) != 0; } else { @@ -673,12 +676,15 @@ NTSTATUS WINAPI RtlGetSaclSecurityDescriptor( if ( (*lpbSaclPresent = (SE_SACL_PRESENT & lpsd->Control) ? 1 : 0) ) { - if ((SE_SELF_RELATIVE & lpsd->Control) && lpsd->Sacl) - *pSacl = (PACL)SELF_RELATIVE_FIELD( lpsd, Sacl ); - else - *pSacl = lpsd->Sacl; + if (lpsd->Control & SE_SELF_RELATIVE) + { + SECURITY_DESCRIPTOR_RELATIVE *sdr = pSecurityDescriptor; + if (sdr->Sacl) *pSacl = (PACL)SELF_RELATIVE_FIELD( sdr, Sacl ); + else *pSacl = NULL; + } + else *pSacl = lpsd->Sacl; - *lpbSaclDefaulted = (( SE_SACL_DEFAULTED & lpsd->Control ) ? 1 : 0); + *lpbSaclDefaulted = (lpsd->Control & SE_SACL_DEFAULTED) != 0; } return STATUS_SUCCESS; }

1 0

Juan Lang : wininet/tests: Add a couple more tests for GetUrlCacheEntryInfoEx.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: c485996e5ea71f27f2e794461ecfdfe07a9070ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c485996e5ea71f27f2e794461… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 11:34:23 2011 -0800 wininet/tests: Add a couple more tests for GetUrlCacheEntryInfoEx. --- dlls/wininet/tests/urlcache.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 630b5cc..526a70d 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -96,7 +96,7 @@ static void test_find_url_cache_entriesA(void) static void test_GetUrlCacheEntryInfoExA(void) { BOOL ret; - DWORD cbCacheEntryInfo; + DWORD cbCacheEntryInfo, cbRedirectUrl; LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo; SetLastError(0xdeadbeef); @@ -142,6 +142,16 @@ static void test_GetUrlCacheEntryInfoExA(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); + + /* Querying the redirect URL fails with ERROR_INVALID_PARAMETER */ + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, NULL, NULL, &cbRedirectUrl, NULL, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, &cbRedirectUrl, NULL, 0); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } static void test_RetrieveUrlCacheEntryA(void)

1 0

Max TenEyck Woodbury : c2man: Fix .spec file flag recognition.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 3d6ae97aa3e607793bca6ab3cef433c9ec00d40a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ae97aa3e607793bca6ab3c… Author: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> Date: Tue Mar 8 18:29:02 2011 -0500 c2man: Fix .spec file flag recognition. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index db9f25f..868e4fc 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -152,7 +152,7 @@ sub process_spec_file($) { $flags |= $FLAG_REGISTER; } - s/ \-[a-z0-9]+//g; # Strip flags + s/ \-[a-z0-9=_]+//g; # Strip flags if( /^(([0-9]+)|@) / ) {

1 0

Hans Leidekker : msi: Build the key path from the display name if the component is an assembly.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 888a19c02c1c719faba704c00ab24ac11b0dd7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888a19c02c1c719faba704c00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:46 2011 +0100 msi: Build the key path from the display name if the component is an assembly. --- dlls/msi/action.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f58aaf2..7567f5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3252,7 +3252,19 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) squash_guid(comp->ComponentId,squished_cc); msi_free(comp->FullKeypath); - comp->FullKeypath = resolve_keypath( package, comp ); + if (comp->assembly) + { + const WCHAR prefixW[] = {'<','\\',0}; + DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); + + comp->FullKeypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); + if (comp->FullKeypath) + { + strcpyW( comp->FullKeypath, prefixW ); + strcatW( comp->FullKeypath, comp->assembly->display_name ); + } + } + else comp->FullKeypath = resolve_keypath( package, comp ); ACTION_RefCountComponent( package, comp );

1 0

Hans Leidekker : msi: Also register components without a key path.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: e292eb121ddc9da71e758bc41096fa497101e813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e292eb121ddc9da71e758bc41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 08:58:29 2011 +0100 msi: Also register components without a key path. --- dlls/msi/action.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a003f5e..f58aaf2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3266,15 +3266,10 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) if (comp->ActionRequest == INSTALLSTATE_LOCAL || comp->ActionRequest == INSTALLSTATE_SOURCE) { - if (!comp->FullKeypath) - continue; - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); else - rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, - &hkey, TRUE); + rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, NULL, &hkey, TRUE); if (rc != ERROR_SUCCESS) continue;

1 0

Thomas Mullaly : mshtml/tests: Fixed memory leak and made Vtbl's const.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a33df48f36c0b34343d3c369de724dac0fceb943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33df48f36c0b34343d3c369d… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Mar 8 23:27:16 2011 -0500 mshtml/tests: Fixed memory leak and made Vtbl's const. --- dlls/mshtml/tests/events.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index bdb8460..a670532 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1197,7 +1197,7 @@ static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember return S_OK; } -static IDispatchExVtbl timeoutFuncVtbl = { +static const IDispatchExVtbl timeoutFuncVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -1231,7 +1231,7 @@ static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, return S_OK; } -static IDispatchExVtbl div_onclick_dispVtbl = { +static const IDispatchExVtbl div_onclick_dispVtbl = { Dispatch_QueryInterface, DispatchEx_AddRef, DispatchEx_Release, @@ -2208,7 +2208,7 @@ static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *ifac return E_NOTIMPL; } -static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_QueryInterface, PropertyNotifySink_AddRef, PropertyNotifySink_Release, @@ -2410,6 +2410,7 @@ static void test_empty_document(void) ok(hres == S_OK, "Unadvise failed: %08x\n", hres); IHTMLDocument2_Release(windows_doc); + IHTMLDocument2_Release(doc); } START_TEST(events)

1 0

Vincent Povirk : gdiplus: Fix a handle leak in GdipDrawString.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: d0e6aa0204a5cd6c7d2f4696019f6f87897cf478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e6aa0204a5cd6c7d2f46960… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 8 16:59:19 2011 -0600 gdiplus: Fix a handle leak in GdipDrawString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 43513c8..e9412c8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4411,7 +4411,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw); - DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); + DeleteObject(SelectObject(graphics->hdc, gdifont)); if (!format || format->align == StringAlignmentNear) {

1 0

Nikolay Sivov : msvcrt: Add _get_output_format() and return default value.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 0512829a27b6401610545ed15ab6cbc83097070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0512829a27b6401610545ed15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:41:07 2011 +0300 msvcrt: Add _get_output_format() and return default value. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/headers.c | 1 + dlls/msvcrt/tests/printf.c | 17 +++++++++++++++++ include/msvcrt/stdio.h | 4 ++++ 9 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d732d69..1570fd4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -684,7 +684,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1631fdb..65f9510 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -528,7 +528,7 @@ @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ cdecl _get_osplatform(ptr) msvcrt._get_osplatform @ stub _get_osver -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8148caf..badfe65 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -518,7 +518,7 @@ @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle -@ stub _get_output_format +@ cdecl _get_output_format() msvcrt._get_output_format @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d37fc72..b32fdb9 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -253,3 +253,12 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, MSVCRT_mergesort(base, secondarr, size, compar, 0, nmemb-1, context); MSVCRT_free(secondarr); } + +/********************************************************************* + * _get_output_format (MSVCRT.@) + * + */ +unsigned int CDECL _get_output_format(void) +{ + return 0; +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1c7120f..311437a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -769,6 +769,9 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT__WRITE_ABORT_MSG 1 #define MSVCRT__CALL_REPORTFAULT 2 +/* _get_output_format return code */ +#define MSVCRT__TWO_DIGIT_EXPONENT 0x1 + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f75c0d9..5d07736 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -473,7 +473,7 @@ @ cdecl _get_osfhandle(long) @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform # stub _get_osver -# stub _get_output_format +@ cdecl _get_output_format() # stub _get_pgmptr @ cdecl _get_sbh_threshold() # stub _get_wenviron diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c index 25e2277..7c102b4 100644 --- a/dlls/msvcrt/tests/headers.c +++ b/dlls/msvcrt/tests/headers.c @@ -457,6 +457,7 @@ static void test_defines(void) CHECK_DEF(_UNDERFLOW); CHECK_DEF(_WRITE_ABORT_MSG); CHECK_DEF(_CALL_REPORTFAULT); + CHECK_DEF(_TWO_DIGIT_EXPONENT); } #endif /* __WINE_USE_MSVCRT */ diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ddf4801..22ad1f6 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -43,6 +43,7 @@ static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); +static unsigned int (__cdecl *p__get_output_format)(void); static void init( void ) { @@ -53,6 +54,7 @@ static void init( void ) p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); + p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); } static void test_sprintf( void ) @@ -1013,6 +1015,20 @@ static void test_vsnwprintf_s(void) ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); } +static void test__get_output_format(void) +{ + unsigned int ret; + + if (!p__get_output_format) + { + win_skip("_get_output_format not available\n"); + return; + } + + ret = p__get_output_format(); + ok(ret == 0, "got %d\n", ret); +} + START_TEST(printf) { init(); @@ -1026,4 +1042,5 @@ START_TEST(printf) test_vscprintf(); test_vscwprintf(); test_vsnwprintf_s(); + test__get_output_format(); } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index fa5290f..c167110 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -94,6 +94,9 @@ FILE* __cdecl __iob_func(void); #define stdout (_iob+STDOUT_FILENO) #define stderr (_iob+STDERR_FILENO) +/* return value for _get_output_format */ +#define _TWO_DIGIT_EXPONENT 0x1 + #ifndef _STDIO_DEFINED #define _STDIO_DEFINED int __cdecl _fcloseall(void); @@ -173,6 +176,7 @@ int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); +unsigned int __cdecl _get_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Nikolay Sivov : msxml3: Put together similar tests using tabled test data.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 6194d3014508b0d01ff321f1c50ec4430a511607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6194d3014508b0d01ff321f1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:09:03 2011 +0300 msxml3: Put together similar tests using tabled test data. --- dlls/msxml3/tests/domdoc.c | 486 ++++++++++++++++++++------------------------ 1 files changed, 225 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6194d3014508b0d01ff32…

1 0

Henri Verbeet : d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: ab8a9f27f925e47cb39959ad4a3e84c7752d26f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8a9f27f925e47cb39959ad4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:08 2011 +0100 d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE. --- dlls/d3d9/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1dd6895..e008b31 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, /* This method is only allowed with surfaces that are render targets, or * offscreen plain surfaces in D3DPOOL_DEFAULT. */ - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) - && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE)) + if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT) { wined3d_mutex_unlock(); WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n");

1 0

Henri Verbeet : wined3d: Store all the resource desc information in struct wined3d_resource.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: ac9c592ca9c0bac6479f9a8beef4030815b738c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9c592ca9c0bac6479f9a8be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:07 2011 +0100 wined3d: Store all the resource desc information in struct wined3d_resource. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/basetexture.c | 5 +- dlls/wined3d/buffer.c | 5 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 44 ++++++------ dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/resource.c | 17 +++-- dlls/wined3d/state.c | 6 +- dlls/wined3d/surface.c | 140 +++++++++++++++++++------------------ dlls/wined3d/surface_base.c | 136 +++++++++++++++++++----------------- dlls/wined3d/surface_gdi.c | 4 +- dlls/wined3d/swapchain.c | 16 ++-- dlls/wined3d/swapchain_gdi.c | 4 +- dlls/wined3d/volume.c | 34 ++++----- dlls/wined3d/wined3d_private.h | 40 ++++------- 15 files changed, 235 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac9c592ca9c0bac6479f9…

1 0

Henri Verbeet : wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 63b72d789daec35d10bb8b0aba6a47eb5efcaba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b72d789daec35d10bb8b0ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:06 2011 +0100 wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volumetexture.c | 5 ++--- include/wine/wined3d.idl | 16 ++++------------ 11 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6c70afb..298988d 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -260,7 +260,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, level, &wined3d_desc); + hr = IWineD3DCubeTexture_GetSubResourceDesc(This->wineD3DCubeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c358ed0..c7bc4bd 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -257,7 +257,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, level, &wined3d_desc); + hr = IWineD3DTexture_GetSubResourceDesc(This->wineD3DTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 3e2ee58..6b4ce3a 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -234,7 +234,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); + hr = IWineD3DVolumeTexture_GetSubResourceDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 583efb1..eacc61e 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -276,7 +276,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(IDirect3DCubeTextur TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, level, &wined3d_desc); + hr = IWineD3DCubeTexture_GetSubResourceDesc(This->wineD3DCubeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c7696a3..e94a172 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -272,7 +272,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(IDirect3DTexture9 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, level, &wined3d_desc); + hr = IWineD3DTexture_GetSubResourceDesc(This->wineD3DTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index b1b43a9..c976e87 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -298,7 +298,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); + hr = IWineD3DVolumeTexture_GetSubResourceDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9632947..b55994d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2506,7 +2506,7 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, if(hr == WINED3D_OK && tex) { - hr = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + hr = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(hr)) { ddfmt.dwSize = sizeof(ddfmt); @@ -2815,7 +2815,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, if(hr == WINED3D_OK && tex) { memset(&desc, 0, sizeof(desc)); - hr = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + hr = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(hr)) { ddfmt.dwSize = sizeof(ddfmt); @@ -4588,7 +4588,7 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, if(result == WINED3D_OK && tex) { memset(&desc, 0, sizeof(desc)); - result = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + result = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(result)) { ddfmt.dwSize = sizeof(ddfmt); diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 5df720c..d4e5d21 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -326,7 +326,7 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) return FALSE; } -static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture *iface, +static HRESULT WINAPI IWineD3DCubeTextureImpl_GetSubResourceDesc(IWineD3DCubeTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -450,8 +450,8 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, IWineD3DCubeTextureImpl_IsCondNP2, + IWineD3DCubeTextureImpl_GetSubResourceDesc, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_GetLevelDesc, IWineD3DCubeTextureImpl_GetCubeMapSurface, IWineD3DCubeTextureImpl_Map, IWineD3DCubeTextureImpl_Unmap, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1af3412..7a78ad8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -351,7 +351,7 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { return This->cond_np2; } -static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, +static HRESULT WINAPI IWineD3DTextureImpl_GetSubResourceDesc(IWineD3DTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -468,8 +468,8 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, IWineD3DTextureImpl_IsCondNP2, + IWineD3DTextureImpl_GetSubResourceDesc, /* IWineD3DTexture */ - IWineD3DTextureImpl_GetLevelDesc, IWineD3DTextureImpl_GetSurfaceLevel, IWineD3DTextureImpl_Map, IWineD3DTextureImpl_Unmap, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9c6b57d..78ded41 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -263,7 +263,7 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if return FALSE; } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTexture *iface, +static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetSubResourceDesc(IWineD3DVolumeTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -380,10 +380,9 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetAutoGenFilterType, IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, - /* not in d3d */ IWineD3DVolumeTextureImpl_IsCondNP2, + IWineD3DVolumeTextureImpl_GetSubResourceDesc, /* volume texture */ - IWineD3DVolumeTextureImpl_GetLevelDesc, IWineD3DVolumeTextureImpl_GetVolumeLevel, IWineD3DVolumeTextureImpl_Map, IWineD3DVolumeTextureImpl_Unmap, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 36addd6..8acc0bb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2362,6 +2362,10 @@ interface IWineD3DBaseTexture : IWineD3DResource ); BOOL IsCondNP2( ); + HRESULT GetSubResourceDesc( + [in] UINT sub_resource_idx, + [out] struct wined3d_resource_desc *desc + ); } [ @@ -2371,10 +2375,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetSurfaceLevel( [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface @@ -2400,10 +2400,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetCubeMapSurface( [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface @@ -2430,10 +2426,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetVolumeLevel( [in] UINT sub_resource_idx, [out] IWineD3DVolume **volume

1 0

Henri Verbeet : wined3d: Merge the various resource desc structures.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 756fdb7c5affaef02d058c388e15fe1ce183ee38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756fdb7c5affaef02d058c388… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:05 2011 +0100 wined3d: Merge the various resource desc structures. --- dlls/d3d8/buffer.c | 16 +++++++------- dlls/d3d8/cubetexture.c | 24 ++++++++++---------- dlls/d3d8/device.c | 19 ++++++++-------- dlls/d3d8/surface.c | 25 +++++++++++---------- dlls/d3d8/texture.c | 27 +++++++++++------------ dlls/d3d8/volume.c | 24 ++++++++++---------- dlls/d3d8/volumetexture.c | 27 ++++++++++++----------- dlls/d3d9/buffer.c | 16 +++++++------- dlls/d3d9/cubetexture.c | 26 ++++++++++++---------- dlls/d3d9/device.c | 17 +++++--------- dlls/d3d9/surface.c | 25 +++++++++++---------- dlls/d3d9/texture.c | 27 ++++++++++++----------- dlls/d3d9/volume.c | 23 ++++++++++--------- dlls/d3d9/volumetexture.c | 25 +++++++++++---------- dlls/ddraw/ddraw.c | 28 +++++------------------- dlls/ddraw/device.c | 12 +++++----- dlls/ddraw/surface.c | 2 +- dlls/ddraw/vertexbuffer.c | 12 +++++----- dlls/wined3d/buffer.c | 16 +++++++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface_base.c | 3 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 20 +++++++++-------- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 45 +++++++++++---------------------------- 27 files changed, 223 insertions(+), 246 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756fdb7c5affaef02d058…

1 0

Jacek Caban : mshtml: Don' t assume that HTMLWindow_Create sets ret val before succeeding.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 1913ff3a42d2f26460cd39ac749435abfe9e3d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1913ff3a42d2f26460cd39ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 18:45:45 2011 +0100 mshtml: Don't assume that HTMLWindow_Create sets ret val before succeeding. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0d42d4f..6842b23 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2019,7 +2019,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc) return E_OUTOFMEMORY; - if(window == doc_obj->basedoc.window) + if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; nsIDOMHTMLDocument_AddRef(nsdoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a4fa1be..99d03b3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2247,7 +2247,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_init(&window->script_hosts); window->task_magic = get_task_target_magic(); - *ret = window; update_window_doc(window); list_init(&window->children); @@ -2260,6 +2259,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_add_tail(&parent->children, &window->sibling_entry); } + *ret = window; return S_OK; }

1 0

Juan Lang : kernel32: Add some parameter checking to FileTimeToDosDateTime.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 2ca58402e71b29aa06b4ef94b70ade8124ddd883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca58402e71b29aa06b4ef94b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 15:55:35 2011 -0800 kernel32: Add some parameter checking to FileTimeToDosDateTime. --- dlls/kernel32/tests/time.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 11 ++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 36dcbdf..b0d8a46 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -600,6 +600,43 @@ static void test_TzSpecificLocalTimeToSystemTime(void) } } +static void test_FileTimeToDosDateTime(void) +{ + FILETIME ft = { 0 }; + WORD fatdate, fattime; + BOOL ret; + + if (0) + { + /* Crashes */ + FileTimeToDosDateTime(NULL, NULL, NULL); + } + /* Parameter checking */ + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, NULL, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, &fatdate, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, NULL, &fattime); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, &fatdate, &fattime); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandle("kernel32"); @@ -612,4 +649,5 @@ START_TEST(time) test_FileTimeToSystemTime(); test_FileTimeToLocalFileTime(); test_TzSpecificLocalTimeToSystemTime(); + test_FileTimeToDosDateTime(); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 2b7bd6c..5dff796 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1000,9 +1000,18 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, time_t unixtime; struct tm* tm; + if (!fatdate || !fattime) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } li.u.LowPart = ft->dwLowDateTime; li.u.HighPart = ft->dwHighDateTime; - RtlTimeToSecondsSince1970( &li, &t ); + if (!RtlTimeToSecondsSince1970( &li, &t )) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } unixtime = t; tm = gmtime( &unixtime ); if (fattime)

1 0

Juan Lang : wininet: Implement FindNextUrlCacheEntryW.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: c4d628cb023b856629cda61f6bbb353bd6200ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d628cb023b856629cda61f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 11:22:43 2011 -0800 wininet: Implement FindNextUrlCacheEntryW. --- dlls/wininet/urlcache.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 100a103..431288f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3304,19 +3304,15 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, return pEntryHandle; } -/*********************************************************************** - * FindNextUrlCacheEntryA (WININET.@) - */ -BOOL WINAPI FindNextUrlCacheEntryA( +static BOOL FindNextUrlCacheEntryInternal( HANDLE hEnumHandle, LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, - LPDWORD lpdwNextCacheEntryInfoBufferSize) + LPDWORD lpdwNextCacheEntryInfoBufferSize, + BOOL unicode) { URLCacheFindEntryHandle *pEntryHandle = (URLCacheFindEntryHandle *)hEnumHandle; URLCACHECONTAINER * pContainer; - TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - if (pEntryHandle->dwMagic != URLCACHE_FIND_ENTRY_HANDLE_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); @@ -3354,8 +3350,10 @@ BOOL WINAPI FindNextUrlCacheEntryA( continue; pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + TRACE("Found URL: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); error = URLCache_CopyEntry( pContainer, @@ -3363,14 +3361,15 @@ BOOL WINAPI FindNextUrlCacheEntryA( lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize, pUrlEntry, - FALSE /* not UNICODE */); + unicode); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + TRACE("Local File Name: %s\n", + debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); /* increment the current index so that next time the function * is called the next entry is returned */ @@ -3388,6 +3387,20 @@ BOOL WINAPI FindNextUrlCacheEntryA( } /*********************************************************************** + * FindNextUrlCacheEntryA (WININET.@) + */ +BOOL WINAPI FindNextUrlCacheEntryA( + HANDLE hEnumHandle, + LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, + LPDWORD lpdwNextCacheEntryInfoBufferSize) +{ + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, FALSE /* not UNICODE */); +} + +/*********************************************************************** * FindNextUrlCacheEntryW (WININET.@) */ BOOL WINAPI FindNextUrlCacheEntryW( @@ -3396,9 +3409,11 @@ BOOL WINAPI FindNextUrlCacheEntryW( LPDWORD lpdwNextCacheEntryInfoBufferSize ) { - FIXME("(%p, %p, %p) stub\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("(%p, %p, %p)\n", hEnumHandle, lpNextCacheEntryInfo, lpdwNextCacheEntryInfoBufferSize); + + return FindNextUrlCacheEntryInternal(hEnumHandle, + (LPINTERNET_CACHE_ENTRY_INFOA)lpNextCacheEntryInfo, + lpdwNextCacheEntryInfoBufferSize, TRUE /* UNICODE */); } /***********************************************************************

1 0

Juan Lang : wininet: Implement RetrieveUrlCacheEntryStreamW.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 9cd7545c00ecb46ebe0a0f9f5d2bc7829374a942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd7545c00ecb46ebe0a0f9f5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 4 12:08:38 2011 -0800 wininet: Implement RetrieveUrlCacheEntryStreamW. --- dlls/wininet/urlcache.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 6ec08de..100a103 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2868,9 +2868,53 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamW( IN DWORD dwReserved ) { - FIXME( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, + DWORD size; + int url_len; + /* NOTE: this is not the same as the way that the native + * version allocates 'stream' handles. I did it this way + * as it is much easier and no applications should depend + * on this behaviour. (Native version appears to allocate + * indices into a table) + */ + STREAM_HANDLE * pStream; + HANDLE hFile; + + TRACE( "(%s, %p, %p, %x, 0x%08x)\n", debugstr_w(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, fRandomRead, dwReserved ); - return NULL; + + if (!RetrieveUrlCacheEntryFileW(lpszUrlName, + lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, + dwReserved)) + { + return NULL; + } + + hFile = CreateFileW(lpCacheEntryInfo->lpszLocalFileName, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + fRandomRead ? FILE_FLAG_RANDOM_ACCESS : 0, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + /* allocate handle storage space */ + size = sizeof(STREAM_HANDLE); + url_len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); + size += url_len; + pStream = HeapAlloc(GetProcessHeap(), 0, size); + if (!pStream) + { + CloseHandle(hFile); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + pStream->hFile = hFile; + WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, pStream->lpszUrl, url_len, NULL, NULL); + return pStream; } /***********************************************************************

1 0

Juan Lang : wininet: Store headers in url cache entries.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 011b26b1c6c229ace4afb65d063563d7c13fa669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=011b26b1c6c229ace4afb65d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 15:33:40 2011 -0800 wininet: Store headers in url cache entries. --- dlls/wininet/http.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2fb2a2e..a0574bf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1576,8 +1576,12 @@ static void HTTPREQ_Destroy(object_header_t *hdr) CloseHandle(request->hCacheFile); if(HTTP_GetRequestURL(request, url)) { + DWORD headersLen; + + headersLen = request->rawHeaders ? strlenW(request->rawHeaders) : 0; CommitUrlCacheEntryW(url, request->cacheFile, request->expires, - request->last_modified, NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); + request->last_modified, NORMAL_CACHE_ENTRY, + request->rawHeaders, headersLen, NULL, 0); } }

1 0

Juan Lang : wininet: Set last access time when retrieving a URL cache entry .
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 47970d050464fc711e91a2ce8f46065a2099e836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47970d050464fc711e91a2ce8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 13:42:08 2011 -0800 wininet: Set last access time when retrieving a URL cache entry. --- dlls/wininet/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 639e135..6ec08de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1896,6 +1896,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, @@ -1992,6 +1993,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(

1 0

Juan Lang : wininet: Account for disk space usage when deleting url cache entries.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: a0397541036f7cedd47cde5bb830e576c5c654b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0397541036f7cedd47cde5bb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 08:06:10 2011 -0800 wininet: Account for disk space usage when deleting url cache entries. --- dlls/wininet/urlcache.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e888360..639e135 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2963,6 +2963,10 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; URLCache_DeleteEntry(pHeader, pEntry); @@ -3042,6 +3046,10 @@ BOOL WINAPI DeleteUrlCacheEntryW(LPCWSTR lpszUrlName) if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles--; } + if (pUrlEntry->size.QuadPart < pHeader->CacheUsage.QuadPart) + pHeader->CacheUsage.QuadPart -= pUrlEntry->size.QuadPart; + else + pHeader->CacheUsage.QuadPart = 0; URLCache_DeleteEntry(pHeader, pEntry);

1 0

Juan Lang : wininet: Account for disk space used by cache.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 7c15dc50a246d788c993736f10b60a567ce98afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c15dc50a246d788c993736f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 08:04:22 2011 -0800 wininet: Account for disk space used by cache. --- dlls/wininet/urlcache.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f099fa5..e888360 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2628,6 +2628,9 @@ static BOOL CommitUrlCacheEntryInternal( { if (pUrlEntry->CacheDir < pHeader->DirectoryCount) pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + pHeader->CacheUsage.QuadPart += file_size.QuadPart; + if (pHeader->CacheUsage.QuadPart > pHeader->CacheLimit.QuadPart) + FIXME("file of size %s bytes fills cache\n", wine_dbgstr_longlong(file_size.QuadPart)); } cleanup:

1 0

Alexandre Julliard : wininet: Convert file size in cache entry to a large integer.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: d790688afa9487007a255208865caf8aeb6dc52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790688afa9487007a2552088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 12:23:05 2011 +0100 wininet: Convert file size in cache entry to a large integer. --- dlls/wininet/urlcache.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 10b518b..f099fa5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -96,8 +96,7 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wExpiredDate; /* expire date in dos format */ WORD wExpiredTime; /* expire time in dos format */ DWORD dwUnknown1; /* usually zero */ - DWORD dwSizeLow; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow */ - DWORD dwSizeHigh; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeHigh */ + ULARGE_INTEGER size; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow/High */ DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ @@ -959,8 +958,8 @@ static DWORD URLCache_CopyEntry( lpCacheEntryInfo->u.dwExemptDelta = pUrlEntry->dwExemptDelta; lpCacheEntryInfo->dwHeaderInfoSize = pUrlEntry->dwHeaderInfoSize; lpCacheEntryInfo->dwHitRate = pUrlEntry->dwHitRate; - lpCacheEntryInfo->dwSizeHigh = pUrlEntry->dwSizeHigh; - lpCacheEntryInfo->dwSizeLow = pUrlEntry->dwSizeLow; + lpCacheEntryInfo->dwSizeHigh = pUrlEntry->size.u.HighPart; + lpCacheEntryInfo->dwSizeLow = pUrlEntry->size.u.LowPart; lpCacheEntryInfo->dwStructSize = sizeof(*lpCacheEntryInfo); lpCacheEntryInfo->dwUseCount = pUrlEntry->dwUseCount; DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, &lpCacheEntryInfo->ExpireTime); @@ -2432,8 +2431,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwOffsetFileExtension = 0; - DWORD dwFileSizeLow = 0; - DWORD dwFileSizeHigh = 0; + LARGE_INTEGER file_size; BYTE cDirectory = 0; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; @@ -2452,7 +2450,8 @@ static BOOL CommitUrlCacheEntryInternal( if (lpszOriginalUrl) WARN(": lpszOriginalUrl ignored\n"); - + + file_size.QuadPart = 0; if (lpszLocalFileName) { HANDLE hFile; @@ -2465,8 +2464,7 @@ static BOOL CommitUrlCacheEntryInternal( } /* Get file size */ - dwFileSizeLow = GetFileSize(hFile, &dwFileSizeHigh); - if ((dwFileSizeLow == INVALID_FILE_SIZE) && (GetLastError() != NO_ERROR)) + if (!GetFileSizeEx(hFile, &file_size)) { ERR("couldn't get file size (error is %d)\n", GetLastError()); CloseHandle(hFile); @@ -2595,9 +2593,7 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); - pUrlEntry->dwSizeHigh = 0; - pUrlEntry->dwSizeLow = dwFileSizeLow; - pUrlEntry->dwSizeHigh = dwFileSizeHigh; + pUrlEntry->size.QuadPart = file_size.QuadPart; pUrlEntry->dwUseCount = 0; GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); pUrlEntry->LastModifiedTime = LastModifiedTime;

1 0

Juan Lang : wininet: Change type of cache limit and usage to large integers .
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: f0cd3de5c1d5d49f45b9594d7211a348f102b69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0cd3de5c1d5d49f45b9594d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 07:54:19 2011 -0800 wininet: Change type of cache limit and usage to large integers. --- dlls/wininet/urlcache.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ca7f880..10b518b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -154,12 +154,9 @@ typedef struct _URLCACHE_HEADER DWORD dwIndexCapacityInBlocks; DWORD dwBlocksInUse; DWORD dwUnknown1; - DWORD dwCacheLimitLow; - DWORD dwCacheLimitHigh; - DWORD dwCacheUsageLow; - DWORD dwCacheUsageHigh; - DWORD dwExemptUsageLow; - DWORD dwExemptUsageHigh; + ULARGE_INTEGER CacheLimit; + ULARGE_INTEGER CacheUsage; + ULARGE_INTEGER ExemptUsage; DWORD DirectoryCount; /* number of directory_data's */ DIRECTORY_DATA directory_data[1]; /* first directory entry */ } URLCACHE_HEADER, *LPURLCACHE_HEADER; @@ -312,8 +309,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) pHeader->dwFileSize = dwFileSize; pHeader->dwIndexCapacityInBlocks = NEWFILE_NUM_BLOCKS; /* 127MB - taken from default for Windows 2000 */ - pHeader->dwCacheLimitHigh = 0; - pHeader->dwCacheLimitLow = 0x07ff5400; + pHeader->CacheLimit.QuadPart = 0x07ff5400; /* Copied from a Windows 2000 cache index */ pHeader->DirectoryCount = 4; @@ -328,8 +324,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) (BYTE *) &dw, &len) == ERROR_SUCCESS && keytype == REG_DWORD) { - pHeader->dwCacheLimitHigh = (dw >> 22); - pHeader->dwCacheLimitLow = dw << 10; + pHeader->CacheLimit.QuadPart = (ULONGLONG)dw * 1024; } RegCloseKey(key); }

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the print spooler functions.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 22f920df8e02e911411b8800ab7e1890ce1d7a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f920df8e02e911411b8800a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 21:36:52 2011 +0100 gdi32: Add null driver entry points for the print spooler functions. --- dlls/gdi32/driver.c | 35 +++++++++++++++++++++++++---- dlls/gdi32/printdrv.c | 58 +++++++++++++++++++++++++++--------------------- 2 files changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 114226b..acd8f6e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -312,6 +312,11 @@ done: } +static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -329,6 +334,16 @@ static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, IN return TRUE; } +static INT CDECL nulldrv_EndDoc( PHYSDEV dev ) +{ + return 0; +} + +static INT CDECL nulldrv_EndPage( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; @@ -398,9 +413,19 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } +static INT CDECL nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info ) +{ + return 0; +} + +static INT CDECL nulldrv_StartPage( PHYSDEV dev ) +{ + return 1; +} + const DC_FUNCTIONS null_driver = { - NULL, /* pAbortDoc */ + nulldrv_AbortDoc, /* pAbortDoc */ NULL, /* pAbortPath */ NULL, /* pAlphaBlend */ nulldrv_AngleArc, /* pAngleArc */ @@ -420,8 +445,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ - NULL, /* pEndDoc */ - NULL, /* pEndPage */ + nulldrv_EndDoc, /* pEndDoc */ + nulldrv_EndPage, /* pEndPage */ NULL, /* pEndPath */ NULL, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ @@ -510,8 +535,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetWindowExt */ NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ - NULL, /* pStartDoc */ - NULL, /* pStartPage */ + nulldrv_StartDoc, /* pStartDoc */ + nulldrv_StartPage, /* pStartPage */ NULL, /* pStretchBlt */ NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index cc1e61f..3cfdc47 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -69,7 +69,7 @@ DWORD WINAPI GdiInitSpool(void) */ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) { - INT ret = 0; + INT ret; DC *dc = get_dc_ptr( hdc ); TRACE("DocName = %s Output = %s Datatype = %s\n", @@ -78,13 +78,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) + if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) ret = 0; + else { - release_dc_ptr( dc ); - return ret; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); + ret = physdev->funcs->pStartDoc( physdev, doc ); } - - if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc ); release_dc_ptr( dc ); return ret; } @@ -140,12 +139,15 @@ INT WINAPI StartDocA(HDC hdc, const DOCINFOA* doc) */ INT WINAPI EndDoc(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pEndDoc) ret = dc->funcs->pEndDoc( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEndDoc ); + ret = physdev->funcs->pEndDoc( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -156,15 +158,15 @@ INT WINAPI EndDoc(HDC hdc) */ INT WINAPI StartPage(HDC hdc) { - INT ret = 1; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if(dc->funcs->pStartPage) - ret = dc->funcs->pStartPage( dc->physDev ); - else - FIXME("stub\n"); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartPage ); + ret = physdev->funcs->pStartPage( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -175,12 +177,15 @@ INT WINAPI StartPage(HDC hdc) */ INT WINAPI EndPage(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEndPage ); + ret = physdev->funcs->pEndPage( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -190,12 +195,15 @@ INT WINAPI EndPage(HDC hdc) */ INT WINAPI AbortDoc(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pAbortDoc) ret = dc->funcs->pAbortDoc( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pAbortDoc ); + ret = physdev->funcs->pAbortDoc( physdev ); + release_dc_ptr( dc ); + } return ret; }

1 0

Alexandre Julliard : gdi32: Add null driver entry points for painting functions that have a fallback implementation .
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 7e3a871497d05e747287f867fcd743190418278d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3a871497d05e747287f867f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 21:15:59 2011 +0100 gdi32: Add null driver entry points for painting functions that have a fallback implementation. --- dlls/gdi32/driver.c | 18 +- dlls/gdi32/gdi_private.h | 11 ++ dlls/gdi32/painting.c | 436 ++++++++++++++++++++++++---------------------- 3 files changed, 252 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3a871497d05e747287f…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for a number of simple painting functions.
by Alexandre Julliard 09 Mar '11

09 Mar '11

Module: wine Branch: master Commit: 1f6f82782cd8b214734173f548480f1fc9aeca47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6f82782cd8b214734173f54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 20:30:03 2011 +0100 gdi32: Add null driver entry points for a number of simple painting functions. --- dlls/gdi32/driver.c | 118 ++++++++++++++++++++++++++++++++++++++++++------- dlls/gdi32/painting.c | 100 +++++++++++++++++++++++++++++------------ 2 files changed, 173 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6f82782cd8b21473417…

1 0

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 March 2011