April 2009 - Wine-commits - list.winehq.org

Juan Lang : cryptui: If an input file name is given to CryptUIWizImport, show it in the wizard.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: b6682f96f7ff042b04ce6883b7873ff9cb0118ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6682f96f7ff042b04ce6883b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Apr 27 18:10:54 2009 -0700 cryptui: If an input file name is given to CryptUIWizImport, show it in the wizard. --- dlls/cryptui/main.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f29f1e6..f6fb60c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4993,6 +4993,12 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ImportWizData *)page->lParam; SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + if (data->fileName) + { + HWND fileNameEdit = GetDlgItem(hwnd, IDC_IMPORT_FILENAME); + + SendMessageW(fileNameEdit, WM_SETTEXT, 0, (LPARAM)data->fileName); + } break; } case WM_NOTIFY: @@ -5383,10 +5389,15 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, data.dwFlags = dwFlags; data.pwszWizardTitle = pwszWizardTitle; if (pImportSrc) + { memcpy(&data.importSrc, pImportSrc, sizeof(data.importSrc)); + data.fileName = (LPWSTR)pImportSrc->u.pwszFileName; + } else + { memset(&data.importSrc, 0, sizeof(data.importSrc)); - data.fileName = NULL; + data.fileName = NULL; + } data.freeSource = FALSE; data.hDestCertStore = hDestCertStore; data.freeDest = FALSE; @@ -5470,7 +5481,8 @@ static BOOL show_import_ui(DWORD dwFlags, HWND hwndParent, hdr.u4.pszbmWatermark = MAKEINTRESOURCEW(IDB_CERT_WATERMARK); hdr.u5.pszbmHeader = MAKEINTRESOURCEW(IDB_CERT_HEADER); PropertySheetW(&hdr); - HeapFree(GetProcessHeap(), 0, data.fileName); + if (data.fileName != data.importSrc.u.pwszFileName) + HeapFree(GetProcessHeap(), 0, data.fileName); if (data.freeSource && data.importSrc.dwSubjectChoice == CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE) CertCloseStore(data.importSrc.u.hCertStore, 0);

1 0

Henri Verbeet : wined3d: Create a separate function to record register usage.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: e00187616307740bd1da7c2ccde548f56a9a115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00187616307740bd1da7c2cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:28 2009 +0200 wined3d: Create a separate function to record register usage. --- dlls/wined3d/baseshader.c | 146 ++++++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 20 +++-- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 96 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e00187616307740bd1da7…

1 0

Henri Verbeet : wined3d: Use shader_sm1_read_dst_param() and shader_sm1_read_src_param() in shader_get_registers_used().
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 0df4514894c0b1a33fd15d730c3e735d7da75f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df4514894c0b1a33fd15d730… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:28 2009 +0200 wined3d: Use shader_sm1_read_dst_param() and shader_sm1_read_src_param() in shader_get_registers_used(). --- dlls/wined3d/baseshader.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 21c99fc..d565fb3 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -763,36 +763,43 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m } /* This will loop over all the registers and try to - * make a bitmask of the ones we're interested in. + * make a bitmask of the ones we're interested in. * - * Relative addressing tokens are ignored, but that's - * okay, since we'll catch any address registers when + * Relative addressing tokens are ignored, but that's + * okay, since we'll catch any address registers when * they are initialized (required by spec) */ - limit = ins.dst_count + ins.src_count + (ins.predicate ? 1 : 0); - - for (i = 0; i < limit; ++i) { - - DWORD param, addr_token, reg, regtype; - pToken += shader_get_param(pToken, shader_version, &param, &addr_token); + if (ins.dst_count) + { + struct wined3d_shader_dst_param dst_param; + struct wined3d_shader_src_param dst_rel_addr; - regtype = shader_get_regtype(param); - reg = param & WINED3DSP_REGNUM_MASK; + shader_sm1_read_dst_param(&pToken, &dst_param, &dst_rel_addr, shader_version); /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and * is used in >= 3.0 shaders. Filter 3.0 shaders to prevent overflows, and also filter pixel * shaders because TECRDOUT isn't used in them, but future register types might cause issues */ - if (regtype == WINED3DSPR_TEXCRDOUT && i == 0 /* Only look at writes */ - && !pshader && WINED3DSHADER_VERSION_MAJOR(shader_version) < 3) + if (!pshader && WINED3DSHADER_VERSION_MAJOR(shader_version) < 3 + && dst_param.register_type == WINED3DSPR_TEXCRDOUT) { - reg_maps->texcoord_mask[reg] |= shader_get_writemask(param); + reg_maps->texcoord_mask[dst_param.register_type] |= dst_param.write_mask; } else { - shader_record_register_usage(This, reg_maps, regtype, reg, - param & WINED3DSHADER_ADDRMODE_RELATIVE, pshader); + shader_record_register_usage(This, reg_maps, dst_param.register_type, + dst_param.register_idx, !!dst_param.rel_addr, pshader); } } + + limit = ins.src_count + (ins.predicate ? 1 : 0); + for (i = 0; i < limit; ++i) + { + struct wined3d_shader_src_param src_param, src_rel_addr; + + shader_sm1_read_src_param(&pToken, &src_param, &src_rel_addr, shader_version); + shader_record_register_usage(This, reg_maps, src_param.register_type, + src_param.register_idx, !!src_param.rel_addr, pshader); + } } } ++pToken;

1 0

Henri Verbeet : wined3d: Clear reg_maps in shader_get_registers_used() instead of the callers.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 9db67a59712d4b8cdce52b022d2b7926e25b6198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db67a59712d4b8cdce52b022… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:29 2009 +0200 wined3d: Clear reg_maps in shader_get_registers_used() instead of the callers. --- dlls/wined3d/baseshader.c | 3 +-- dlls/wined3d/pixelshader.c | 1 - dlls/wined3d/vertexshader.c | 1 - 3 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d565fb3..fb5effc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -556,8 +556,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m /* There are some minor differences between pixel and vertex shaders */ - memset(reg_maps->bumpmat, 0, sizeof(reg_maps->bumpmat)); - memset(reg_maps->luminanceparams, 0, sizeof(reg_maps->luminanceparams)); + memset(reg_maps, 0, sizeof(*reg_maps)); /* get_registers_used is called on every compile on some 1.x shaders, which can result * in stacking up a collection of local constants. Delete the old constants if existing diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 0b1aa1d..04b5c61 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -314,7 +314,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i list_init(&This->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc.. */ - memset(reg_maps, 0, sizeof(shader_reg_maps)); hr = shader_get_registers_used((IWineD3DBaseShader *)This, reg_maps, This->semantics_in, NULL, pFunction); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6d4dc24..b373caa 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -329,7 +329,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader /* Second pass: figure out registers used, semantics, etc.. */ This->min_rel_offset = GL_LIMITS(vshader_constantsF); This->max_rel_offset = 0; - memset(reg_maps, 0, sizeof(shader_reg_maps)); hr = shader_get_registers_used((IWineD3DBaseShader*) This, reg_maps, This->semantics_in, This->semantics_out, pFunction); if (hr != WINED3D_OK) return hr;

1 0

Henri Verbeet : wined3d: Mask set bool/int constants with bool/ int constants read.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: b8b12d2dc287f092f4ada1e6bc1e4ea46deaa029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b12d2dc287f092f4ada1e6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 28 09:53:29 2009 +0200 wined3d: Mask set bool/int constants with bool/int constants read. --- dlls/wined3d/glsl_shader.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 329ae94..a1bded3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -558,18 +558,12 @@ static void shader_glsl_load_constants( prog->vuniformF_locations, &priv->vconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for vertex shader */ - if (vshader->baseShader.reg_maps.integer_constants) - { - shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, - stateBlock->vertexShaderConstantI, stateBlock->changed.vertexShaderConstantsI); - } + shader_glsl_load_constantsI(vshader, gl_info, prog->vuniformI_locations, stateBlock->vertexShaderConstantI, + stateBlock->changed.vertexShaderConstantsI & vshader->baseShader.reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for vertex shader */ - if (vshader->baseShader.reg_maps.boolean_constants) - { - shader_glsl_load_constantsB(vshader, gl_info, programId, - stateBlock->vertexShaderConstantB, stateBlock->changed.vertexShaderConstantsB); - } + shader_glsl_load_constantsB(vshader, gl_info, programId, stateBlock->vertexShaderConstantB, + stateBlock->changed.vertexShaderConstantsB & vshader->baseShader.reg_maps.boolean_constants); /* Upload the position fixup params */ GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &deviceImpl->posFixup[0])); @@ -585,18 +579,12 @@ static void shader_glsl_load_constants( prog->puniformF_locations, &priv->pconst_heap, priv->stack, constant_version); /* Load DirectX 9 integer constants/uniforms for pixel shader */ - if (pshader->baseShader.reg_maps.integer_constants) - { - shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, - stateBlock->pixelShaderConstantI, stateBlock->changed.pixelShaderConstantsI); - } + shader_glsl_load_constantsI(pshader, gl_info, prog->puniformI_locations, stateBlock->pixelShaderConstantI, + stateBlock->changed.pixelShaderConstantsI & pshader->baseShader.reg_maps.integer_constants); /* Load DirectX 9 boolean constants/uniforms for pixel shader */ - if (pshader->baseShader.reg_maps.boolean_constants) - { - shader_glsl_load_constantsB(pshader, gl_info, programId, - stateBlock->pixelShaderConstantB, stateBlock->changed.pixelShaderConstantsB); - } + shader_glsl_load_constantsB(pshader, gl_info, programId, stateBlock->pixelShaderConstantB, + stateBlock->changed.pixelShaderConstantsB & pshader->baseShader.reg_maps.boolean_constants); /* Upload the environment bump map matrix if needed. The needsbumpmat member specifies the texture stage to load the matrix from. * It can't be 0 for a valid texbem instruction.

1 0

Alexandre Julliard : wininet: Add stubs for PrivacyGet/SetZonePreferenceW.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: e12ade9fb39fd0d9b78c052496f301b8bfe446a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12ade9fb39fd0d9b78c05249… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 20:04:34 2009 +0200 wininet: Add stubs for PrivacyGet/SetZonePreferenceW. --- dlls/wininet/internet.c | 19 +++++++++++++++++++ dlls/wininet/wininet.spec | 4 ++-- include/wininet.h | 17 +++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 785a1ef..4bb25e7 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3815,6 +3815,25 @@ DWORD WINAPI InternetConfirmZoneCrossingW( HWND hWnd, LPWSTR szUrlPrev, LPWSTR s return ERROR_SUCCESS; } +/*********************************************************************** + * PrivacySetZonePreferenceW (WININET.@) + */ +DWORD WINAPI PrivacySetZonePreferenceW( DWORD zone, DWORD type, DWORD template, LPCWSTR preference ) +{ + FIXME( "%x %x %x %s: stub\n", zone, type, template, debugstr_w(preference) ); + return 0; +} + +/*********************************************************************** + * PrivacyGetZonePreferenceW (WININET.@) + */ +DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template, + LPWSTR preference, LPDWORD length ) +{ + FIXME( "%x %x: stub\n", zone, type ); + return 0; +} + DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, DWORD_PTR* lpdwConnection, DWORD dwReserved ) { diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 78b98cc..61beaf4 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -213,8 +213,8 @@ @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stub LoadUrlCacheContent @ stub ParseX509EncodedCertificateForListBoxEntry -@ stub PrivacyGetZonePreferenceW # (long long ptr ptr ptr) -@ stub PrivacySetZonePreferenceW # (long long long wstr) +@ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) +@ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) @ stdcall RegisterUrlCacheNotification(ptr long long long long long) @ stdcall ResumeSuspendedDownload(long long) diff --git a/include/wininet.h b/include/wininet.h index d3263fe..6ce8ae0 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1356,6 +1356,23 @@ INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingA(HWND ,LPSTR ,LPSTR ,BOOL); INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingW(HWND ,LPWSTR ,LPWSTR ,BOOL); #define InternetConfirmZoneCrossing WINELIB_NAME_AW(InternetConfirmZoneCrossing) +#define PRIVACY_TEMPLATE_NO_COOKIES 0 +#define PRIVACY_TEMPLATE_HIGH 1 +#define PRIVACY_TEMPLATE_MEDIUM_HIGH 2 +#define PRIVACY_TEMPLATE_MEDIUM 3 +#define PRIVACY_TEMPLATE_MEDIUM_LOW 4 +#define PRIVACY_TEMPLATE_LOW 5 +#define PRIVACY_TEMPLATE_CUSTOM 100 +#define PRIVACY_TEMPLATE_ADVANCED 101 + +#define PRIVACY_TEMPLATE_MAX PRIVACY_TEMPLATE_LOW + +#define PRIVACY_TYPE_FIRST_PARTY 0 +#define PRIVACY_TYPE_THIRD_PARTY 1 + +INTERNETAPI DWORD WINAPI PrivacySetZonePreferenceW(DWORD,DWORD,DWORD,LPCWSTR); +INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LPDWORD); + #define INTERNET_ERROR_BASE 12000 #define ERROR_INTERNET_OUT_OF_HANDLES (INTERNET_ERROR_BASE + 1)

1 0

Alexandre Julliard : wininet: Fix a memory leak in the URL cache.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 7e11ecdd8d2db70526f284c43bf7a7f1ebd14a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e11ecdd8d2db70526f284c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 20:04:45 2009 +0200 wininet: Fix a memory leak in the URL cache. --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index b4feba3..5e1541d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -692,6 +692,7 @@ static LPURLCACHE_HEADER URLCacheContainer_LockIndex(URLCACHECONTAINER * pContai * of the memory mapped file */ if (pHeader->dwFileSize != pContainer->file_size) { + UnmapViewOfFile( pHeader ); URLCacheContainer_CloseIndex(pContainer); error = URLCacheContainer_OpenIndex(pContainer); if (error != ERROR_SUCCESS)

1 0

Paul Vriens : gdi32/tests: Fix some test failures on Win9x/WinME.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 75f6b1d6363207dc7848121f235b797a38caaea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f6b1d6363207dc7848121f2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 14:35:51 2009 +0200 gdi32/tests: Fix some test failures on Win9x/WinME. --- dlls/gdi32/tests/bitmap.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 75f3310..bfbeee0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1441,6 +1441,13 @@ static void test_GetDIBits(void) 0,0,0,0, 0xff,0xff,0,0, 0,0,0,0, 0xff,0xff,0,0, 0,0,0,0, 0xff,0xff,0,0, 0,0,0,0, 0xff,0xff,0,0 }; + static const BYTE dib_bits_1_9x[16 * 4] = + { + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, + 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa, 0,0,0xaa,0xaa, 0xff,0xff,0xaa,0xaa + }; /* 2-bytes aligned 24-bit bitmap data: 16x16 */ static const BYTE bmp_bits_24[16 * 16*3] = { @@ -1592,15 +1599,21 @@ static void test_GetDIBits(void) } /* returned bits are DWORD aligned and upside down */ - ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); + ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)) || + broken(!memcmp(buf, dib_bits_1_9x, sizeof(dib_bits_1_9x))), /* Win9x, WinME */ + "DIB bits don't match\n"); /* Test the palette indices */ memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); SetLastError(0xdeadbeef); lines = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS); - - ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); - ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + if (lines == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + win_skip("Win9x/WinMe doesn't handle 0 for the number of scan lines\n"); + else + { + ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); + ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + } for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[1]); @@ -1708,15 +1721,21 @@ static void test_GetDIBits(void) /* returned bits are DWORD aligned and upside down */ todo_wine - ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)), "DIB bits don't match\n"); + ok(!memcmp(buf, dib_bits_1, sizeof(dib_bits_1)) || + broken(!memcmp(buf, dib_bits_1_9x, sizeof(dib_bits_1_9x))), /* Win9x, WinME */ + "DIB bits don't match\n"); /* Test the palette indices */ memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); SetLastError(0xdeadbeef); lines = GetDIBits(hdc, hbmp, 0, 0, NULL, bi, DIB_PAL_COLORS); - - ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); - ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + if (lines == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + win_skip("Win9x/WinMe doesn't handle 0 for the number of scan lines\n"); + else + { + ok(((WORD*)bi->bmiColors)[0] == 0, "Color 0 is %d\n", ((WORD*)bi->bmiColors)[0]); + ok(((WORD*)bi->bmiColors)[1] == 1, "Color 1 is %d\n", ((WORD*)bi->bmiColors)[1]); + } for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[i]);

1 0

Paul Vriens : ws2_32/tests: Run tests again on several platforms due to missing functions.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: ffd855d21422325cea240a66d6e35da4d98558a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd855d21422325cea240a66d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 16:47:49 2009 +0200 ws2_32/tests: Run tests again on several platforms due to missing functions. --- dlls/ws2_32/tests/sock.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8316982..e7c9868 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -56,7 +56,8 @@ } while (0); /* Function pointers */ -static HMODULE hws2_32 = 0; +static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW) = 0; +static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *) = 0; static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG) = 0; /**************** Structs and typedefs ***************/ @@ -841,6 +842,11 @@ static void Init (void) { WORD ver = MAKEWORD (2, 2); WSADATA data; + HMODULE hws2_32 = GetModuleHandle("ws2_32.dll"); + + pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); + pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); + pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -2016,9 +2022,6 @@ static void test_addr_to_print(void) u_char addr3_Num[16] = {0x20,0x30,0xa4,0xb1}; PCSTR addr3_Str = "2030:a4b1::"; - hws2_32 = GetModuleHandle("ws2_32.dll"); - pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); - in.s_addr = addr0_Num; pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); @@ -2382,22 +2385,28 @@ static void test_GetAddrInfoW(void) int ret; ADDRINFOW *result, hint; + if (!pGetAddrInfoW || !pFreeAddrInfoW) + { + win_skip("GetAddrInfoW and/or FreeAddrInfoW not present\n"); + return; + } + memset(&hint, 0, sizeof(ADDRINFOW)); - ret = GetAddrInfoW(NULL, NULL, NULL, &result); + ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); - ret = GetAddrInfoW(localhost, NULL, NULL, &result); + ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - FreeAddrInfoW(result); + pFreeAddrInfoW(result); - ret = GetAddrInfoW(localhost, port, NULL, &result); + ret = pGetAddrInfoW(localhost, port, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - FreeAddrInfoW(result); + pFreeAddrInfoW(result); - ret = GetAddrInfoW(localhost, port, &hint, &result); + ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); - FreeAddrInfoW(result); + pFreeAddrInfoW(result); } /**************** Main program ***************/

1 0

Paul Vriens : gdi32/tests: Fix a test failure on NT4.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: f043f3db27089f2da5f676abe016fbdeeebdd20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f043f3db27089f2da5f676abe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 27 19:48:17 2009 +0200 gdi32/tests: Fix a test failure on NT4. --- dlls/gdi32/tests/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c10d6e8..88e1797 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1785,7 +1785,9 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) ok(efdw.total > 0, "fonts enumerated: NULL\n"); ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); - ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + ok(russian_charset > 0 || + broken(russian_charset == 0), /* NT4 */ + "NULL family should enumerate RUSSIAN_CHARSET\n"); } efdw.total = 0;

1 0