wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

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

Huw Davies : winspool: Set the timeout entries to zero.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: b5511bd4fe1fc1a94623a119d3eb57ed8cad0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5511bd4fe1fc1a94623a119d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:40 2012 +0100 winspool: Set the timeout entries to zero. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 01081c2..512e11f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3068,6 +3068,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); + set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName); set_reg_szW(hkeyPrinter, ParametersW, pi->pParameters); @@ -3080,6 +3081,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, txTimeoutW, 0); set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); RegCloseKey(hkeyPrinter);

1 0

Huw Davies : winspool: Use the helper to set DWORD registry values.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 7d615965fcb20443065604bffeeea63467c3a65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d615965fcb20443065604bff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:39 2012 +0100 winspool: Use the helper to set DWORD registry values. --- dlls/winspool.drv/info.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 330a7a5..01081c2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3029,8 +3029,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } set_devices_and_printerports(pi); - RegSetValueExW(hkeyPrinter, AttributesW, 0, REG_DWORD, - (LPBYTE)&pi->Attributes, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, AttributesW, pi->Attributes); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); /* See if we can load the driver. We may need the devmode structure anyway @@ -3076,16 +3075,12 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, PortW, pi->pPortName); set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - RegSetValueExW(hkeyPrinter, PriorityW, 0, REG_DWORD, - (LPBYTE)&pi->Priority, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, PriorityW, pi->Priority); set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - RegSetValueExW(hkeyPrinter, StartTimeW, 0, REG_DWORD, - (LPBYTE)&pi->StartTime, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, StatusW, 0, REG_DWORD, - (LPBYTE)&pi->Status, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, UntilTimeW, 0, REG_DWORD, - (LPBYTE)&pi->UntilTime, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); + set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters);

1 0

Huw Davies : winspool: Update the ppd for LPR printers too.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: f15f359cbf9c12c56415c295f2466bf1e74b855d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15f359cbf9c12c56415c295f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:38 2012 +0100 winspool: Update the ppd for LPR printers too. --- dlls/winspool.drv/info.c | 48 ++++++++++++++++++++++++++++----------- dlls/winspool.drv/tests/info.c | 1 - 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ed470bb..330a7a5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -888,23 +888,34 @@ static BOOL CUPS_LoadPrinters(void) return TRUE; } -static char *get_cups_name( HANDLE printer ) +#endif + +static char *get_queue_name( HANDLE printer, BOOL *cups ) { - WCHAR *port; + WCHAR *port, *name = NULL; DWORD err, needed, type; char *ret = NULL; HKEY key; + *cups = FALSE; + err = WINSPOOL_GetOpenedPrinterRegKey( printer, &key ); if (err) return NULL; err = RegQueryValueExW( key, PortW, 0, &type, NULL, &needed ); - if (err || needed <= sizeof( CUPS_Port )) goto end; + if (err) goto end; port = HeapAlloc( GetProcessHeap(), 0, needed ); if (!port) goto end; RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - if (!memcmp( port, CUPS_Port, sizeof(CUPS_Port) - sizeof(WCHAR) )) + + if (!strncmpW( port, CUPS_Port, sizeof(CUPS_Port) / sizeof(WCHAR) -1 )) + { + name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + *cups = TRUE; + } + else if (!strncmpW( port, LPR_Port, sizeof(LPR_Port) / sizeof(WCHAR) -1 )) + name = port + sizeof(LPR_Port) / sizeof(WCHAR) - 1; + if (name) { - WCHAR *name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); ret = HeapAlloc( GetProcessHeap(), 0, needed ); if(ret) WideCharToMultiByte( CP_UNIXCP, 0, name, -1, ret, needed, NULL, NULL ); @@ -914,23 +925,30 @@ end: RegCloseKey( key ); return ret; } -#endif + static BOOL update_driver( HANDLE printer ) { - BOOL ret = FALSE; -#ifdef SONAME_LIBCUPS + BOOL ret, is_cups; const WCHAR *name = get_opened_printer_name( printer ); WCHAR *ppd_dir, *ppd; - char *cups_name; + char *queue_name; if (!name) return FALSE; - cups_name = get_cups_name( printer ); - if (!cups_name) return FALSE; + queue_name = get_queue_name( printer, &is_cups ); + if (!queue_name) return FALSE; ppd_dir = get_ppd_dir(); ppd = get_ppd_filename( ppd_dir, name ); - if (get_cups_ppd( cups_name, ppd )) + +#ifdef SONAME_LIBCUPS + if (is_cups) + ret = get_cups_ppd( queue_name, ppd ); + else +#endif + ret = get_fallback_ppd( queue_name, ppd ); + + if (ret) { TRACE( "updating driver %s\n", debugstr_w( name ) ); ret = add_printer_driver( name, ppd ); @@ -938,8 +956,7 @@ static BOOL update_driver( HANDLE printer ) } HeapFree( GetProcessHeap(), 0, ppd_dir ); HeapFree( GetProcessHeap(), 0, ppd ); - HeapFree( GetProcessHeap(), 0, cups_name ); -#endif + HeapFree( GetProcessHeap(), 0, queue_name ); return ret; } @@ -1024,10 +1041,13 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { + DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); RegDeleteValueW(hkeyPrinter, May_Delete_Value); + /* flag that the PPD file should be checked for an update */ + set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey(hkeyPrinter); } else { static CHAR data_type[] = "RAW", diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b9d2201..3aab0e2 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2596,7 +2596,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pDataFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDataFile); hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

André Hentschel : d3drm/tests: Add GetClassName tests.
by Alexandre Julliard 13 Jun '12

13 Jun '12

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

Francois Gouget : msvcrt: Fix the name of the Portuguese locale alias.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: d8ed347ab390ccdd2b413df31fa4d62f9e863744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ed347ab390ccdd2b413df31… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 19:47:54 2012 +0200 msvcrt: Fix the name of the Portuguese locale alias. --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/tests/locale.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 97b82ec..b26a9c8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -85,7 +85,7 @@ static const char * const _country_synonyms[] = "german-swiss", "des", "italian-swiss", "its", "german-austrian", "dea", - "portugese", "ptb", + "portuguese", "ptb", "portuguese-brazil", "ptb", "spanish-mexican", "esm", "norwegian-bokmal", "nor", diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 8d6a34f..638a3d2 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -472,7 +472,7 @@ static void test_setlocale(void) if(ret) ok(!strcmp(ret, "Polish_Poland.1250"), "ret = %s\n", ret); - ret = setlocale(LC_ALL, "portugese"); + ret = setlocale(LC_ALL, "portuguese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Portuguese_Brazil.1252"), "ret = %s\n", ret);

1 0

Francois Gouget : d3dcompiler_43: Make debug_dump_ir_constructor() static.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 768c38034cf5faee00ccc8edcff7540737420f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c38034cf5faee00ccc8edc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 19:46:54 2012 +0200 d3dcompiler_43: Make debug_dump_ir_constructor() static. --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9c222cd..350a116 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1139,7 +1139,7 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) +static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) { struct hlsl_ir_node *arg;

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

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

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

← Newer
1
...
51
52
53
54
55
56
57
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012