July 2010 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9/tests: Add a test for handling floating point specials in shaders.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: da0582a624d5f25234a41ce7853b7e8aea2a0a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0582a624d5f25234a41ce78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:55 2010 +0200 d3d9/tests: Add a test for handling floating point specials in shaders. --- dlls/d3d9/tests/visual.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 202 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da0582a624d5f25234a41…

1 0

Henri Verbeet : d3d9/tests: Fix an ok() message in pointsize_test().
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 7b3d200ab31b8fc1d9775d1609f7e074d1bed5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3d200ab31b8fc1d9775d160… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:56 2010 +0200 d3d9/tests: Fix an ok() message in pointsize_test(). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 104b569..1aecb86 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8598,7 +8598,7 @@ static void pointsize_test(IDirect3DDevice9 *device) "Expected color 0x00ff0000, got 0x%08x.\n", color); color = getPixelColor(device, 64+4, 64-4); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 0), - "Expected color 0x0000ff00, got 0x%08x.\n", color); + "Expected color 0x00ffff00, got 0x%08x.\n", color); color = getPixelColor(device, 64-4, 64+4); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00), 0), "Expected color 0x00000000, got 0x%08x.\n", color);

1 0

Henri Verbeet : ddraw: Use a less offensive handle table implementation for materials.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 0cb4de4542816739825bf9cb8528d201ccb81d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb4de4542816739825bf9cb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:57 2010 +0200 ddraw: Use a less offensive handle table implementation for materials. --- dlls/ddraw/ddraw_private.h | 30 +++++++++++- dlls/ddraw/device.c | 63 ++++++++++++------------- dlls/ddraw/direct3d.c | 10 ++++ dlls/ddraw/executebuffer.c | 26 ++++------ dlls/ddraw/main.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/material.c | 13 ++--- dlls/ddraw/viewport.c | 34 ++++++-------- 7 files changed, 213 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cb4de4542816739825bf…

1 0

Stefan Dösinger : wined3d: Use powf instead of pow.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: b25f22e45648ff07453fcc63ab2dbe0f488cc706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25f22e45648ff07453fcc63a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:05:37 2010 +0200 wined3d: Use powf instead of pow. --- dlls/wined3d/wined3d_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77ef661..7e53c90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -192,9 +192,9 @@ static inline float float_16_to_32(const unsigned short *in) { if(e == 0) { if(m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ - else return sgn * pow(2, -14.0f) * ((float)m / 1024.0f); + else return sgn * powf(2, -14.0f) * ((float)m / 1024.0f); } else if(e < 31) { - return sgn * pow(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); + return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { if(m == 0) return sgn / 0.0f; /* +INF / -INF */ else return 0.0f / 0.0f; /* NAN */ @@ -210,11 +210,11 @@ static inline float float_24_to_32(DWORD in) if (e == 0) { if (m == 0) return sgn * 0.0f; /* +0.0 or -0.0 */ - else return sgn * pow(2, -6.0f) * ((float)m / 524288.0f); + else return sgn * powf(2, -6.0f) * ((float)m / 524288.0f); } else if (e < 15) { - return sgn * pow(2, (float)e - 7.0f) * (1.0f + ((float)m / 524288.0f)); + return sgn * powf(2, (float)e - 7.0f) * (1.0f + ((float)m / 524288.0f)); } else {

1 0

Stefan Dösinger : wined3d: Use a int for the mantissa in float_24_to_32.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 81b03d88910cb3a268d04c2d42732cd0ecc65eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b03d88910cb3a268d04c2d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:06:38 2010 +0200 wined3d: Use a int for the mantissa in float_24_to_32. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e53c90..bc5757b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,7 +205,7 @@ static inline float float_24_to_32(DWORD in) { const float sgn = in & 0x800000 ? -1.0f : 1.0f; const unsigned short e = (in & 0x780000) >> 19; - const unsigned short m = in & 0x7ffff; + const unsigned int m = in & 0x7ffff; if (e == 0) {

1 0

Stefan Dösinger : wined3d: Fix an msvc anachronism warning.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 6a87681b11ddbed36d9f34f4e5ce51c5452ad082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a87681b11ddbed36d9f34f4e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:29:15 2010 +0200 wined3d: Fix an msvc anachronism warning. --- dlls/wined3d/wined3d_main.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6330eba..991ea80 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -46,8 +46,8 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; int num_lock = 0; -void (*CDECL wine_tsx11_lock_ptr)(void) = NULL; -void (*CDECL wine_tsx11_unlock_ptr)(void) = NULL; +void (CDECL *wine_tsx11_lock_ptr)(void) = NULL; +void (CDECL *wine_tsx11_unlock_ptr)(void) = NULL; static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc5757b..8b7a0b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -728,8 +728,8 @@ extern const shader_backend_t none_shader_backend DECLSPEC_HIDDEN; /* X11 locking */ -extern void (* CDECL wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; -extern void (* CDECL wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; +extern void (CDECL *wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; +extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; /* As GLX relies on X, this is needed */ extern int num_lock DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Add casts for int to float conversions.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: cc8a45321fb97994820dfdc52d7b845e4d4e1ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8a45321fb97994820dfdc52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:39:03 2010 +0200 wined3d: Add casts for int to float conversions. --- dlls/wined3d/arb_program_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4482d53..0617fe3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -582,9 +582,9 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = stateBlock->pixelShaderConstantI[4 * i]; - val[1] = stateBlock->pixelShaderConstantI[4 * i + 1]; - val[2] = stateBlock->pixelShaderConstantI[4 * i + 2]; + val[0] = (float) stateBlock->pixelShaderConstantI[4 * i]; + val[1] = (float) stateBlock->pixelShaderConstantI[4 * i + 1]; + val[2] = (float) stateBlock->pixelShaderConstantI[4 * i + 2]; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -614,9 +614,9 @@ static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = stateBlock->vertexShaderConstantI[4 * i]; - val[1] = stateBlock->vertexShaderConstantI[4 * i + 1]; - val[2] = stateBlock->vertexShaderConstantI[4 * i + 2]; + val[0] = (float) stateBlock->vertexShaderConstantI[4 * i]; + val[1] = (float) stateBlock->vertexShaderConstantI[4 * i + 1]; + val[2] = (float) stateBlock->vertexShaderConstantI[4 * i + 2]; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -1058,7 +1058,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else if (reg->idx >= rel_offset) sprintf(register_name, "C[%s + %u]", rel_reg, reg->idx - rel_offset); else - sprintf(register_name, "C[%s - %u]", rel_reg, -reg->idx + rel_offset); + sprintf(register_name, "C[%s - %u]", rel_reg, rel_offset - reg->idx); } else { @@ -6981,7 +6981,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac GLenum shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - float size[4] = {surface->pow2Width, surface->pow2Height, 1, 1}; + float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; struct arbfp_blit_priv *priv = device->blit_priv; enum complex_fixup fixup; GLenum textype = surface->texture_target;

1 0

Igor Paliychuk : comdlg32: Fixed Ukrainian standard dialog sizes.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: f0de2d9d257341194f17c2a5cb09bcee08323617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0de2d9d257341194f17c2a5c… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 29 11:21:43 2010 +0300 comdlg32: Fixed Ukrainian standard dialog sizes. --- dlls/comdlg32/cdlg_Uk.rc | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/comdlg32/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc index 3cca40c..6b58806 100644 --- a/dlls/comdlg32/cdlg_Uk.rc +++ b/dlls/comdlg32/cdlg_Uk.rc @@ -152,31 +152,31 @@ FONT 8, "MS Shell Dlg" } -CHOOSE_COLOR DIALOG 36, 24, 310, 185 +CHOOSE_COLOR DIALOG 36, 24, 300, 185 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�� " FONT 8, "MS Shell Dlg" { LTEXT "&�� :", 1088, 4, 4, 140, 10 LTEXT "�&�� :", 1089, 4, 106, 140, 10 - LTEXT "��|��&��", 1090, 148, 151, 48, 10 - LTEXT "&��:", 726 /*1094*/,258,126,24,10 - EDITTEXT 706, 281,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:",727/*1095*/,258,140,24,10 - EDITTEXT 707, 281,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "�&��:",728 /*1096*/,258,154,24,10 - EDITTEXT 708, 281,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "³�&��:" ,723 /*1091*/,205,126,30,10 - EDITTEXT 703, 234,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:" ,724 /*1092*/,202,140,34,10 - EDITTEXT 704, 234,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:" ,725 /*1093*/,196,154,37,10 - EDITTEXT 705, 234,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "��|��&��", 1090, 148, 147, 48, 10 + LTEXT "&��:", 726 /*1094*/,255,126,24,10 + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&��:",727/*1095*/,252,140,24,10 + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "�&��:",728 /*1096*/,254,154,24,10 + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "³�&��:" ,723 /*1091*/,200,126,30,10 + EDITTEXT 703, 229,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&��:" ,724 /*1092*/,197,140,34,10 + EDITTEXT 704, 229,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&��:" ,725 /*1093*/,191,154,37,10 + EDITTEXT 705, 229,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 + CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,3,118,116 + CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,3,8,116 + CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,120,40,26 DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", 1038,100,166, 44, 14 @@ -186,22 +186,22 @@ FONT 8, "MS Shell Dlg" } -FINDDLGORD DIALOG 36, 24, 245, 62 +FINDDLGORD DIALOG 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "��" FONT 8, "MS Shell Dlg" { LTEXT "&��:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 138, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "�� &�崳��", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "��", 1072, 107, 26, 78, 28 - CONTROL "&��", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 - CONTROL "�&��", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 - - DEFPUSHBUTTON "�&�� ", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "�� &�崳��", 1041, 4, 42, 83, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "��", 1072, 107, 26, 68, 28 + CONTROL "&��", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 33, 12 + CONTROL "�&��", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 143, 38, 28, 12 + + DEFPUSHBUTTON "�&�� ", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "��", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP }

1 0

Harald Hoyer : preloader: Fix moving of auxiliary values.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 2bea45dd0a0ca74f53d1560e7498419962b9c34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bea45dd0a0ca74f53d1560e7… Author: Harald Hoyer <harald(a)redhat.com> Date: Thu Jul 29 12:02:06 2010 +0200 preloader: Fix moving of auxiliary values. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 83a5172..2dc2872 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -519,7 +519,7 @@ static void set_auxiliary_values( ElfW(auxv_t) *av, const ElfW(auxv_t) *new_av, } else if (new_count < delete_count) /* get rid of unused values */ { - int len = (char *)(av + av_count + 1) - dst; + int len = (char *)(av + av_count + 1) - src; for (i = len - 1; i >= 0; i--) dst[i] = src[i]; } *stack = dst;

1 0

Nikolay Sivov : shlwapi: Partially implement SHGetShellKey.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: e7395e09e175ac635fa655ca9abb7c66bb549ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7395e09e175ac635fa655ca9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 10:02:02 2010 +0400 shlwapi: Partially implement SHGetShellKey. --- dlls/shlwapi/ordinal.c | 36 ++++++++++++++++++++++-- dlls/shlwapi/tests/ordinal.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 2bf0e79..3e47af6 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4401,12 +4401,42 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) } /*********************************************************************** - * SHGetShellKey (SHLWAPI.@) + * SHGetShellKey (SHLWAPI.491) */ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) { - FIXME("(0x%08x, %s, %d): stub\n", flags, debugstr_w(sub_key), create); - return (HKEY)0x50; + enum _shellkey_flags { + SHKEY_Explorer = 0x00, + SHKEY_Root_HKCU = 0x01 + }; + + static const WCHAR explorerW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r',0}; + HKEY hroot, hkey = NULL; + + TRACE("(0x%08x, %s, %d)\n", flags, debugstr_w(sub_key), create); + + switch (flags) + { + case SHKEY_Explorer | SHKEY_Root_HKCU: + RegOpenKeyExW(HKEY_CURRENT_USER, explorerW, 0, MAXIMUM_ALLOWED, &hroot); + break; + case 0: + return NULL; + default: + FIXME("unsupported flags (0x%08x)\n", flags); + return (HKEY)0xdeadbeef; + } + + if (create) + RegCreateKeyExW(hroot, sub_key, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hkey, NULL); + else + RegOpenKeyExW(hroot, sub_key, 0, MAXIMUM_ALLOWED, &hkey); + + RegCloseKey(hroot); + return hkey; } /*********************************************************************** diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index c3c59c4..0089a43 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -36,6 +36,7 @@ /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; static BOOL is_win2k_and_lower; +static BOOL is_win9x; static int (WINAPI *pSHSearchMapInt)(const int*,const int*,int,int); static HRESULT (WINAPI *pGetAcceptLanguagesA)(LPSTR,LPDWORD); @@ -60,6 +61,7 @@ static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); +static HKEY (WINAPI *pSHGetShellKey)(DWORD, LPWSTR, BOOL); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2675,6 +2677,62 @@ static void test_SHSetIniString(void) DeleteFileW(TestIniW); } +enum _shellkey_flags { + SHKEY_Explorer = 0x00, + SHKEY_Root_HKCU = 0x01 +}; + +static void test_SHGetShellKey(void) +{ + void *pPathBuildRootW = GetProcAddress(hShlwapi, "PathBuildRootW"); + HKEY hkey, hkey2; + DWORD ret; + + if (!pSHGetShellKey) + { + win_skip("SHGetShellKey(ordinal 491) isn't available\n"); + return; + } + + /* some win2k */ + if (pPathBuildRootW && pPathBuildRootW == pSHGetShellKey) + { + win_skip("SHGetShellKey(ordinal 491) used for PathBuildRootW\n"); + return; + } + + if (is_win9x || is_win2k_and_lower) + { + win_skip("Ordinal 491 used for another call, skipping SHGetShellKey tests\n"); + return; + } + + /* marking broken cause latest Vista+ versions fail here */ + SetLastError(0xdeadbeef); + hkey = pSHGetShellKey(SHKEY_Explorer, NULL, FALSE); + ok(hkey == NULL || broken(hkey != NULL), "got %p\n", hkey); + if (hkey) + { + hkey2 = 0; + ret = RegOpenKeyExA(hkey, "Shell Folders", 0, KEY_READ, &hkey2); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(hkey2 != NULL, "got %p\n", hkey2); + RegCloseKey( hkey2 ); + RegCloseKey( hkey ); + } + + hkey = pSHGetShellKey(SHKEY_Explorer | SHKEY_Root_HKCU, NULL, FALSE); + ok(hkey != NULL, "got %p\n", hkey); + + hkey2 = 0; + ret = RegOpenKeyExA(hkey, "Shell Folders", 0, KEY_READ, &hkey2); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(hkey2 != NULL, "got %p\n", hkey2); + RegCloseKey( hkey2 ); + + RegCloseKey( hkey ); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2698,6 +2756,7 @@ static void init_pointers(void) MAKEFUNC(SHIShellFolder_EnumObjects, 404); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); + MAKEFUNC(SHGetShellKey, 491); MAKEFUNC(SHPropertyBag_ReadLONG, 496); MAKEFUNC(IUnknown_ProfferService, 514); #undef MAKEFUNC @@ -2707,6 +2766,7 @@ START_TEST(ordinal) { hShlwapi = GetModuleHandleA("shlwapi.dll"); is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; + is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ init_pointers(); @@ -2734,6 +2794,7 @@ START_TEST(ordinal) test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); test_SHSetIniString(); + test_SHGetShellKey(); FreeLibrary(hshell32); FreeLibrary(hmlang);

1 0