May 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcp: Don't define stubs for data exports.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 537b35006c553a55acda587d6ebac108c4dc92a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537b35006c553a55acda587d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 16:59:58 2011 +0200 msvcp: Don't define stubs for data exports. --- dlls/msvcp100/msvcp100.spec | 532 +++++++++++++++--------------- dlls/msvcp60/msvcp60.spec | 360 +++++++++++----------- dlls/msvcp70/msvcp70.spec | 746 +++++++++++++++++++++--------------------- dlls/msvcp71/msvcp71.spec | 712 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 726 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 724 +++++++++++++++++++++--------------------- 6 files changed, 1900 insertions(+), 1900 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537b35006c553a55acda5…

1 0

Aric Stewart : wine.inf: Register wineqtdecoder.dll.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 14efad5d66f26d129b3a5094e6ab7dacdf484dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=14efad5d66f26d129b3a5094e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 3 08:33:45 2011 -0500 wine.inf: Register wineqtdecoder.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ee23bb3..1ce4ffc 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2562,6 +2562,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 +11,,wineqtdecoder.dll,1 11,,wintrust.dll,1 11,,wmiutils.dll,1 11,,wuapi.dll,1

1 0

Marcus Meissner : quartz: Handle NULL return from strchr() (Coverity).
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 63823061ed2137544fdd8822f64bff6d29a0aa9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63823061ed2137544fdd8822f… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue May 3 16:19:02 2011 +0200 quartz: Handle NULL return from strchr() (Coverity). --- dlls/quartz/filesource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6093713..ab72f4f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -179,8 +179,8 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p if (!(wszPatternString = strchrW(wszPatternString, ','))) hr = E_INVALIDARG; - - wszPatternString++; /* skip ',' */ + else + wszPatternString++; /* skip ',' */ } if (hr == S_OK)

1 0

Francois Gouget : wined3d: Make wined3d_event_query_test() and resource_get_type() static.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 6c8c68f7b6cef598a677edb76ddb5d45f0d00cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8c68f7b6cef598a677edb76… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:37:55 2011 +0200 wined3d: Make wined3d_event_query_test() and resource_get_type() static. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/resource.c | 6 ------ dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1751609..4e1eed27 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -37,7 +37,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) HeapFree(GetProcessHeap(), 0, query); } -enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) +static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index cdc483d..3807e89 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -272,12 +272,6 @@ DWORD resource_get_priority(const struct wined3d_resource *resource) return resource->priority; } -WINED3DRESOURCETYPE resource_get_type(const struct wined3d_resource *resource) -{ - TRACE("resource %p, returning %#x.\n", resource, resource->resourceType); - return resource->resourceType; -} - void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource) { return resource->parent; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17bcc7a..955595c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1027,7 +1027,6 @@ enum wined3d_event_query_result }; void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; -enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; @@ -1838,7 +1837,6 @@ HRESULT resource_init(struct wined3d_resource *resource, IWineD3DDeviceImpl *dev DWORD usage, WINED3DPOOL pool, UINT width, UINT height, UINT depth, UINT size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; -WINED3DRESOURCETYPE resource_get_type(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct wined3d_resource *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;

1 0

Francois Gouget : winefile: Fix the View and Options menu handles.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 7d460a4ea87b58cc449836a60231f89f64de4293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d460a4ea87b58cc449836a60… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:38:44 2011 +0200 winefile: Fix the View and Options menu handles. --- programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 51a889d..1b56308 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4558,8 +4558,8 @@ static BOOL show_frame(HWND hwndParent, int cmdshow, LPCWSTR path) hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); Globals.hMenuFrame = hMenuFrame; - Globals.hMenuView = GetSubMenu(hMenuFrame, 3); - Globals.hMenuOptions = GetSubMenu(hMenuFrame, 4); + Globals.hMenuView = GetSubMenu(hMenuFrame, 2); + Globals.hMenuOptions = GetSubMenu(hMenuFrame, 3); ccs.hWindowMenu = hMenuWindow; ccs.idFirstChild = IDW_FIRST_CHILD;

1 0

Francois Gouget : user32: SCROLL_SetNCSbState() is not used anymore so remove it.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: aaec50d44ceb3c84ddf2f985340ca1b586a56442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaec50d44ceb3c84ddf2f9853… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:38:02 2011 +0200 user32: SCROLL_SetNCSbState() is not used anymore so remove it. --- dlls/user32/controls.h | 2 -- dlls/user32/scroll.c | 26 -------------------------- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 065daeb..66d6659 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -179,8 +179,6 @@ extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; -extern INT SCROLL_SetNCSbState( HWND hwnd, int vMin, int vMax, int vPos, - int hMin, int hMax, int hPos ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index fd73bf4..6e6bc37 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1919,32 +1919,6 @@ BOOL WINAPI SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal, BOOL bRe /************************************************************************* - * SCROLL_SetNCSbState - * - * Updates both scrollbars at the same time. Used by MDI CalcChildScroll(). - */ -INT SCROLL_SetNCSbState(HWND hwnd, int vMin, int vMax, int vPos, - int hMin, int hMax, int hPos) -{ - SCROLLINFO vInfo, hInfo; - - vInfo.cbSize = hInfo.cbSize = sizeof(SCROLLINFO); - vInfo.nMin = vMin; - vInfo.nMax = vMax; - vInfo.nPos = vPos; - hInfo.nMin = hMin; - hInfo.nMax = hMax; - hInfo.nPos = hPos; - vInfo.fMask = hInfo.fMask = SIF_RANGE | SIF_POS; - - SCROLL_SetScrollInfo( hwnd, SB_VERT, &vInfo, TRUE ); - SCROLL_SetScrollInfo( hwnd, SB_HORZ, &hInfo, TRUE ); - - return 0; -} - - -/************************************************************************* * GetScrollRange (USER32.@) * * Gets the range of the scroll bar.

1 0

Francois Gouget : d3dcompiler_43: Make write_dword_unknown() static.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 4d29b9716e0b6b259a5dea2d4cf1f54494caf5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d29b9716e0b6b259a5dea2d4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:35:25 2011 +0200 d3dcompiler_43: Make write_dword_unknown() static. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 - dlls/d3dcompiler_43/utils.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1af84f8..8c63dec 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -603,6 +603,5 @@ static inline void write_dword(char **ptr, DWORD d) } void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; -void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; #endif /* __WINE_D3DCOMPILER_PRIVATE_H */ diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5727183..94264e4 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -520,7 +520,7 @@ void skip_dword_unknown(const char **ptr, unsigned int count) } } -void write_dword_unknown(char **ptr, DWORD d) +static void write_dword_unknown(char **ptr, DWORD d) { FIXME("Writing unknown DWORD 0x%08x\n", d); write_dword(ptr, d);

1 0

Nicolas Le Cam : gdi32: Remove a set but unused variable.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 46988651d91fbea7f611287e5d8320239e72108d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46988651d91fbea7f611287e5… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Apr 29 23:57:09 2011 +0200 gdi32: Remove a set but unused variable. --- dlls/gdi32/metafile.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index dae991f..fbc88d1 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -394,7 +394,6 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) WORD i; HPEN hPen; HBRUSH hBrush; - HFONT hFont; HPALETTE hPal; HRGN hRgn; BOOL loaded = FALSE; @@ -409,7 +408,6 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh) /* save DC */ hPen = GetCurrentObject(hdc, OBJ_PEN); hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hFont = GetCurrentObject(hdc, OBJ_FONT); hPal = GetCurrentObject(hdc, OBJ_PAL); hRgn = CreateRectRgn(0, 0, 0, 0);

1 0

Damjan Jovanovic : mmsystem: Use SEGPTR for 16 bit string pointers in MCI_XXX_WINDOW_PARMS16.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 0f9370aecb8971ba7ffad6a1153e20998d896981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9370aecb8971ba7ffad6a11… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 3 07:25:27 2011 +0200 mmsystem: Use SEGPTR for 16 bit string pointers in MCI_XXX_WINDOW_PARMS16. --- include/wine/mmsystem16.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index ea997b3..245c779 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -619,7 +619,7 @@ typedef struct { WORD wReserved1; UINT16 nCmdShow; WORD wReserved2; - LPCSTR lpstrText; + SEGPTR lpstrText; } MCI_OVLY_WINDOW_PARMS16, *LPMCI_OVLY_WINDOW_PARMS16; typedef struct { @@ -805,7 +805,7 @@ typedef struct { UINT16 wReserved1; UINT16 nCmdShow; UINT16 wReserved2; - LPSTR lpstrText; + SEGPTR lpstrText; } MCI_DGV_WINDOW_PARMS16, *LPMCI_DGV_WINDOW_PARMS16; #include <poppack.h>

1 0

Damjan Jovanovic : mmsystem.dll16: Fix mapping of MCI_WINDOW structures between 16 and 32 bit.
by Alexandre Julliard 03 May '11

03 May '11

Module: wine Branch: master Commit: 8eb6b8bcb609a9ee9b3e30aa6ddf230863d11bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eb6b8bcb609a9ee9b3e30aa6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 3 07:26:44 2011 +0200 mmsystem.dll16: Fix mapping of MCI_WINDOW structures between 16 and 32 bit. --- dlls/mmsystem.dll16/mci16.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 2e90bbf..f38df6a 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -193,12 +193,21 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l } return MMSYSTEM_MAP_OKMEM; case MCI_WINDOW: - /* in fact, I would also need the dwFlags... to see - * which members of lParam are effectively used - */ - *lParam = (DWORD)MapSL(*lParam); - FIXME("Current mapping may be wrong\n"); - break; + { + LPMCI_OVLY_WINDOW_PARMSW mowp32w = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MCI_OVLY_WINDOW_PARMSW)); + LPMCI_OVLY_WINDOW_PARMS16 mowp16 = MapSL(*lParam); + if (mowp32w) { + mowp32w->dwCallback = mowp16->dwCallback; + mowp32w->hWnd = HWND_32(mowp16->hWnd); + mowp32w->nCmdShow = mowp16->nCmdShow; + if (dwFlags & (MCI_DGV_WINDOW_TEXT | MCI_OVLY_WINDOW_TEXT)) + mowp32w->lpstrText = MCI_strdupAtoW(MapSL(mowp16->lpstrText)); + } else { + return MMSYSTEM_MAP_NOMEM; + } + *lParam = (DWORD)mowp32w; + } + return MMSYSTEM_MAP_OKMEM; case MCI_BREAK: { LPMCI_BREAK_PARMS mbp32 = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_BREAK_PARMS)); @@ -399,8 +408,12 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR } return MMSYSTEM_MAP_OK; case MCI_WINDOW: - /* FIXME ?? see Map function */ - return MMSYSTEM_MAP_OK; + if (lParam) { + LPMCI_OVLY_WINDOW_PARMSW mowp32w = (LPMCI_OVLY_WINDOW_PARMSW)lParam; + HeapFree(GetProcessHeap(), 0, (LPVOID)mowp32w->lpstrText); + HeapFree(GetProcessHeap(), 0, mowp32w); + } + return MMSYSTEM_MAP_OK; case MCI_BREAK: HeapFree(GetProcessHeap(), 0, (LPVOID)lParam);

1 0