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

Dmitry Timoshkov : windowscodecs: Reimplement TiffDecoder_GetFrameCount using TIFFNumberOfDirectories.
by Alexandre Julliard June 13, 2012

June 13, 2012

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

Detlef Riekenberg : kernel32/tests: Accept higher PRODUCT_* values.
by Alexandre Julliard June 13, 2012

June 13, 2012

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

Matteo Bruni : d3dcompiler: Add some tests for 'system' type includes.
by Alexandre Julliard June 13, 2012

June 13, 2012

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

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

June 13, 2012

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 June 13, 2012

June 13, 2012

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

André Hentschel : d3drm/tests: Add GetClassName tests.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 0a0fe20988b041d1885dadc15f95451b397b618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0fe20988b041d1885dadc15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 9 17:34:03 2012 +0200 d3drm/tests: Add GetClassName tests. --- dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5f635e2..7ed4394 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -190,6 +190,7 @@ static void test_MeshBuilder(void) char name[10]; DWORD size; D3DCOLOR color; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -197,6 +198,14 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); + } + info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); hr = IDirect3DRMMeshBuilder_Load(pMeshBuilder, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); @@ -437,6 +446,8 @@ static void test_MeshBuilder3(void) int val; DWORD val1; D3DVALUE valu, valv; + DWORD size; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -452,6 +463,14 @@ static void test_MeshBuilder3(void) hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + size = sizeof(cname); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); + } + info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); hr = IDirect3DRMMeshBuilder3_Load(pMeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); @@ -541,6 +560,7 @@ static void test_Frame(void) LPDIRECT3DRMLIGHT pLightTmp; LPDIRECT3DRMLIGHTARRAY pLightArray; DWORD count; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -549,6 +569,14 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameC, 1); + count = sizeof(cname); + hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count != sizeof(cname), "size didn't change: %u\n", count); + ok(!strcmp(cname, "Frame"), "Expected cname to be \"Frame\", but got \"%s\"\n", cname); + } + hr = IDirect3DRMFrame_GetParent(pFrameC, NULL); ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr); pFrameTmp = (void*)0xdeadbeef; @@ -837,6 +865,8 @@ static void test_Light(void) LPDIRECT3DRMLIGHT pLight; D3DRMLIGHTTYPE type; D3DCOLOR color; + DWORD size; + CHAR cname[64] = {0}; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -844,6 +874,14 @@ static void test_Light(void) hr = IDirect3DRM_CreateLightRGB(pD3DRM, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &pLight); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + size = sizeof(cname); + hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); + todo_wine { + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(!strcmp(cname, "Light"), "Expected cname to be \"Light\", but got \"%s\"\n", cname); + } + type = IDirect3DRMLight_GetType(pLight); ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);

1 0

Detlef Riekenberg : kernel32/tests: Do not test GetLastError on success.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 697cea2f93226537d32afc521d6769cdd52f1de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697cea2f93226537d32afc521… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 12 22:36:45 2012 +0200 kernel32/tests: Do not test GetLastError on success. --- dlls/kernel32/tests/version.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 265eae4..43f42d5 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -153,8 +153,6 @@ static void test_GetVersionEx(void) ok(ret || broken(ret == 0), /* win95 */ "Expected GetVersionExA to succeed\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); } static void test_VerifyVersionInfo(void)

1 0

Detlef Riekenberg : ntprint: Do not fail when the spooler service was stopped.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 0e997674c57f0effa93c7502eb5b1f4e06e5f6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e997674c57f0effa93c7502e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 12 21:56:06 2012 +0200 ntprint: Do not fail when the spooler service was stopped. --- dlls/ntprint/tests/ntprint.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index cf9853d..7e1ab58 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -70,6 +70,10 @@ static void test_PSetupCreateMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return; + } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); @@ -96,6 +100,10 @@ static void test_PSetupDestroyMonitorInfo(VOID) SetLastError(0xdeadbeef); mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return; + } ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (!mi) return;

1 0

Ulrik Dickow : msxml3/tests: Test namespace change for all document versions.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: fc8ab63563663f5076d86fa814289d2e046e5125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8ab63563663f5076d86fa81… Author: Ulrik Dickow <u.dickow(a)gmail.com> Date: Wed Jun 13 16:19:02 2012 +0200 msxml3/tests: Test namespace change for all document versions. --- dlls/msxml3/tests/domdoc.c | 159 +++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 77 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d4ff6a2..0c9d65a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7160,7 +7160,86 @@ static void test_testTransforms(void) free_bstrs(); } -static void test_namespaces(void) +struct namespaces_change_t { + const CLSID *clsid; + const char *name; +}; + +static const struct namespaces_change_t namespaces_change_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument" }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2" }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26" }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30" }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40" }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60" }, + { 0 } +}; + +static void test_namespaces_change(void) +{ + const struct namespaces_change_t *class_ptr = namespaces_change_test_data; + + while (class_ptr->clsid) + { + IXMLDOMDocument *doc = NULL; + IXMLDOMElement *elem = NULL; + IXMLDOMNode *node = NULL; + + VARIANT var; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&doc); + if (hr != S_OK) + { + win_skip("failed to create class instance for %s\n", class_ptr->name); + class_ptr++; + continue; + } + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + /* try same prefix, different uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + /* try same prefix and uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s for %s\n", + wine_dbgstr_w(str), class_ptr->name); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + + free_bstrs(); + + class_ptr++; + } +} + +static void test_namespaces_basic(void) { static const CHAR namespaces_xmlA[] = "<?xml version=\"1.0\"?>\n" @@ -7175,7 +7254,6 @@ static void test_namespaces(void) IXMLDOMNode *node; VARIANT_BOOL b; - VARIANT var; HRESULT hr; BSTR str; @@ -7252,80 +7330,6 @@ static void test_namespaces(void) IXMLDOMDocument_Release(doc); - /* create on element and try to alter namespace after that */ - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; - - V_VT(&var) = VT_I2; - V_I2(&var) = NODE_ELEMENT; - - hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_appendChild(doc, node, NULL); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri2"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, E_INVALIDARG); - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMElement_get_xml(elem, &str); - EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IXMLDOMElement_Release(elem); - IXMLDOMDocument_Release(doc); - - /* create on element and try to alter namespace after that */ - doc = create_document_version(60, &IID_IXMLDOMDocument); - if (!doc) return; - - V_VT(&var) = VT_I2; - V_I2(&var) = NODE_ELEMENT; - - hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_appendChild(doc, node, NULL); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); - - /* try same prefix, different uri */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri2"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, E_INVALIDARG); - - /* try same prefix and uri */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMElement_get_xml(elem, &str); - EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IXMLDOMElement_Release(elem); - IXMLDOMDocument_Release(doc); - free_bstrs(); } @@ -11851,7 +11855,8 @@ START_TEST(domdoc) test_xmlTypes(); test_save(); test_testTransforms(); - test_namespaces(); + test_namespaces_basic(); + test_namespaces_change(); test_FormattingXML(); test_nodeTypedValue(); test_TransformWithLoadingLocalFile();

1 0

Jacek Caban : mshtml: Release script hosts in window_set_docnode.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: e120ca06c36a6ed6dc3303099fca030fa7a87b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e120ca06c36a6ed6dc3303099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:11:36 2012 +0200 mshtml: Release script hosts in window_set_docnode. --- dlls/mshtml/htmlwindow.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 43c65d9..ff17f95 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -49,6 +49,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) window->doc->basedoc.cp_container.forward_container = NULL; detach_events(window->doc); abort_document_bindings(window->doc); + release_script_hosts(window); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); }

1 0