January 2008 - Wine-commits

Dan Kegel : winemenubuilder: Expand short paths, else menu items aren' t created for CSLU Toolkit.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 59b69a7236957a65a7a6af08b11a2237497a7d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b69a7236957a65a7a6af08b… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jan 6 10:09:24 2008 -0800 winemenubuilder: Expand short paths, else menu items aren't created for CSLU Toolkit. --- programs/winemenubuilder/winemenubuilder.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c253a85..4feafbe 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -695,7 +695,7 @@ static char *relative_path( LPCWSTR link, LPCWSTR locn ) */ static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) { - WCHAR filename[MAX_PATH], buffer[MAX_PATH]; + WCHAR filename[MAX_PATH], shortfilename[MAX_PATH], buffer[MAX_PATH]; DWORD len, i, r, filelen; const DWORD locations[] = { CSIDL_STARTUP, CSIDL_DESKTOPDIRECTORY, CSIDL_STARTMENU, @@ -703,7 +703,16 @@ static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) CSIDL_COMMON_STARTMENU }; WINE_TRACE("%s\n", wine_dbgstr_w(linkfile)); - filelen=GetFullPathNameW( linkfile, MAX_PATH, filename, NULL ); + filelen=GetFullPathNameW( linkfile, MAX_PATH, shortfilename, NULL ); + if (filelen==0 || filelen>MAX_PATH) + return FALSE; + + WINE_TRACE("%s\n", wine_dbgstr_w(shortfilename)); + + /* the CSLU Toolkit uses a short path name when creating .lnk files; + * expand or our hardcoded list won't match. + */ + filelen=GetLongPathNameW(shortfilename, filename, MAX_PATH); if (filelen==0 || filelen>MAX_PATH) return FALSE;

1 0

Chris Wulff : shdocvw: Hide and show the frame window instead of the inner one.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: a34bd3b2cda09696f7303441d1b216a277e42f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34bd3b2cda09696f7303441d… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Sun Jan 6 14:06:44 2008 -0500 shdocvw: Hide and show the frame window instead of the inner one. --- dlls/shdocvw/oleobject.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 7ff1b22..f07460f 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -166,7 +166,11 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site) static const WCHAR wszitem[] = {'i','t','e','m',0}; if(This->inplace) + { + if(This->shell_embedding_hwnd) + ShowWindow(This->shell_embedding_hwnd, SW_SHOW); return S_OK; + } hres = activate_inplace(This, active_site); if(FAILED(hres)) @@ -421,8 +425,8 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag return activate_inplace(This, pActiveSite); case OLEIVERB_HIDE: TRACE("OLEIVERB_HIDE\n"); - if(This->doc_host.hwnd) - ShowWindow(This->doc_host.hwnd, SW_HIDE); + if(This->shell_embedding_hwnd) + ShowWindow(This->shell_embedding_hwnd, SW_HIDE); return S_OK; default: FIXME("stub for %d\n", iVerb);

1 0

Roderick Colenbrander : wined3d: Use software palette conversion for non-texturing operations.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: f2e32f7c45840fccc347b7b6a114d490747d3bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e32f7c45840fccc347b7b6a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jan 7 13:43:48 2008 +0100 wined3d: Use software palette conversion for non-texturing operations. --- dlls/wined3d/surface.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ceeb185..2be1f89 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1390,11 +1390,14 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ p8_render_target = TRUE; } - /* Use conversion when the paletted texture extension is not available, or when it is available make sure it is used - * for texturing as it won't work for calls like glDraw-/glReadPixels and further also use conversion in case of color keying. - * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which conflicts with this. + /* Use conversion when the paletted texture extension OR fragment shaders are available. When either + * of the two is available make sure texturing is requested as neither of the two works in + * conjunction with calls like glDraw-/glReadPixels. Further also use conversion in case of color keying. + * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations + * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which + * conflicts with this. */ - if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && p8_render_target)) || colorkey_active || (!use_texturing && GL_SUPPORT(EXT_PALETTED_TEXTURE)) ) { + if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && p8_render_target)) || colorkey_active || !use_texturing ) { *format = GL_RGBA; *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE;

1 0

Alexandre Julliard : regedit: Fixed parsing of hex sequences.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 98c133312f20670afed6bbc54cc9aa43ed6c65fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c133312f20670afed6bbc54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 19:56:15 2008 +0100 regedit: Fixed parsing of hex sequences. --- programs/regedit/regproc.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index fe5323e..705faf6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -92,15 +92,10 @@ static BYTE* convertHexCSVToHex(char *str, DWORD *size) *size=0; while (*s != '\0') { UINT wc; - char dummy; + char *end; - if (s[1] != ',' && s[1] != '\0' && s[2] != ',' && s[2] != '\0') { - fprintf(stderr,"%s: ERROR converting CSV hex stream. Invalid sequence at '%s'\n", - getAppName(), s); - HeapFree(GetProcessHeap(), 0, data); - return NULL; - } - if (sscanf(s, "%x%c", &wc, &dummy) < 1 || dummy != ',') { + wc = strtoul(s,&end,16); + if (end == s || wc > 0xff || (*end && *end != ',')) { fprintf(stderr,"%s: ERROR converting CSV hex stream. Invalid value at '%s'\n", getAppName(), s); HeapFree(GetProcessHeap(), 0, data); @@ -108,10 +103,8 @@ static BYTE* convertHexCSVToHex(char *str, DWORD *size) } *d++ =(BYTE)wc; (*size)++; - - /* Skip one or two digits and any comma */ - while (*s && *s!=',') s++; - if (*s) s++; + if (*end) end++; + s = end; } return data;

1 0

Alexandre Julliard : advapi32/tests: Print the correct size in an error message.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: ef15bbf1cb026d93c13e67350b45ccd3f76b12b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef15bbf1cb026d93c13e67350… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:18:07 2008 +0100 advapi32/tests: Print the correct size in an error message. --- dlls/advapi32/tests/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 23af17c..2ca2424 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -282,7 +282,7 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, } ok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", wine_debugstr_wn(value, cbData / sizeof(WCHAR)), cbData, - wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len / sizeof(WCHAR)); + wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len); HeapFree(GetProcessHeap(), 0, value); }

1 0

Alexandre Julliard : gdi32/tests: Avoid using size_t in traces.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 645a1e30a12aad0ab7da8a18a289bf5a5fad59c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645a1e30a12aad0ab7da8a18a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:18:29 2008 +0100 gdi32/tests: Avoid using size_t in traces. --- dlls/gdi32/tests/dc.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 01cb064..79b6ef7 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -202,16 +202,14 @@ static void test_GdiConvertToDevmodeW(void) dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + sizeof(dmA.dmFields); dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), - "expected %04x, got %04x\n", - FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), dmW->dmSize); + "wrong size %u\n", dmW->dmSize); HeapFree(GetProcessHeap(), 0, dmW); dmA.dmICMMethod = DMICMMETHOD_NONE; dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod) + sizeof(dmA.dmICMMethod); dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmICMMethod) + sizeof(dmW->dmICMMethod), - "expected %04x, got %04x\n", - FIELD_OFFSET(DEVMODEW, dmICMMethod) + sizeof(dmW->dmICMMethod), dmW->dmSize); + "wrong size %u\n", dmW->dmSize); ok(dmW->dmICMMethod == DMICMMETHOD_NONE, "expected DMICMMETHOD_NONE, got %u\n", dmW->dmICMMethod); HeapFree(GetProcessHeap(), 0, dmW); @@ -219,8 +217,7 @@ static void test_GdiConvertToDevmodeW(void) dmA.dmSize = 1024; dmW = pGdiConvertToDevmodeW(&dmA); ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), - "expected %04x, got %04x\n", - FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), dmW->dmSize); + "wrong size %u\n", dmW->dmSize); HeapFree(GetProcessHeap(), 0, dmW); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : kernel32/tests: Avoid using size_t in traces.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: f53bb857acd6d0d23234eec420b2c56c4891d33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53bb857acd6d0d23234eec42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:18:35 2008 +0100 kernel32/tests: Avoid using size_t in traces. --- dlls/kernel32/tests/actctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 21faa68..c36396c 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -555,8 +555,8 @@ static void test_file_info(HANDLE handle, ULONG assid, ULONG fileid, LPCWSTR fil ok(info->ulFlags == 2, "info->ulFlags=%x, expected 2\n", info->ulFlags); ok(info->ulFilenameLength == lstrlenW(filename)*sizeof(WCHAR), - "info->ulFilenameLength=%u, expected %u\n", - info->ulFilenameLength, lstrlenW(filename)*sizeof(WCHAR)); + "info->ulFilenameLength=%u, expected %u*sizeof(WCHAR)\n", + info->ulFilenameLength, lstrlenW(filename)); ok(info->ulPathLength == 0, "info->ulPathLength=%u\n", info->ulPathLength); ok(info->lpFileName != NULL, "info->lpFileName == NULL\n"); if(info->lpFileName)

1 0

Alexandre Julliard : configure: Added a check for the soname of libodbc.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 84f8ab6b83f9f53a986c6a01f246444ded88e425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f8ab6b83f9f53a986c6a01f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:16:29 2008 +0100 configure: Added a check for the soname of libodbc. --- configure | 82 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 3 ++ dlls/odbc32/proxyodbc.c | 28 ++++++---------- dlls/odbc32/proxyodbc.h | 1 - include/config.h.in | 3 ++ 5 files changed, 98 insertions(+), 19 deletions(-) diff --git a/configure b/configure index e033e05..9dfdc0a 100755 --- a/configure +++ b/configure @@ -15672,6 +15672,88 @@ esac fi +{ echo "$as_me:$LINENO: checking for -lodbc" >&5 +echo $ECHO_N "checking for -lodbc... $ECHO_C" >&6; } +if test "${ac_cv_lib_soname_odbc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lodbc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char SQLConnect (); +int +main () +{ +return SQLConnect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + case "$LIBEXT" in + dll) ;; + dylib) ac_cv_lib_soname_odbc=`otool -L conftest$ac_exeext | grep "libodbc\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libodbc\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_odbc=`$ac_cv_path_LDD conftest$ac_exeext | grep "libodbc\\.$LIBEXT" | sed -e "s/^.*$libodbc\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_odbc" = "x"; then + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + cat >>confdefs.h <<_ACEOF +#define SONAME_LIBODBC "libodbc.$LIBEXT" +_ACEOF + +else + { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_odbc" >&5 +echo "${ECHO_T}$ac_cv_lib_soname_odbc" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBODBC "$ac_cv_lib_soname_odbc" +_ACEOF + + +fi + + if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index c9036e5..6aed60b 100644 --- a/configure.ac +++ b/configure.ac @@ -1167,6 +1167,9 @@ fi WINE_NOTICE_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng development files not found, PNG won't be supported.]) +dnl **** Check for libodbc **** +WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) + dnl **** Check for any sound system **** if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index eeae263..27941fe 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -518,31 +518,23 @@ static BOOL ODBC_LoadDriverManager(void) TRACE("\n"); gProxyHandle.bFunctionReady = FALSE; - gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; - if (s!= NULL && strlen (s) >= sizeof(gProxyHandle.dmLibName)) - { - ERR("Driver name too long (%s)\n",s); - return FALSE; - } - if (s == NULL || strlen(s) == 0) - s = "libodbc.so"; - strcpy(gProxyHandle.dmLibName, s); +#ifdef SONAME_LIBODBC + if (!s || !s[0]) s = SONAME_LIBODBC; +#endif + if (!s || !s[0]) goto failed; - gProxyHandle.dmHandle = wine_dlopen(gProxyHandle.dmLibName, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); + gProxyHandle.dmHandle = wine_dlopen(s, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); - if (gProxyHandle.dmHandle == NULL) /* fail to load unixODBC driver manager */ - { - WARN("failed to open library %s: %s\n", gProxyHandle.dmLibName, error); - gProxyHandle.dmLibName[0] = '\0'; - gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; - return FALSE; - } - else + if (gProxyHandle.dmHandle != NULL) { gProxyHandle.nErrorType = ERROR_FREE; return TRUE; } +failed: + WARN("failed to open library %s: %s\n", debugstr_a(s), error); + gProxyHandle.nErrorType = ERROR_LIBRARY_NOT_FOUND; + return FALSE; } diff --git a/dlls/odbc32/proxyodbc.h b/dlls/odbc32/proxyodbc.h index d0f6efe..bcd73da 100644 --- a/dlls/odbc32/proxyodbc.h +++ b/dlls/odbc32/proxyodbc.h @@ -45,7 +45,6 @@ typedef struct proxyhandle int nErrorType; DM_FUNC functions[NUM_SQLFUNC]; /* entry point for driver manager functions */ char driverLibName[200]; /* ODBC driver SO name */ - char dmLibName[200]; /* driver manager library name */ char ServerName[200]; /* keep server name */ char UserName[50]; /* keep username */ } PROXYHANDLE; diff --git a/include/config.h.in b/include/config.h.in index 75e5d64..14a2648 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1023,6 +1023,9 @@ /* Define to the soname of the libncurses library. */ #undef SONAME_LIBNCURSES +/* Define to the soname of the libodbc library. */ +#undef SONAME_LIBODBC + /* Define to the soname of the libpng library. */ #undef SONAME_LIBPNG

1 0

Alexandre Julliard : wined3d: Use unsigned int instead of size_t for element counts.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 980ee365a06682c9f310921f0c92a58b4224154d URL: http://source.winehq.org/git/wine.git/?a=commit;h=980ee365a06682c9f310921f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:17:04 2008 +0100 wined3d: Use unsigned int instead of size_t for element counts. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/vertexdeclaration.c | 8 ++++---- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 4 ++-- include/wine/wined3d_interface.h | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 229762b..2998351 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -634,7 +634,7 @@ typedef struct IDirect3DPixelShader8Impl { * to see how not defined it here */ void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader); -size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); +UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); /* Callbacks */ extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 66b2a62..01abc28 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1472,7 +1472,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevi IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexDeclaration8Impl *object; WINED3DVERTEXELEMENT *wined3d_elements; - size_t wined3d_element_count; + UINT wined3d_element_count; HRESULT hr = D3D_OK; TRACE("(%p) : declaration %p\n", This, declaration); diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 3a53c11..57d0337 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -272,7 +272,7 @@ static const wined3d_usage_t wined3d_usage_lookup[] = { }; /* TODO: find out where rhw (or positionT) is for declaration8 */ -size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) +UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) { const DWORD *token = d3d8_elements; WINED3DVERTEXELEMENT *element; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 160cb67..ff3b921 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -482,7 +482,7 @@ typedef struct IDirect3DVertexDeclaration9Impl { LONG ref; D3DVERTEXELEMENT9 *elements; - size_t element_count; + UINT element_count; /* IDirect3DVertexDeclaration9 fields */ IWineD3DVertexDeclaration *wineD3DVertexDeclaration; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 0c48aff..d26d09d 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -289,10 +289,10 @@ static const IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl = IDirect3DVertexDeclaration9Impl_GetDeclaration }; -static size_t convert_to_wined3d_declaration(const D3DVERTEXELEMENT9* d3d9_elements, WINED3DVERTEXELEMENT **wined3d_elements) { +static UINT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9* d3d9_elements, WINED3DVERTEXELEMENT **wined3d_elements) { const D3DVERTEXELEMENT9* element; - size_t element_count = 1; - size_t i; + UINT element_count = 1; + UINT i; TRACE("d3d9_elements %p, wined3d_elements %p\n", d3d9_elements, wined3d_elements); @@ -323,7 +323,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DVertexDeclaration9Impl *object = NULL; WINED3DVERTEXELEMENT* wined3d_elements; - size_t element_count; + UINT element_count; HRESULT hr = D3D_OK; TRACE("(%p) : Relay\n", iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e9970a3..b30333d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1700,7 +1700,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, U * Vertex Declaration *****/ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration** ppVertexDeclaration, - IUnknown *parent, const WINED3DVERTEXELEMENT *elements, size_t element_count) { + IUnknown *parent, const WINED3DVERTEXELEMENT *elements, UINT element_count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DVertexDeclarationImpl *object = NULL; HRESULT hr = WINED3D_OK; @@ -1719,8 +1719,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* return hr; } -static size_t ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL info, which has the type table */ - DWORD fvf, WINED3DVERTEXELEMENT** ppVertexElements) { +static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL info, which has the type table */ + DWORD fvf, WINED3DVERTEXELEMENT** ppVertexElements) { unsigned int idx, idx2; unsigned int offset; @@ -1849,7 +1849,7 @@ static size_t ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL in static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3DDevice* iface, IWineD3DVertexDeclaration** ppVertexDeclaration, IUnknown *Parent, DWORD Fvf) { WINED3DVERTEXELEMENT* elements = NULL; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - size_t size; + unsigned int size; DWORD hr; size = ConvertFvfToDeclaration(This, Fvf, &elements); diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 1984d6b..0802b1f 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -103,7 +103,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDevice(IWineD3DVertexDecl } static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration(IWineD3DVertexDeclaration *iface, - WINED3DVERTEXELEMENT *elements, size_t *element_count) { + WINED3DVERTEXELEMENT *elements, UINT *element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; @@ -119,7 +119,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration(IWineD3DVerte } static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVertexDeclaration *iface, - const WINED3DVERTEXELEMENT *elements, size_t element_count) { + const WINED3DVERTEXELEMENT *elements, UINT element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; int i, j; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 6335eb9..ce23907 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -363,7 +363,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(CreateCubeTexture)(THIS_ UINT EdgeLength, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DCubeTexture** ppCubeTexture, HANDLE* pSharedHandle, IUnknown *parent, D3DCB_CREATESURFACEFN pFn) PURE; STDMETHOD(CreateQuery)(THIS_ WINED3DQUERYTYPE Type, struct IWineD3DQuery **ppQuery, IUnknown *pParent); STDMETHOD(CreateAdditionalSwapChain)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters, struct IWineD3DSwapChain **pSwapChain, IUnknown *pParent, D3DCB_CREATERENDERTARGETFN pFn, D3DCB_CREATEDEPTHSTENCILSURFACEFN pFn2); - STDMETHOD(CreateVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, const WINED3DVERTEXELEMENT *elements, size_t element_count) PURE; + STDMETHOD(CreateVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, const WINED3DVERTEXELEMENT *elements, UINT element_count) PURE; STDMETHOD(CreateVertexDeclarationFromFVF)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, DWORD Fvf) PURE; STDMETHOD(CreateVertexShader)(THIS_ struct IWineD3DVertexDeclaration *vertex_declaration, CONST DWORD* pFunction, struct IWineD3DVertexShader** ppShader, IUnknown *pParent) PURE; STDMETHOD(CreatePixelShader)(THIS_ CONST DWORD* pFunction, struct IWineD3DPixelShader** ppShader, IUnknown *pParent) PURE; @@ -1278,8 +1278,8 @@ DECLARE_INTERFACE_(IWineD3DVertexDeclaration,IWineD3DBase) STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; /*** IWineD3DVertexDeclaration methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice **ppDevice) PURE; - STDMETHOD(GetDeclaration)(THIS_ WINED3DVERTEXELEMENT *elements, size_t *elements_count) PURE; - STDMETHOD(SetDeclaration)(THIS_ const WINED3DVERTEXELEMENT *elements, size_t element_count) PURE; + STDMETHOD(GetDeclaration)(THIS_ WINED3DVERTEXELEMENT *elements, UINT *elements_count) PURE; + STDMETHOD(SetDeclaration)(THIS_ const WINED3DVERTEXELEMENT *elements, UINT element_count) PURE; }; #undef INTERFACE

1 0

Alexandre Julliard : wined3d: Use unsigned int instead of size_t for the glsl mask size.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 9636c7fa0e73a023eea432431055808f0a577808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9636c7fa0e73a023eea432431… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:17:27 2008 +0100 wined3d: Use unsigned int instead of size_t for the glsl mask size. --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 42454c3..07415d2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -981,8 +981,8 @@ static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { return mask; } -static size_t shader_glsl_get_write_mask_size(DWORD write_mask) { - size_t size = 0; +static unsigned int shader_glsl_get_write_mask_size(DWORD write_mask) { + unsigned int size = 0; if (write_mask & WINED3DSP_WRITEMASK_0) ++size; if (write_mask & WINED3DSP_WRITEMASK_1) ++size; @@ -1344,7 +1344,7 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* arg) { !shader_is_pshader_version(shader->baseShader.hex_version) && shader_get_regtype(arg->dst) == WINED3DSPR_ADDR)) { /* This is a simple floor() */ - size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); if (mask_size > 1) { shader_addline(buffer, "ivec%d(floor(%s)));\n", mask_size, src0_param.param_str); } else { @@ -1352,7 +1352,7 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* arg) { } } else if(arg->opcode->opcode == WINED3DSIO_MOVA) { /* We need to *round* to the nearest int here. */ - size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); if (mask_size > 1) { shader_addline(buffer, "ivec%d(floor(abs(%s) + vec%d(0.5)) * sign(%s)));\n", mask_size, src0_param.param_str, mask_size, src0_param.param_str); } else { @@ -1370,7 +1370,7 @@ void shader_glsl_dot(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; DWORD dst_write_mask, src_write_mask; - size_t dst_size = 0; + unsigned int dst_size = 0; dst_write_mask = shader_glsl_append_dst(buffer, arg); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); @@ -1415,7 +1415,7 @@ void shader_glsl_pow(SHADER_OPCODE_ARG *arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; DWORD dst_write_mask; - size_t dst_size; + unsigned int dst_size; dst_write_mask = shader_glsl_append_dst(buffer, arg); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); @@ -1437,7 +1437,7 @@ void shader_glsl_log(SHADER_OPCODE_ARG *arg) { SHADER_BUFFER *buffer = arg->buffer; glsl_src_param_t src0_param; DWORD dst_write_mask; - size_t dst_size; + unsigned int dst_size; dst_write_mask = shader_glsl_append_dst(buffer, arg); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); @@ -1524,7 +1524,7 @@ void shader_glsl_expp(SHADER_OPCODE_ARG* arg) { shader_addline(arg->buffer, "tmp0%s);\n", dst_mask); } else { DWORD write_mask; - size_t mask_size; + unsigned int mask_size; write_mask = shader_glsl_append_dst(arg->buffer, arg); mask_size = shader_glsl_get_write_mask_size(write_mask); @@ -1541,7 +1541,7 @@ void shader_glsl_expp(SHADER_OPCODE_ARG* arg) { void shader_glsl_rcp(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src_param; DWORD write_mask; - size_t mask_size; + unsigned int mask_size; write_mask = shader_glsl_append_dst(arg->buffer, arg); mask_size = shader_glsl_get_write_mask_size(write_mask); @@ -1558,7 +1558,7 @@ void shader_glsl_rsq(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; glsl_src_param_t src_param; DWORD write_mask; - size_t mask_size; + unsigned int mask_size; write_mask = shader_glsl_append_dst(buffer, arg); mask_size = shader_glsl_get_write_mask_size(write_mask); @@ -1577,7 +1577,7 @@ void shader_glsl_compare(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; DWORD write_mask; - size_t mask_size; + unsigned int mask_size; write_mask = shader_glsl_append_dst(arg->buffer, arg); mask_size = shader_glsl_get_write_mask_size(write_mask); @@ -2221,7 +2221,7 @@ void pshader_glsl_texcoord(SHADER_OPCODE_ARG* arg) { if (src_mod == WINED3DSPSM_DZ) { glsl_src_param_t div_param; - size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_2, &div_param); if (mask_size > 1) { @@ -2231,7 +2231,7 @@ void pshader_glsl_texcoord(SHADER_OPCODE_ARG* arg) { } } else if (src_mod == WINED3DSPSM_DW) { glsl_src_param_t div_param; - size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, &div_param); if (mask_size > 1) { @@ -2295,7 +2295,7 @@ void pshader_glsl_texdp3(SHADER_OPCODE_ARG* arg) { DWORD dstreg = arg->dst & WINED3DSP_REGNUM_MASK; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD dst_mask; - size_t mask_size; + unsigned int mask_size; dst_mask = shader_glsl_append_dst(arg->buffer, arg); mask_size = shader_glsl_get_write_mask_size(dst_mask); @@ -2644,7 +2644,7 @@ void pshader_glsl_dp2add(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src1_param; glsl_src_param_t src2_param; DWORD write_mask; - size_t mask_size; + unsigned int mask_size; write_mask = shader_glsl_append_dst(arg->buffer, arg); mask_size = shader_glsl_get_write_mask_size(write_mask);

1 0