June 2012 - Wine-commits - list.winehq.org

Frédéric Delanoy : French translation for release 1.5.6
by Jeremy Newman 14 Jun '12

14 Jun '12

Module: website Branch: master Commit: 5f5d533ac6fcfae9f484e0045b1fdeaeb96ba06d URL: http://source.winehq.org/git/website.git/?a=commit;h=5f5d533ac6fcfae9f484e0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 14 14:29:41 2012 +0200 French translation for release 1.5.6 --- news/fr/2012060801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/fr/2012060801.xml b/news/fr/2012060801.xml new file mode 100644 index 0000000..831f435 --- /dev/null +++ b/news/fr/2012060801.xml @@ -0,0 +1,17 @@ +<news> +<date>8 juin 2012</date> +<title>Sortie de Wine 1.5.6</title> +<body> + La version de développement 1.5.6 de Wine est disponible. + <a href="{$root}/announce/1.5.6">Nouveautés</a> de cette version : +<ul> + <li>Installation automatique du module externe Mono.</li> + <li>Applet pour les joysticks dans le panneau de configuration.</li> + <li>Rendu des images matricielles indépendantes du périphérique à présent effectué par le moteur DIB.</li> + <li>Prise en charge du rendu vidéo via DirectX (VMR-9).</li> + <li>Premiers pas en vue d'un compilateur de shaders D3D.</li> + <li>Correctifs pour la compilation sous DragonFly BSD.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Piotr Caban : msvcp90: Added basic_ofstream<char> implementation.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 43d99a1b684e9cd7c68e16f553cdf3a79afbac2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d99a1b684e9cd7c68e16f55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:22:29 2012 +0200 msvcp90: Added basic_ofstream<char> implementation. --- dlls/msvcp90/ios.c | 235 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 68 +++++++------- 2 files changed, 265 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43d99a1b684e9cd7c68e1…

1 0

Piotr Caban : msvcp90: Specify open mode in basic_ifstream<char> functions.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 30a1ed53d7a6680e48dce7db1a9fcfb9efe310bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a1ed53d7a6680e48dce7db1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:23:35 2012 +0200 msvcp90: Specify open mode in basic_ifstream<char> functions. --- dlls/msvcp90/ios.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a2bf8b0..d5949ff 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5037,7 +5037,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha basic_ifstream_char_ctor(this, virt_init); - if(!basic_filebuf_char_open(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5046,6 +5046,8 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PB_WHH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEB_WHH@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name_wchar, 20) basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_wchar(basic_ifstream_char *this, const wchar_t *name, int mode, int prot, MSVCP_bool virt_init) @@ -5054,7 +5056,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_wchar(basic_ifstre basic_ifstream_char_ctor(this, virt_init); - if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5136,7 +5138,7 @@ void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, { TRACE("(%p %s %d %d)\n", this, name, mode, prot); - if(!basic_filebuf_char_open(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5146,20 +5148,22 @@ void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDI(a)Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_old, 12) void __thiscall basic_ifstream_char_open_old(basic_ifstream_char *this, - const char *name, unsigned int mod) + const char *name, unsigned int mode) { - basic_ifstream_char_open(this, name, mod, _SH_DENYNO); + basic_ifstream_char_open(this, name, mode, _SH_DENYNO); } /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBGHH(a)Z */ /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBGHH(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPB_WHH(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEB_WHH(a)Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_wchar, 16) void __thiscall basic_ifstream_char_open_wchar(basic_ifstream_char *this, const wchar_t *name, int mode, int prot) { TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); - if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5167,6 +5171,8 @@ void __thiscall basic_ifstream_char_open_wchar(basic_ifstream_char *this, /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBGI(a)Z */ /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBGI(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPB_WI(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEB_WI(a)Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_wchar_old, 12) void __thiscall basic_ifstream_char_open_wchar_old(basic_ifstream_char *this, const wchar_t *name, unsigned int mode)

1 0

Huw Davies : localspl: Remove a bunch of casts.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: af8228f02a6cc3b05028f29a8f2621f847e85f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8228f02a6cc3b05028f29a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 16:29:26 2012 +0100 localspl: Remove a bunch of casts. --- dlls/localspl/provider.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index a599113..4a6e2d2 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1059,6 +1059,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment { DWORD needed; const printenv_t * env; + WCHAR * const dir = (WCHAR *)pDriverDirectory; TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); @@ -1087,18 +1088,18 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment return FALSE; } - if (pDriverDirectory == NULL) { + if (dir == NULL) { /* ERROR_INVALID_USER_BUFFER is NT, ERROR_INVALID_PARAMETER is win9x */ SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - GetSystemDirectoryW((LPWSTR) pDriverDirectory, cbBuf/sizeof(WCHAR)); + GetSystemDirectoryW( dir, cbBuf / sizeof(WCHAR) ); /* add the Subdirectories */ - lstrcatW((LPWSTR) pDriverDirectory, spooldriversW); - lstrcatW((LPWSTR) pDriverDirectory, env->subdir); + lstrcatW( dir, spooldriversW ); + lstrcatW( dir, env->subdir ); - TRACE("=> %s\n", debugstr_w((LPWSTR) pDriverDirectory)); + TRACE( "=> %s\n", debugstr_w( dir ) ); return TRUE; }

1 0

Henri Verbeet : ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup().
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: c722f2d31ec61fe372e466957605b222ee6f9a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c722f2d31ec61fe372e466957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 13 18:23:35 2012 +0200 ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup(). --- dlls/ddraw/surface.c | 51 ++++++++++-------------------------------- dlls/ddraw/tests/dsurface.c | 2 +- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d1309ee..3f9f78f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -444,37 +444,6 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } -/***************************************************************************** - * ddraw_surface_destroy - * - * A helper function for IDirectDrawSurface7::Release - * - * Frees the surface, regardless of its refcount. - * See IDirectDrawSurface7::Release for more information - * - * Params: - * This: Surface to free - * - *****************************************************************************/ -static void ddraw_surface_destroy(struct ddraw_surface *This) -{ - TRACE("surface %p.\n", This); - - /* Check the iface count and give a warning */ - if(This->iface_count > 1) - { - /* This can happen when a complex surface is destroyed, - * because the 2nd surface was addref()ed when the app - * called GetAttachedSurface - */ - WARN("(%p): Destroying surface with refcounts 7: %d 4: %d 3: %d 2: %d 1: %d\n", - This, This->ref7, This->ref4, This->ref3, This->ref2, This->ref1); - } - - if (This->wined3d_surface) - wined3d_surface_decref(This->wined3d_surface); -} - static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; @@ -498,20 +467,24 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - while (surf) - { - struct ddraw_surface *destroy = surf; - surf = surf->complex_array[0]; /* Iterate through the "tree" */ - ddraw_surface_destroy(destroy); /* Destroy it */ - } + ddraw_surface_cleanup(surf); } if (surface->device1) IUnknown_Release(&surface->device1->IUnknown_inner); ifaceToRelease = surface->ifaceToRelease; - /* Destroy the root surface. */ - ddraw_surface_destroy(surface); + if (surface->iface_count > 1) + { + /* This can happen when a complex surface is destroyed, because the + * 2nd surface was addref()ed when the app called + * GetAttachedSurface(). */ + WARN("Destroying surface %p with refcounts 7: %u 4: %u 3: %u 2: %u 1: %u.\n", + surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); + } + + if (surface->wined3d_surface) + wined3d_surface_decref(surface->wined3d_surface); /* Reduce the ddraw refcount */ if (ifaceToRelease) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ecc54f1..e3cd085 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1958,7 +1958,7 @@ static void CubeMapTest(void) IDirectDrawSurface7_Release(cubemap); ref = getRefcount((IUnknown *) palette); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); IDirectDrawPalette_Release(palette);

1 0

Matteo Bruni : wpp: Invert 'type' callback parameter value, to match comment.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 8b0d3d9f9abf6cd4a690323f078ed74844ad2a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0d3d9f9abf6cd4a690323f0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 13 18:04:20 2012 +0200 wpp: Invert 'type' callback parameter value, to match comment. --- dlls/d3dcompiler_43/compiler.c | 2 +- libs/wpp/preproc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 1eb07ce..5159db8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -193,7 +193,7 @@ static void *wpp_open_mem(const char *filename, int type) return NULL; } hr = ID3DInclude_Open(current_include, - type ? D3D_INCLUDE_SYSTEM : D3D_INCLUDE_LOCAL, + type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_include, (LPCVOID *)&desc->buffer, &desc->size); if(FAILED(hr)) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 99934d6..b9d8443 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -517,7 +517,7 @@ void *pp_open_include(const char *name, const char *parent_name, char **newpath) if (!(path = wpp_callbacks->lookup(name, parent_name, includepath, nincludepath))) return NULL; - fp = wpp_callbacks->open(path, parent_name == NULL ? 1 : 0); + fp = wpp_callbacks->open(path, !!parent_name); if (fp) {

1 0

Matteo Bruni : wpp: Explicitly pass include type to the lookup callback function.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 80034de2433d6c11900c47c998550af9b3bc860a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80034de2433d6c11900c47c99… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 13 18:04:21 2012 +0200 wpp: Explicitly pass include type to the lookup callback function. Also, always pass the parent name to the callback, d3dcompiler needs that information. --- dlls/d3dcompiler_43/compiler.c | 2 +- include/wine/wpp.h | 8 ++++---- libs/wpp/ppl.l | 2 +- libs/wpp/preproc.c | 12 ++++++------ libs/wpp/wpp_private.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 5159db8..27d6504 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -143,7 +143,7 @@ static void wpp_warning(const char *file, int line, int col, const char *near, wpp_write_message_var("\n"); } -static char *wpp_lookup_mem(const char *filename, const char *parent_name, +static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name, char **include_path, int include_path_count) { /* Here we return always ok. We will maybe fail on the next wpp_open_mem */ diff --git a/include/wine/wpp.h b/include/wine/wpp.h index 2d284f1..ac180be 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -29,12 +29,12 @@ struct wpp_callbacks /* I/O callbacks */ /* Looks for a file to include, returning the path where it is found */ - /* parent_name is the directory of the parent source file (for local - * includes), includepath is an array of additional include paths */ - char *(*lookup)( const char *filename, const char *parent_name, + /* The type param is true for local (#include "filename.h") includes */ + /* parent_name is the directory of the parent source file, includepath + * is an array of additional include paths */ + char *(*lookup)( const char *filename, int type, const char *parent_name, char **include_path, int include_path_count ); /* Opens an include file */ - /* The type param is true if it is a local ("...") include */ void *(*open)( const char *filename, int type ); /* Closes a previously opened file */ void (*close)( void *file ); diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 8d979dc..70bd213 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1601,7 +1601,7 @@ void pp_do_include(char *fname, int type) /* Undo the effect of the quotation */ fname[n-1] = '\0'; - if((fp = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) + if((fp = pp_open_include(fname+1, type, pp_status.input, &newpath)) == NULL) { ppy_error("Unable to open include file %s", fname+1); return; diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index b9d8443..233d260 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -115,7 +115,7 @@ char *pp_xstrdup(const char *str) return memcpy(s, str, len); } -static char *wpp_default_lookup(const char *name, const char *parent_name, +static char *wpp_default_lookup(const char *name, int type, const char *parent_name, char **include_path, int include_path_count) { char *cpy; @@ -144,7 +144,7 @@ static char *wpp_default_lookup(const char *name, const char *parent_name, } *cptr = '\0'; - if(parent_name) + if(type && parent_name) { /* Search directory of parent include and then -I path */ const char *p; @@ -507,17 +507,17 @@ int wpp_add_include_path(const char *path) char *wpp_find_include(const char *name, const char *parent_name) { - return wpp_default_lookup(name, parent_name, includepath, nincludepath); + return wpp_default_lookup(name, !!parent_name, parent_name, includepath, nincludepath); } -void *pp_open_include(const char *name, const char *parent_name, char **newpath) +void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath) { char *path; void *fp; - if (!(path = wpp_callbacks->lookup(name, parent_name, includepath, + if (!(path = wpp_callbacks->lookup(name, type, parent_name, includepath, nincludepath))) return NULL; - fp = wpp_callbacks->open(path, !!parent_name); + fp = wpp_callbacks->open(path, type); if (fp) { diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 288d709..4e2aa5b 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -207,7 +207,7 @@ void pp_pop_define_state(void); pp_entry_t *pp_add_define(const char *def, const char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp); void pp_del_define(const char *name); -void *pp_open_include(const char *name, const char *parent_name, char **newpath); +void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath); void pp_push_if(pp_if_state_t s); void pp_next_if_state(int); pp_if_state_t pp_pop_if(void);

1 0

Matteo Bruni : d3dcompiler: Add some tests for 'system' type includes.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: f5ffa3004d9099c17c72102d69003d4f3cf8bd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ffa3004d9099c17c72102d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 13 18:04:22 2012 +0200 d3dcompiler: Add some tests for 'system' type includes. --- dlls/d3dcompiler_43/tests/asm.c | 81 ++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index b5c45d6..e966f94 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1438,8 +1438,9 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i char include[] = "#define REGISTER r0\nvs.1.1\n"; char include2[] = "#include \"incl3.vsh\"\n"; char include3[] = "vs.1.1\n"; + char include4[] = "#include <incl3.vsh>\n"; - trace("filename %s\n", filename); + trace("include_type = %d, filename %s\n", include_type, filename); trace("parent_data (%p) -> %s\n", parent_data, parent_data ? (char *)parent_data : "(null)"); if (!strcmp(filename, "incl.vsh")) @@ -1448,19 +1449,36 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i CopyMemory(buffer, include, sizeof(include)); *bytes = sizeof(include); } + else if (!strcmp(filename, "incl2.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); + CopyMemory(buffer, include2, sizeof(include2)); + *bytes = sizeof(include2); + ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); + } else if (!strcmp(filename, "incl3.vsh")) { buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include3)); CopyMemory(buffer, include3, sizeof(include3)); *bytes = sizeof(include3); /* Also check for the correct parent_data content */ - ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value\n"); + ok(parent_data != NULL + && (!strncmp(include2, parent_data, strlen(include2)) + || !strncmp(include4, parent_data, strlen(include4))), + "Wrong parent_data value.\n"); + } + else if (!strcmp(filename, "incl4.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include4)); + CopyMemory(buffer, include4, sizeof(include4)); + *bytes = sizeof(include4); + ok(parent_data == NULL, "Wrong parent_data value.\n"); + ok(include_type == D3D_INCLUDE_SYSTEM, "Wrong include type %d.\n", include_type); } else { - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); - CopyMemory(buffer, include2, sizeof(include2)); - *bytes = sizeof(include2); + ok(FALSE, "Unexpected file %s included.\n", filename); + return E_FAIL; } *data = buffer; @@ -1581,15 +1599,19 @@ static void d3dpreprocess_test(void) "; \" comment\n" "mov 0, v0\n" }; - const char testshader[] = + const char *include_test_shaders[] = { "#include \"incl.vsh\"\n" - "mov REGISTER, v0\n" - }; - const char testshader2[] = - { + "mov REGISTER, v0\n", + "#include \"incl2.vsh\"\n" - "mov REGISTER, v0\n" + "mov REGISTER, v0\n", + + "#include <incl.vsh>\n" + "mov REGISTER, v0\n", + + "#include <incl4.vsh>\n" + "mov REGISTER, v0\n", }; HRESULT hr; ID3DBlob *shader, *messages; @@ -1606,6 +1628,7 @@ static void d3dpreprocess_test(void) } }; struct D3DIncludeImpl include; + unsigned int i; /* pDefines test */ shader = NULL; @@ -1651,32 +1674,22 @@ static void d3dpreprocess_test(void) } if (shader) ID3D10Blob_Release(shader); - /* pInclude test */ - shader = NULL; - messages = NULL; + /* pInclude tests */ include.ID3DInclude_iface.lpVtbl = &D3DInclude_Vtbl; - hr = D3DPreprocess(testshader, strlen(testshader), NULL, NULL, &include.ID3DInclude_iface, - &shader, &messages); - ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if (messages) - { - trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); - ID3D10Blob_Release(messages); - } - if (shader) ID3D10Blob_Release(shader); - - /* recursive #include test */ - shader = NULL; - messages = NULL; - hr = D3DPreprocess(testshader2, strlen(testshader2), NULL, NULL, &include.ID3DInclude_iface, - &shader, &messages); - ok(hr == S_OK, "D3DPreprocess test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if (messages) + for (i = 0; i < sizeof(include_test_shaders) / sizeof(include_test_shaders[0]); ++i) { - trace("recursive D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); - ID3D10Blob_Release(messages); + shader = NULL; + messages = NULL; + hr = D3DPreprocess(include_test_shaders[i], strlen(include_test_shaders[i]), NULL, NULL, + &include.ID3DInclude_iface, &shader, &messages); + ok(hr == S_OK, "pInclude test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if (messages) + { + trace("D3DPreprocess messages:\n%s", (char *)ID3D10Blob_GetBufferPointer(messages)); + ID3D10Blob_Release(messages); + } + if (shader) ID3D10Blob_Release(shader); } - if (shader) ID3D10Blob_Release(shader); /* NULL shader tests */ shader = NULL;

1 0

Detlef Riekenberg : kernel32/tests: Accept higher PRODUCT_* values.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 7fbf5c239e143fc275d73d956c49fd893ad5df45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf5c239e143fc275d73d956… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 13 17:44:09 2012 +0200 kernel32/tests: Accept higher PRODUCT_* values. --- dlls/kernel32/tests/version.c | 5 +- include/winnt.h | 107 ++++++++++++++++++++++++++++------------ 2 files changed, 77 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 43f42d5..4b9a4f3 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -83,9 +83,8 @@ static void test_GetProductInfo(void) res = pGetProductInfo(entry[0], entry[1], entry[2], entry[3], &product); if (entry[0] >= 6) - ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_EMBEDDED) && (GetLastError() == 0xdeadbeef), - "got %d and 0x%x with 0x%x (expected TRUE and a valid PRODUCT_* value with LastError untouched)\n", - res, product, GetLastError()); + ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_PROFESSIONAL_WMC), + "got %d and 0x%x (expected TRUE and a valid PRODUCT_* value)\n", res, product); else ok(!res && !product && (GetLastError() == 0xdeadbeef), "got %d and 0x%x with 0x%x (expected FALSE and PRODUCT_UNDEFINED with LastError untouched)\n", diff --git a/include/winnt.h b/include/winnt.h index bed2a19..6903d34 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1969,49 +1969,92 @@ NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); /* * Product types */ -#define PRODUCT_UNLICENSED 0xABCDABCD +#define PRODUCT_UNDEFINED 0x00000000 +#define PRODUCT_ULTIMATE 0x00000001 +#define PRODUCT_HOME_BASIC 0x00000002 +#define PRODUCT_HOME_PREMIUM 0x00000003 +#define PRODUCT_ENTERPRISE 0x00000004 +#define PRODUCT_HOME_BASIC_N 0x00000005 #define PRODUCT_BUSINESS 0x00000006 -#define PRODUCT_BUSINESS_N 0x00000010 -#define PRODUCT_CLUSTER_SERVER 0x00000012 +#define PRODUCT_STANDARD_SERVER 0x00000007 #define PRODUCT_DATACENTER_SERVER 0x00000008 -#define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C -#define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027 -#define PRODUCT_EMBEDDED 0x00000041 -#define PRODUCT_ENTERPRISE 0x00000004 -#define PRODUCT_ENTERPRISE_N 0x0000001B +#define PRODUCT_SMALLBUSINESS_SERVER 0x00000009 #define PRODUCT_ENTERPRISE_SERVER 0x0000000A +#define PRODUCT_STARTER 0x0000000B +#define PRODUCT_DATACENTER_SERVER_CORE 0x0000000C +#define PRODUCT_STANDARD_SERVER_CORE 0x0000000D #define PRODUCT_ENTERPRISE_SERVER_CORE 0x0000000E -#define PRODUCT_ENTERPRISE_SERVER_CORE_V 0x00000029 #define PRODUCT_ENTERPRISE_SERVER_IA64 0x0000000F -#define PRODUCT_ENTERPRISE_SERVER_V 0x00000026 -#define PRODUCT_HOME_BASIC 0x00000002 -#define PRODUCT_HOME_BASIC_N 0x00000005 -#define PRODUCT_HOME_PREMIUM 0x00000003 +#define PRODUCT_BUSINESS_N 0x00000010 +#define PRODUCT_WEB_SERVER 0x00000011 +#define PRODUCT_CLUSTER_SERVER 0x00000012 +#define PRODUCT_HOME_SERVER 0x00000013 +#define PRODUCT_STORAGE_EXPRESS_SERVER 0x00000014 +#define PRODUCT_STORAGE_STANDARD_SERVER 0x00000015 +#define PRODUCT_STORAGE_WORKGROUP_SERVER 0x00000016 +#define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x00000017 +#define PRODUCT_SERVER_FOR_SMALLBUSINESS 0x00000018 +#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM 0x00000019 #define PRODUCT_HOME_PREMIUM_N 0x0000001A -#define PRODUCT_HYPERV 0x0000002A +#define PRODUCT_ENTERPRISE_N 0x0000001B +#define PRODUCT_ULTIMATE_N 0x0000001C +#define PRODUCT_WEB_SERVER_CORE 0x0000001D #define PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT 0x0000001E -#define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020 #define PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY 0x0000001F -#define PRODUCT_PROFESSIONAL 0x00000030 -#define PRODUCT_PROFESSIONAL_N 0x00000031 -#define PRODUCT_SERVER_FOR_SMALLBUSINESS 0x00000018 +#define PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING 0x00000020 +#define PRODUCT_SERVER_FOUNDATION 0x00000021 +#define PRODUCT_HOME_PREMIUM_SERVER 0x00000022 #define PRODUCT_SERVER_FOR_SMALLBUSINESS_V 0x00000023 +#define PRODUCT_STANDARD_SERVER_V 0x00000024 +#define PRODUCT_DATACENTER_SERVER_V 0x00000025 #define PRODUCT_SERVER_V 0x00000025 -#define PRODUCT_SMALLBUSINESS_SERVER 0x00000009 -#define PRODUCT_STANDARD_SERVER 0x00000007 -#define PRODUCT_STANDARD_SERVER_CORE 0x0000000D +#define PRODUCT_ENTERPRISE_SERVER_V 0x00000026 +#define PRODUCT_DATACENTER_SERVER_CORE_V 0x00000027 #define PRODUCT_STANDARD_SERVER_CORE_V 0x00000028 -#define PRODUCT_STANDARD_SERVER_V 0x00000024 -#define PRODUCT_STARTER 0x0000000B -#define PRODUCT_STORAGE_ENTERPRISE_SERVER 0x00000017 -#define PRODUCT_STORAGE_EXPRESS_SERVER 0x00000014 -#define PRODUCT_STORAGE_STANDARD_SERVER 0x00000015 -#define PRODUCT_STORAGE_WORKGROUP_SERVER 0x00000016 -#define PRODUCT_UNDEFINED 0x00000000 -#define PRODUCT_ULTIMATE 0x00000001 -#define PRODUCT_ULTIMATE_N 0x0000001C -#define PRODUCT_WEB_SERVER 0x00000011 -#define PRODUCT_WEB_SERVER_CORE 0x0000001D +#define PRODUCT_ENTERPRISE_SERVER_CORE_V 0x00000029 +#define PRODUCT_HYPERV 0x0000002A +#define PRODUCT_STORAGE_EXPRESS_SERVER_CORE 0x0000002B +#define PRODUCT_STORAGE_STANDARD_SERVER_CORE 0x0000002C +#define PRODUCT_STORAGE_WORKGROUP_SERVER_CORE 0x0000002D +#define PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE 0x0000002E +#define PRODUCT_STARTER_N 0x0000002F +#define PRODUCT_PROFESSIONAL 0x00000030 +#define PRODUCT_PROFESSIONAL_N 0x00000031 +#define PRODUCT_SB_SOLUTION_SERVER 0x00000032 +#define PRODUCT_SERVER_FOR_SB_SOLUTIONS 0x00000033 +#define PRODUCT_STANDARD_SERVER_SOLUTIONS 0x00000034 +#define PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE 0x00000035 +#define PRODUCT_SB_SOLUTION_SERVER_EM 0x00000036 +#define PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM 0x00000037 +#define PRODUCT_SOLUTION_EMBEDDEDSERVER 0x00000038 +#define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT 0x0000003B +#define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL 0x0000003C +#define PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC 0x0000003D +#define PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC 0x0000003E +#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE 0x0000003F +#define PRODUCT_CLUSTER_SERVER_V 0x00000040 +#define PRODUCT_EMBEDDED 0x00000041 +#define PRODUCT_STARTER_E 0x00000042 +#define PRODUCT_HOME_BASIC_E 0x00000043 +#define PRODUCT_HOME_PREMIUM_E 0x00000044 +#define PRODUCT_PROFESSIONAL_E 0x00000045 +#define PRODUCT_ENTERPRISE_E 0x00000046 +#define PRODUCT_ULTIMATE_E 0x00000047 +#define PRODUCT_ENTERPRISE_EVALUATION 0x00000048 +#define PRODUCT_MULTIPOINT_STANDARD_SERVER 0x0000004C +#define PRODUCT_MULTIPOINT_PREMIUM_SERVER 0x0000004D +#define PRODUCT_STANDARD_EVALUATION_SERVER 0x0000004F +#define PRODUCT_DATACENTER_EVALUATION_SERVER 0x00000050 +#define PRODUCT_ENTERPRISE_N_EVALUATION 0x00000054 +#define PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER 0x0000005F +#define PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER 0x00000060 +#define PRODUCT_CORE_ARM 0x00000061 +#define PRODUCT_CORE_N 0x00000062 +#define PRODUCT_CORE_COUNTRYSPECIFIC 0x00000063 +#define PRODUCT_CORE_LANGUAGESPECIFIC 0x00000064 +#define PRODUCT_CORE 0x00000065 +#define PRODUCT_PROFESSIONAL_WMC 0x00000067 +#define PRODUCT_UNLICENSED 0xABCDABCD /*

1 0

Dmitry Timoshkov : windowscodecs: Reimplement TiffDecoder_GetFrameCount using TIFFNumberOfDirectories.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 4f16c2f791afc902438322d1eae208bc5d4deefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f16c2f791afc902438322d1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 12 15:22:27 2012 +0900 windowscodecs: Reimplement TiffDecoder_GetFrameCount using TIFFNumberOfDirectories. --- dlls/windowscodecs/tiffformat.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1040fa6..66f65d1 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -58,7 +58,7 @@ static void *libtiff_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(TIFFClientOpen); MAKE_FUNCPTR(TIFFClose); -MAKE_FUNCPTR(TIFFCurrentDirectory); +MAKE_FUNCPTR(TIFFNumberOfDirectories); MAKE_FUNCPTR(TIFFGetField); MAKE_FUNCPTR(TIFFIsByteSwapped); MAKE_FUNCPTR(TIFFReadDirectory); @@ -89,7 +89,7 @@ static void *load_libtiff(void) } LOAD_FUNCPTR(TIFFClientOpen); LOAD_FUNCPTR(TIFFClose); - LOAD_FUNCPTR(TIFFCurrentDirectory); + LOAD_FUNCPTR(TIFFNumberOfDirectories); LOAD_FUNCPTR(TIFFGetField); LOAD_FUNCPTR(TIFFIsByteSwapped); LOAD_FUNCPTR(TIFFReadDirectory); @@ -662,8 +662,7 @@ static HRESULT WINAPI TiffDecoder_GetFrameCount(IWICBitmapDecoder *iface, } EnterCriticalSection(&This->lock); - while (pTIFFReadDirectory(This->tiff)) { } - *pCount = pTIFFCurrentDirectory(This->tiff)+1; + *pCount = pTIFFNumberOfDirectories(This->tiff); LeaveCriticalSection(&This->lock); TRACE("(%p) <-- %i\n", iface, *pCount);

1 0