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

Marcus Meissner : wininet: Mark internal symbols as hidden visibility.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 2ac87cb695bba7a94c66671a05da34a08386bfa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac87cb695bba7a94c66671a0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 21 11:09:16 2011 +0200 wininet: Mark internal symbols as hidden visibility. --- dlls/wininet/internet.h | 68 +++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4564aca..c760e83 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -450,64 +450,64 @@ typedef struct WORKREQ } WORKREQUEST, *LPWORKREQUEST; -void *alloc_object(object_header_t*,const object_vtbl_t*,size_t); -object_header_t *get_handle_object( HINTERNET hinternet ); -object_header_t *WININET_AddRef( object_header_t *info ); -BOOL WININET_Release( object_header_t *info ); +void *alloc_object(object_header_t*,const object_vtbl_t*,size_t) DECLSPEC_HIDDEN; +object_header_t *get_handle_object( HINTERNET hinternet ) DECLSPEC_HIDDEN; +object_header_t *WININET_AddRef( object_header_t *info ) DECLSPEC_HIDDEN; +BOOL WININET_Release( object_header_t *info ) DECLSPEC_HIDDEN; -DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL ); +DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL ) DECLSPEC_HIDDEN; -time_t ConvertTimeString(LPCWSTR asctime); +time_t ConvertTimeString(LPCWSTR asctime) DECLSPEC_HIDDEN; HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, - DWORD dwInternalFlags); + DWORD dwInternalFlags) DECLSPEC_HIDDEN; DWORD HTTP_Connect(appinfo_t*,LPCWSTR, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, - DWORD dwInternalFlags, HINTERNET*); + DWORD dwInternalFlags, HINTERNET*) DECLSPEC_HIDDEN; BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr *psa, socklen_t *sa_len); + struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; -void INTERNET_SetLastError(DWORD dwError); -DWORD INTERNET_GetLastError(void); -DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest); -LPSTR INTERNET_GetResponseBuffer(void); -LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen); +void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; +DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN; +DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) DECLSPEC_HIDDEN; +LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN; +LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) DECLSPEC_HIDDEN; VOID SendAsyncCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength); + DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength); -BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen); + DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; +BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; -BOOL NETCON_connected(WININET_NETCONNECTION *connection); -DWORD NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); -void NETCON_unload(void); +BOOL NETCON_connected(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; +DWORD NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL) DECLSPEC_HIDDEN; +void NETCON_unload(void) DECLSPEC_HIDDEN; DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, - int type, int protocol); -DWORD NETCON_close(WININET_NETCONNECTION *connection); + int type, int protocol) DECLSPEC_HIDDEN; +DWORD NETCON_close(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, - unsigned int addrlen); -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname); + unsigned int addrlen) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) DECLSPEC_HIDDEN; DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, - int *sent /* out */); + int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, - int *recvd /* out */); -BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); -LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); -int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection); -DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); -int sock_get_error(int); - -extern void URLCacheContainers_CreateDefaults(void); -extern void URLCacheContainers_DeleteAll(void); + int *recvd /* out */) DECLSPEC_HIDDEN; +BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) DECLSPEC_HIDDEN; +LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; +int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; +DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) DECLSPEC_HIDDEN; +int sock_get_error(int) DECLSPEC_HIDDEN; + +extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; +extern void URLCacheContainers_DeleteAll(void) DECLSPEC_HIDDEN; #define MAX_REPLY_LEN 0x5B4

1 0

Marcus Meissner : gdiplus: Mark internal symbols as having hidden visibility.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 3ed13392197c1c103be4763c13c6952622271cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed13392197c1c103be4763c1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 21 11:11:01 2011 +0200 gdiplus: Mark internal symbols as having hidden visibility. --- dlls/gdiplus/gdiplus_private.h | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1629ae6..2953b45 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -41,33 +41,33 @@ #define VERSION_MAGIC 0xdbc01001 #define TENSION_CONST (0.3) -COLORREF ARGB2COLORREF(ARGB color); -HBITMAP ARGB2BMP(ARGB color); +COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; +HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN; extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, - REAL startAngle, REAL sweepAngle); -extern REAL gdiplus_atan2(REAL dy, REAL dx); -extern GpStatus hresult_to_status(HRESULT res); -extern REAL convert_unit(REAL logpixels, GpUnit unit); + REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; +extern REAL gdiplus_atan2(REAL dy, REAL dx) DECLSPEC_HIDDEN; +extern GpStatus hresult_to_status(HRESULT res) DECLSPEC_HIDDEN; +extern REAL convert_unit(REAL logpixels, GpUnit unit) DECLSPEC_HIDDEN; -extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics); +extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, - REAL *y1, REAL *x2, REAL *y2); + REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, - REAL tension, REAL *x, REAL *y); + REAL tension, REAL *x, REAL *y) DECLSPEC_HIDDEN; -extern void free_installed_fonts(void); +extern void free_installed_fonts(void) DECLSPEC_HIDDEN; -extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont); +extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) DECLSPEC_HIDDEN; -extern BOOL lengthen_path(GpPath *path, INT len); +extern BOOL lengthen_path(GpPath *path, INT len) DECLSPEC_HIDDEN; -extern GpStatus trace_path(GpGraphics *graphics, GpPath *path); +extern GpStatus trace_path(GpGraphics *graphics, GpPath *path) DECLSPEC_HIDDEN; typedef struct region_element region_element; -extern void delete_element(region_element *element); +extern void delete_element(region_element *element) DECLSPEC_HIDDEN; -extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result); +extern GpStatus get_hatch_data(HatchStyle hatchstyle, const char **result) DECLSPEC_HIDDEN; static inline INT roundr(REAL x) { @@ -107,16 +107,16 @@ static inline ARGB color_over(ARGB bg, ARGB fg) return (a<<24)|(r<<16)|(g<<8)|b; } -extern const char *debugstr_rectf(CONST RectF* rc); +extern const char *debugstr_rectf(CONST RectF* rc) DECLSPEC_HIDDEN; -extern const char *debugstr_pointf(CONST PointF* pt); +extern const char *debugstr_pointf(CONST PointF* pt) DECLSPEC_HIDDEN; extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, - BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride); + BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN; extern GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette); + INT src_stride, const BYTE *src_bits, PixelFormat src_format, ARGB *src_palette) DECLSPEC_HIDDEN; struct GpPen{ UINT style; @@ -409,6 +409,6 @@ typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - gdip_format_string_callback callback, void *user_data); + gdip_format_string_callback callback, void *user_data) DECLSPEC_HIDDEN; #endif

1 0

Marcus Meissner : comdlg32: Mark internal symbols as having hidden visibility.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 32e05d7b61d46c56856aaccc9e9831cbdb3c9515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e05d7b61d46c56856aaccc9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 21 11:16:53 2011 +0200 comdlg32: Mark internal symbols as having hidden visibility. --- dlls/comdlg32/cdlg.h | 16 ++++++++-------- dlls/comdlg32/filedlg31.h | 18 +++++++++--------- dlls/comdlg32/filedlgbrowser.h | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index e1b341c..e85ba9f 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -26,10 +26,10 @@ /* Common dialogs implementation globals */ #define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ -extern HINSTANCE COMDLG32_hInstance; +extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; -void COMDLG32_SetCommDlgExtendedError(DWORD err); -LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1); +void COMDLG32_SetCommDlgExtendedError(DWORD err) DECLSPEC_HIDDEN; +LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; /* handle<-handle16 conversion */ #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) @@ -170,14 +170,14 @@ typedef struct { #include "shellapi.h" /* Constructors */ -HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv); -HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv); +HRESULT FileOpenDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT FileSaveDialog_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; /* Shared helper functions */ -void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile); +void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, LPWSTR lpstrFile, LPWSTR lpstrPathAndFile) DECLSPEC_HIDDEN; int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, - HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction); -int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed); + HWND hwnd, DWORD flags, BOOL isSaveDlg, int defAction) DECLSPEC_HIDDEN; +int COMDLG32_SplitFileNames(LPWSTR lpstrEdit, UINT nStrLen, LPWSTR *lpstrFileList, UINT *sizeUsed) DECLSPEC_HIDDEN; /* ITEMIDLIST */ diff --git a/dlls/comdlg32/filedlg31.h b/dlls/comdlg32/filedlg31.h index bb22005..4c5ef9e 100644 --- a/dlls/comdlg32/filedlg31.h +++ b/dlls/comdlg32/filedlg31.h @@ -35,18 +35,18 @@ typedef struct tagFD31_DATA LPOPENFILENAMEA ofnA; /* original structure if 32bits ansi dialog */ } FD31_DATA, *PFD31_DATA; -extern BOOL FD32_GetTemplate(PFD31_DATA lfs); +extern BOOL FD32_GetTemplate(PFD31_DATA lfs) DECLSPEC_HIDDEN; -extern BOOL FD31_Init(void); -extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode); -extern void FD31_DestroyPrivate(PFD31_DATA lfs); +extern BOOL FD31_Init(void) DECLSPEC_HIDDEN; +extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, BOOL IsUnicode) DECLSPEC_HIDDEN; +extern void FD31_DestroyPrivate(PFD31_DATA lfs) DECLSPEC_HIDDEN; extern BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, - LPARAM lParam); -extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam); + LPARAM lParam) DECLSPEC_HIDDEN; +extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, - int savedlg, const DRAWITEMSTRUCT *lpdis); + int savedlg, const DRAWITEMSTRUCT *lpdis) DECLSPEC_HIDDEN; extern LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification, - UINT control, const FD31_DATA *lfs); -extern int FD31_GetFldrHeight(void); + UINT control, const FD31_DATA *lfs) DECLSPEC_HIDDEN; +extern int FD31_GetFldrHeight(void) DECLSPEC_HIDDEN; #endif /* _WINE_DLL_FILEDLG31_H */ diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index ca332ec..e45863a 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -147,23 +147,23 @@ typedef struct * Prototypes for the methods of the IShellBrowserImpl class */ /* Constructor */ -IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner); +IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) DECLSPEC_HIDDEN; -LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex); +LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex) DECLSPEC_HIDDEN; /* Functions used by the EDIT box */ -void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd); +void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) DECLSPEC_HIDDEN; /************************************************************************** * External Prototypes */ -extern const char FileOpenDlgInfosStr[]; +extern const char FileOpenDlgInfosStr[] DECLSPEC_HIDDEN; -extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); -extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); +extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs) DECLSPEC_HIDDEN; +extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl) DECLSPEC_HIDDEN; -extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl); -extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); +extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl) DECLSPEC_HIDDEN; +extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) DECLSPEC_HIDDEN; #endif /*SHBROWSER_H*/

1 0

Nicolas Le Cam : winspool.drv: Fix uninitialized variable warning.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 64111e25189ec71975307c79201f51ba78a655ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=64111e25189ec71975307c792… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 26 03:22:32 2011 +0200 winspool.drv: Fix uninitialized variable warning. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9d36657..6d81f52 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7193,7 +7193,7 @@ static BOOL get_job_info_2(job_t *job, JOB_INFO_2W *ji2, LPBYTE buf, DWORD cbBuf DWORD shift; BOOL space = (cbBuf > 0); LPBYTE ptr = buf; - LPDEVMODEA dmA; + LPDEVMODEA dmA = NULL; LPDEVMODEW devmode; *pcbNeeded = 0;

1 0

Nicolas Le Cam : mshtml: Fix uninitialized variable warning.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: d4e7dacfc1cbdcb0c7e458f31f7beafb78c455a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e7dacfc1cbdcb0c7e458f31… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 26 03:20:20 2011 +0200 mshtml: Fix uninitialized variable warning. --- dlls/mshtml/navigate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 78e747a..e93f1e9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1424,9 +1424,10 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url) FIXME("AsyncOnChannelRedirect failed: %08x\n", hres); else if(This->nschannel != callback->nschannel) FIXME("nschannel not updated\n"); + + nsIAsyncVerifyRedirectCallback_Release(&callback->nsIAsyncVerifyRedirectCallback_iface); } - nsIAsyncVerifyRedirectCallback_Release(&callback->nsIAsyncVerifyRedirectCallback_iface); nsIChannelEventSink_Release(sink); return hres; }

1 0

Henri Verbeet : wined3d: Either set SM3 for both vertex and fragment shaders or for neither.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 9d0e17e9ea360a827e7ab1e0ef984f6d9901f0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0e17e9ea360a827e7ab1e0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 22:54:14 2011 +0200 wined3d: Either set SM3 for both vertex and fragment shaders or for neither. --- dlls/wined3d/glsl_shader.c | 56 +++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fb0596..ba5a159 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4924,39 +4924,29 @@ static BOOL shader_glsl_dirty_const(void) static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { - /* Nvidia Geforce6/7 or Ati R4xx/R5xx cards with GLSL support, support VS 3.0 but older Nvidia/Ati - * models with GLSL support only support 2.0. In case of nvidia we can detect VS 2.0 support based - * on the version of NV_vertex_program. - * For Ati cards there's no way using glsl (it abstracts the lowlevel info away) and also not - * using ARB_vertex_program. It is safe to assume that when a card supports pixel shader 2.0 it - * supports vertex shader 2.0 too and the way around. We can detect ps2.0 using the maximum number - * of native instructions, so use that here. For more info see the pixel shader versioning code below. - */ - if ((gl_info->supported[NV_VERTEX_PROGRAM2] && !gl_info->supported[NV_VERTEX_PROGRAM3]) - || gl_info->limits.arb_ps_instructions <= 512) - pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); - else + /* NVIDIA GeForce 6 / 7 or ATI R4xx / R5xx cards with GLSL support + * support SM3, but older NVIDIA / ATI models with GLSL support only + * support SM2. In case of NVIDIA we can detect SM3 support based on the + * version of NV_vertex_program / NV_fragment_program. For other cards we + * try to detect SM3 based on the maximum number of native fragment + * program instructions. PS2.0 requires at least 96 instructions, 2.0a/b + * goes up to 512. Assume that if the number of instructions is 512 or + * less we have to do with SM2 hardware. NOTE: SM3 requires 512 or more + * instructions but ATI and NVIDIA offer more than that (1024 vs 4096) on + * their most basic SM3 hardware. */ + if ((gl_info->supported[NV_VERTEX_PROGRAM3] && gl_info->supported[NV_FRAGMENT_PROGRAM2]) + || gl_info->limits.arb_ps_instructions > 512) + { pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); - TRACE_(d3d_caps)("Hardware vertex shader version %d.%d enabled (GLSL)\n", (pCaps->VertexShaderVersion >> 8) & 0xff, pCaps->VertexShaderVersion & 0xff); - pCaps->MaxVertexShaderConst = gl_info->limits.glsl_vs_float_constants; - - /* Older DX9-class videocards (GeforceFX / Radeon >9500/X*00) only support pixel shader 2.0/2.0a/2.0b. - * In OpenGL the extensions related to GLSL abstract lowlevel GL info away which is needed - * to distinguish between 2.0 and 3.0 (and 2.0a/2.0b). In case of Nvidia we use their fragment - * program extensions. On other hardware including ATI GL_ARB_fragment_program offers the info - * in max native instructions. Intel and others also offer the info in this extension but they - * don't support GLSL (at least on Windows). - * - * PS2.0 requires at least 96 instructions, 2.0a/2.0b go up to 512. Assume that if the number - * of instructions is 512 or less we have to do with ps2.0 hardware. - * NOTE: ps3.0 hardware requires 512 or more instructions but ati and nvidia offer 'enough' (1024 vs 4096) on their most basic ps3.0 hardware. - */ - if ((gl_info->supported[NV_FRAGMENT_PROGRAM] && !gl_info->supported[NV_FRAGMENT_PROGRAM2]) - || gl_info->limits.arb_ps_instructions <= 512) - pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); - else pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); + } + else + { + pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); + pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); + } + pCaps->MaxVertexShaderConst = gl_info->limits.glsl_vs_float_constants; pCaps->MaxPixelShaderConst = gl_info->limits.glsl_ps_float_constants; /* FIXME: The following line is card dependent. -8.0 to 8.0 is the @@ -4972,9 +4962,13 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * offer a way to query this. */ pCaps->PixelShader1xMaxValue = 8.0; - TRACE_(d3d_caps)("Hardware pixel shader version %d.%d enabled (GLSL)\n", (pCaps->PixelShaderVersion >> 8) & 0xff, pCaps->PixelShaderVersion & 0xff); pCaps->VSClipping = TRUE; + + TRACE_(d3d_caps)("Hardware vertex shader version %u.%u enabled (GLSL).\n", + (pCaps->VertexShaderVersion >> 8) & 0xff, pCaps->VertexShaderVersion & 0xff); + TRACE_(d3d_caps)("Hardware pixel shader version %u.%u enabled (GLSL).\n", + (pCaps->PixelShaderVersion >> 8) & 0xff, pCaps->PixelShaderVersion & 0xff); } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup)

1 0

Nicolas Le Cam : msctf/tests: Fix uninitialized variable warning.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: f54042df66b854429856aaca0fabcb69743b3dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54042df66b854429856aaca0… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 26 03:14:34 2011 +0200 msctf/tests: Fix uninitialized variable warning. --- dlls/msctf/tests/inputprocessor.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 210c9a1..47065d1 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1460,10 +1460,12 @@ static void test_startSession(void) ok(g_dm == dmtest,"Expected DocumentMgr not focused\n"); ITfDocumentMgr_Release(dmtest); - TextStoreACP_Constructor((IUnknown**)&ts); - - hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie); - ok(SUCCEEDED(hr),"CreateContext Failed\n"); + hr = TextStoreACP_Constructor((IUnknown**)&ts); + if (SUCCEEDED(hr)) + { + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie); + ok(SUCCEEDED(hr),"CreateContext Failed\n"); + } hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt2, &editCookie); ok(SUCCEEDED(hr),"CreateContext Failed\n");

1 0

Henri Verbeet : wined3d: Enable SM3 if ARB_shader_texture_lod is supported.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 3f0120241bcfdcd28cc8c918ae38e4420fa20ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0120241bcfdcd28cc8c918a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 22:54:15 2011 +0200 wined3d: Enable SM3 if ARB_shader_texture_lod is supported. --- dlls/wined3d/glsl_shader.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba5a159..499ed15 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4933,9 +4933,16 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * goes up to 512. Assume that if the number of instructions is 512 or * less we have to do with SM2 hardware. NOTE: SM3 requires 512 or more * instructions but ATI and NVIDIA offer more than that (1024 vs 4096) on - * their most basic SM3 hardware. */ + * their most basic SM3 hardware. + * + * ARB_shader_texture_lod is a requirement for SM3 (texldd). Ideally we'd + * make this a hard requirement, but the extension is still somewhat new, + * and relatively few SM3 shaders actually depend on it. For the moment + * just use it to enable SM3 (20110423). */ if ((gl_info->supported[NV_VERTEX_PROGRAM3] && gl_info->supported[NV_FRAGMENT_PROGRAM2]) - || gl_info->limits.arb_ps_instructions > 512) + || gl_info->limits.arb_ps_instructions > 512 + || gl_info->supported[ARB_SHADER_TEXTURE_LOD] + || gl_info->supported[EXT_GPU_SHADER4]) { pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Henri Verbeet : wined3d: Merge surface_base.c into surface.c.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: f63a84be61f4ef2958c6e0417f982627403b46e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63a84be61f4ef2958c6e0417… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 22:54:13 2011 +0200 wined3d: Merge surface_base.c into surface.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/surface.c | 1959 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface_base.c | 1953 --------------------------------------- dlls/wined3d/wined3d_private.h | 46 - 4 files changed, 1956 insertions(+), 2003 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63a84be61f4ef2958c6e…

1 0

Henri Verbeet : comctl32: Return if there' s no current selection in TAB_EnsureSelectionVisible().
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 5ce31867355ed197e06145a53c4e5150a6a7386b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce31867355ed197e06145a53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 22:54:11 2011 +0200 comctl32: Return if there's no current selection in TAB_EnsureSelectionVisible(). --- dlls/comctl32/tab.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index a9a0548..bd34358 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2440,6 +2440,9 @@ static void TAB_EnsureSelectionVisible( INT iSelected = infoPtr->iSelected; INT iOrigLeftmostVisible = infoPtr->leftmostVisible; + if (iSelected < 0) + return; + /* set the items row to the bottommost row or topmost row depending on * style */ if ((infoPtr->uNumRows > 1) && !(infoPtr->dwStyle & TCS_BUTTONS)) @@ -2504,7 +2507,7 @@ static void TAB_EnsureSelectionVisible( if (infoPtr->leftmostVisible >= iSelected) { - if (iSelected >= 0) infoPtr->leftmostVisible = iSelected; + infoPtr->leftmostVisible = iSelected; } else {

1 0