March 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32: Create the Control Panel\International key one element at a time.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: f5248ef7c8f709db88a52490fb344dc669193142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5248ef7c8f709db88a52490f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:04:33 2010 +0100 kernel32: Create the Control Panel\International key one element at a time. --- dlls/kernel32/locale.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6f965e3..277f55c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -614,11 +614,11 @@ static BOOL is_genitive_name_supported( LCTYPE lctype ) */ static inline HANDLE create_registry_key(void) { - static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', - 'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; + static const WCHAR cplW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l',0}; + static const WCHAR intlW[] = {'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - HANDLE hkey; + HANDLE cpl_key, hkey = 0; if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0; @@ -628,9 +628,15 @@ static inline HANDLE create_registry_key(void) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, intlW ); + RtlInitUnicodeString( &nameW, cplW ); - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) hkey = 0; + if (!NtCreateKey( &cpl_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) + { + NtClose( attr.RootDirectory ); + attr.RootDirectory = cpl_key; + RtlInitUnicodeString( &nameW, intlW ); + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) hkey = 0; + } NtClose( attr.RootDirectory ); return hkey; }

1 0

Henri Verbeet : gdi32: GetObject() should return the DIB' s absolute height in dsBmih.biHeight.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 9ab004d56af62ed34c041fa3eff80eca8637b8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab004d56af62ed34c041fa3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:56 2010 +0100 gdi32: GetObject() should return the DIB's absolute height in dsBmih.biHeight. --- dlls/gdi32/bitmap.c | 4 +++- dlls/gdi32/tests/bitmap.c | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 609cc9c..dfb8916 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -678,7 +678,9 @@ static INT BITMAP_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { if (count >= sizeof(DIBSECTION)) { - memcpy( buffer, bmp->dib, sizeof(DIBSECTION) ); + DIBSECTION *dib = buffer; + *dib = *bmp->dib; + dib->dsBmih.biHeight = abs( dib->dsBmih.biHeight ); ret = sizeof(DIBSECTION); } else /* if (count >= sizeof(BITMAP)) */ diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ecdf2ac..23762c0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -301,7 +301,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); - ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); + ok(bm.bmHeight == abs(bmih->biHeight), "wrong bm.bmHeight %d\n", bm.bmHeight); dib_width_bytes = DIB_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel); bm_width_bytes = BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel); if (bm.bmWidthBytes != dib_width_bytes) /* Win2k bug */ @@ -332,7 +332,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ret = GetObject(hbm, sizeof(*bma) * 2, bma); ok(ret == sizeof(*bma) || broken(ret == sizeof(*bma) * 2 /* Win9x */), "wrong size %d\n", ret); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); - ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); + ok(bm.bmHeight == abs(bmih->biHeight), "wrong bm.bmHeight %d\n", bm.bmHeight); ok(bm.bmBits == bits, "wrong bm.bmBits %p != %p\n", bm.bmBits, bits); ret = GetObject(hbm, sizeof(bm) / 2, &bm); @@ -364,7 +364,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ds.dsBmih.biSize == bmih->biSize, "%u != %u\n", ds.dsBmih.biSize, bmih->biSize); ok(ds.dsBmih.biWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBmih.biHeight == bmih->biHeight, "%d != %d\n", ds.dsBmih.biHeight, bmih->biHeight); + ok(ds.dsBmih.biHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); ok(ds.dsBmih.biPlanes == bmih->biPlanes, "%u != %u\n", ds.dsBmih.biPlanes, bmih->biPlanes); ok(ds.dsBmih.biBitCount == bmih->biBitCount, "%u != %u\n", ds.dsBmih.biBitCount, bmih->biBitCount); ok(ds.dsBmih.biCompression == bmih->biCompression, "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression); @@ -376,7 +376,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ret = GetObject(hbm, sizeof(ds) - 4, &ds); ok(ret == sizeof(ds.dsBm) || broken(ret == (sizeof(ds) - 4) /* Win9x */), "wrong size %d\n", ret); ok(ds.dsBm.bmWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBm.bmHeight == bmih->biHeight, "%d != %d\n", ds.dsBmih.biHeight, bmih->biHeight); + ok(ds.dsBm.bmHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits); ret = GetObject(hbm, 0, &ds); @@ -525,6 +525,14 @@ static void test_dibsections(void) test_dib_info(hdib, bits, &pbmi->bmiHeader); DeleteObject(hdib); + /* Test a top-down DIB. */ + pbmi->bmiHeader.biHeight = -100; + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + test_dib_info(hdib, bits, &pbmi->bmiHeader); + DeleteObject(hdib); + + pbmi->bmiHeader.biHeight = 100; pbmi->bmiHeader.biBitCount = 8; pbmi->bmiHeader.biCompression = BI_RLE8; SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : kernel32: Create the hardware registry keys one at a time, and bail out if the main key already exists.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 6d4cf67a56dee87180d447eae3562d35798ba75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4cf67a56dee87180d447eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:02:16 2010 +0100 kernel32: Create the hardware registry keys one at a time, and bail out if the main key already exists. --- dlls/kernel32/oldconfig.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 0e8cff1..c77e7b2 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -90,6 +90,25 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE" ) || + NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &disp )) + { + ERR("Cannot create HARDWARE registry key\n" ); + return; + } + NtClose( scsiKey ); + RtlFreeUnicodeString( &nameW ); + if (disp == REG_OPENED_EXISTING_KEY) return; + + if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE\\DEVICEMAP" ) || + NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &disp )) + { + ERR("Cannot create DEVICEMAP registry key\n" ); + return; + } + NtClose( scsiKey ); + RtlFreeUnicodeString( &nameW ); + /* Ensure there is Scsi key */ if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE\\DEVICEMAP\\Scsi" ) || NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0,

1 0

Alexandre Julliard : kernel32: Moved creation of the DynData registry keys to wineboot.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 61812d17f825c80b1b5adee82a499f0e9071c80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61812d17f825c80b1b5adee82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:01:28 2010 +0100 kernel32: Moved creation of the DynData registry keys to wineboot. --- dlls/kernel32/oldconfig.c | 36 ------------------------------------ programs/wineboot/wineboot.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 26064f4..0e8cff1 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -55,39 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); - -/* registry initialisation, allocates some default keys. */ -static ULONG allocate_default_keys(void) -{ - static const WCHAR StatDataW[] = {'D','y','n','D','a','t','a','\\', - 'P','e','r','f','S','t','a','t','s','\\', - 'S','t','a','t','D','a','t','a',0}; - static const WCHAR ConfigManagerW[] = {'D','y','n','D','a','t','a','\\', - 'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\', - 'E','n','u','m',0}; - HANDLE hkey; - ULONG dispos; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - RtlInitUnicodeString( &nameW, StatDataW ); - if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, &dispos )) NtClose( hkey ); - if (dispos == REG_OPENED_EXISTING_KEY) - return dispos; /* someone else already loaded the registry */ - - RtlInitUnicodeString( &nameW, ConfigManagerW ); - if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) NtClose( hkey ); - - return dispos; -} - /****************************************************************** * create_scsi_entry * @@ -459,9 +426,6 @@ static void create_hardware_branch(void) */ void convert_old_config(void) { - if (allocate_default_keys() == REG_OPENED_EXISTING_KEY) - return; /* someone else already loaded the registry */ - /* create some hardware keys (FIXME: should not be done here) */ create_hardware_branch(); } diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 7c4b14b..8748a6a 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -233,6 +233,22 @@ static void create_hardware_registry_keys(void) RegCloseKey( system_key ); } + +/* create the DynData registry keys */ +static void create_dynamic_registry_keys(void) +{ + static const WCHAR StatDataW[] = {'P','e','r','f','S','t','a','t','s','\\', + 'S','t','a','t','D','a','t','a',0}; + static const WCHAR ConfigManagerW[] = {'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\', + 'E','n','u','m',0}; + HKEY key; + + if (!RegCreateKeyExW( HKEY_DYN_DATA, StatDataW, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + RegCloseKey( key ); + if (!RegCreateKeyExW( HKEY_DYN_DATA, ConfigManagerW, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + RegCloseKey( key ); +} + /* create the platform-specific environment registry keys */ static void create_environment_registry_keys( void ) { @@ -1049,6 +1065,7 @@ int main( int argc, char *argv[] ) ResetEvent( event ); /* in case this is a restart */ create_hardware_registry_keys(); + create_dynamic_registry_keys(); create_environment_registry_keys(); wininit(); pendingRename();

1 0

Henri Verbeet : uxtheme: GetObject() already returns a DIB' s absolute height.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: d8c13bc5dbf1fbeb81d27ec2167a83ccd07e0bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c13bc5dbf1fbeb81d27ec21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:58 2010 +0100 uxtheme: GetObject() already returns a DIB's absolute height. --- dlls/uxtheme/msstyles.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 896a294..0adb70d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1093,7 +1093,7 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) *hasAlpha = TRUE; p = dib.dsBm.bmBits; - n = abs(dib.dsBmih.biHeight) * dib.dsBmih.biWidth; + n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ while (n-- > 0) {

1 0

Henri Verbeet : gdi32/tests: Fix a few format strings.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 96e4a33b65dd8bb0268abeda94b464c2c2339571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e4a33b65dd8bb0268abeda9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:55 2010 +0100 gdi32/tests: Fix a few format strings. --- dlls/gdi32/tests/bitmap.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 517033c..ecdf2ac 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -363,20 +363,20 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ds.dsBmih.biSizeImage = 0; ok(ds.dsBmih.biSize == bmih->biSize, "%u != %u\n", ds.dsBmih.biSize, bmih->biSize); - ok(ds.dsBmih.biWidth == bmih->biWidth, "%u != %u\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBmih.biHeight == bmih->biHeight, "%u != %u\n", ds.dsBmih.biHeight, bmih->biHeight); + ok(ds.dsBmih.biWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); + ok(ds.dsBmih.biHeight == bmih->biHeight, "%d != %d\n", ds.dsBmih.biHeight, bmih->biHeight); ok(ds.dsBmih.biPlanes == bmih->biPlanes, "%u != %u\n", ds.dsBmih.biPlanes, bmih->biPlanes); ok(ds.dsBmih.biBitCount == bmih->biBitCount, "%u != %u\n", ds.dsBmih.biBitCount, bmih->biBitCount); ok(ds.dsBmih.biCompression == bmih->biCompression, "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression); ok(ds.dsBmih.biSizeImage == bmih->biSizeImage, "%u != %u\n", ds.dsBmih.biSizeImage, bmih->biSizeImage); - ok(ds.dsBmih.biXPelsPerMeter == bmih->biXPelsPerMeter, "%u != %u\n", ds.dsBmih.biXPelsPerMeter, bmih->biXPelsPerMeter); - ok(ds.dsBmih.biYPelsPerMeter == bmih->biYPelsPerMeter, "%u != %u\n", ds.dsBmih.biYPelsPerMeter, bmih->biYPelsPerMeter); + ok(ds.dsBmih.biXPelsPerMeter == bmih->biXPelsPerMeter, "%d != %d\n", ds.dsBmih.biXPelsPerMeter, bmih->biXPelsPerMeter); + ok(ds.dsBmih.biYPelsPerMeter == bmih->biYPelsPerMeter, "%d != %d\n", ds.dsBmih.biYPelsPerMeter, bmih->biYPelsPerMeter); memset(&ds, 0xAA, sizeof(ds)); ret = GetObject(hbm, sizeof(ds) - 4, &ds); ok(ret == sizeof(ds.dsBm) || broken(ret == (sizeof(ds) - 4) /* Win9x */), "wrong size %d\n", ret); - ok(ds.dsBm.bmWidth == bmih->biWidth, "%u != %u\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBm.bmHeight == bmih->biHeight, "%u != %u\n", ds.dsBmih.biHeight, bmih->biHeight); + ok(ds.dsBm.bmWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); + ok(ds.dsBm.bmHeight == bmih->biHeight, "%d != %d\n", ds.dsBmih.biHeight, bmih->biHeight); ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits); ret = GetObject(hbm, 0, &ds);

1 0

Henri Verbeet : winex11.drv: Use the bitmap's "topdown" field in X11DRV_DIB_DoCopyDIBSection().
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 508b00a3291f0987f5db2e704fb5de50e92529de URL: http://source.winehq.org/git/wine.git/?a=commit;h=508b00a3291f0987f5db2e704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:54 2010 +0100 winex11.drv: Use the bitmap's "topdown" field in X11DRV_DIB_DoCopyDIBSection(). --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 755c9d8..2021aab 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4249,7 +4249,7 @@ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, descr.palentry = NULL; descr.infoWidth = dibSection.dsBmih.biWidth; descr.infoBpp = dibSection.dsBmih.biBitCount; - descr.lines = dibSection.dsBmih.biHeight; + descr.lines = physBitmap->topdown ? -dibSection.dsBmih.biHeight : dibSection.dsBmih.biHeight; descr.image = physBitmap->image; descr.colorMap = colorMap; descr.nColorMap = nColorMap;

1 0

Henri Verbeet : winex11.drv: Use the bitmap's "topdown" field in X11DRV_AlphaBlend().
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: ba38340cdbf4d925bd9f63450468d73df294aac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba38340cdbf4d925bd9f63450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:53 2010 +0100 winex11.drv: Use the bitmap's "topdown" field in X11DRV_AlphaBlend(). --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 041e151..0ff434f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1969,7 +1969,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid } dstbits = data = HeapAlloc(GetProcessHeap(), 0, heightSrc * widthSrc * 4); - if(dib.dsBmih.biHeight < 0) { /* top-down dib */ + if (devSrc->bitmap->topdown) { /* top-down dib */ top_down = TRUE; dstbits += widthSrc * (heightSrc - 1); y2 = ySrc;

1 0

Christian Costa : d3dx9_36: Implement stubbed ID3DXConstantTable interface.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 66d66f2e22b7624617f551a49380ea9bfb50e5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d66f2e22b7624617f551a49… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:18 2010 +0100 d3dx9_36: Implement stubbed ID3DXConstantTable interface. --- dlls/d3dx9_36/shader.c | 325 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 323 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66d66f2e22b7624617f55…

1 0

Christian Costa : d3dx9_36: Implement D3DXFindShaderComment ( based on code from Luis Busquets) + tests.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: ea50ef8e080e5fcf3c637fb9af4de2149239f4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea50ef8e080e5fcf3c637fb9a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:39:24 2010 +0100 d3dx9_36: Implement D3DXFindShaderComment (based on code from Luis Busquets) + tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 33 +++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/shader.c | 38 ++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 1 + 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index d22ab5f..7924081 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -129,7 +129,7 @@ @ stub D3DXFillVolumeTexture @ stub D3DXFillVolumeTextureTX @ stub D3DXFilterTexture -@ stub D3DXFindShaderComment +@ stdcall D3DXFindShaderComment(ptr long ptr ptr) @ stub D3DXFloat16To32Array @ stub D3DXFloat32To16Array @ stub D3DXFrameAppendChild diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1106594..22c297e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -135,6 +135,39 @@ LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device) return NULL; } +HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size) +{ + CONST DWORD *ptr = byte_code; + + TRACE("(%p, %x, %p, %p)", byte_code, fourcc, data, size); + + if (!byte_code) + return D3DERR_INVALIDCALL; + + while (*++ptr != D3DSIO_END) + { + /* Check if it is a comment */ + if ((*ptr & D3DSI_OPCODE_MASK) == D3DSIO_COMMENT) + { + DWORD comment_size = (*ptr & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + + /* Check if this is the comment we are looking for */ + if (*(ptr + 1) == fourcc) + { + if (size) + *size = (comment_size - 1) * sizeof(DWORD); + if (data) + *data = ptr + 2; + TRACE("Returning comment data at %p with size %d\n", *data, *size); + return D3D_OK; + } + ptr += comment_size; + } + } + + return S_FALSE; +} + HRESULT WINAPI D3DXAssembleShader(LPCSTR data, UINT data_len, CONST D3DXMACRO* defines, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index b13fed1..03c77c2 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -37,6 +37,16 @@ static const DWORD simple_ps[] = { 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff}; /* END */ +#define FCC_TEXT MAKEFOURCC('T','E','X','T') +#define FCC_CTAB MAKEFOURCC('C','T','A','B') + +static const DWORD shader_with_ctab[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ + 0x0006fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ + 0x00000000, + 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ + 0x0000ffff}; /* END */ static void test_get_shader_size(void) { @@ -70,8 +80,36 @@ static void test_get_shader_version(void) ok(shader_version == 0, "Got shader version 0x%08x, expected 0\n", shader_version); } +static void test_find_shader_comment(void) +{ + HRESULT hr; + LPCVOID data; + UINT size; + + hr = D3DXFindShaderComment(NULL, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), NULL, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); + ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('X','X','X','X'), &data, &size); + ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); + + hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == (LPCVOID)(shader_with_ctab + 6), "Got result %p, expected %p\n", data, shader_with_ctab + 6); + ok(size == 20, "Got result %d, expected 20\n", size); +} + START_TEST(shader) { test_get_shader_size(); test_get_shader_version(); + test_find_shader_comment(); } diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index a0df2a8..6d11b3d 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -248,6 +248,7 @@ LPCSTR WINAPI D3DXGetPixelShaderProfile(LPDIRECT3DDEVICE9 device); UINT WINAPI D3DXGetShaderSize(const DWORD *byte_code); DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); +HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVOID* data, UINT* size); HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, CONST D3DXMACRO* defines,

1 0