December 2008 - Wine-Commits

Jeremy Newman : adding missing templates from site redesign
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: f9570240a47a0e066ed08841e7c76de3338aee19 URL: http://source.winehq.org/git/website.git/?a=commit;h=f9570240a47a0e066ed088… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 5 16:29:49 2008 -0600 adding missing templates from site redesign --- templates/en/announce.template | 7 +++ templates/en/home.template | 95 +++++++++++++++++++++++++++++++++++++++ templates/en/interview.template | 8 +++ templates/en/lang.template | 19 ++++++++ templates/en/news.template | 11 +++++ 5 files changed, 140 insertions(+), 0 deletions(-) diff --git a/templates/en/announce.template b/templates/en/announce.template new file mode 100644 index 0000000..0f82da6 --- /dev/null +++ b/templates/en/announce.template @@ -0,0 +1,7 @@ + + + +<h1 class="title">Wine Announcement</h1> + + + diff --git a/templates/en/home.template b/templates/en/home.template new file mode 100644 index 0000000..592b9d6 --- /dev/null +++ b/templates/en/home.template @@ -0,0 +1,95 @@ + + + + +<div id="main_left"> + + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 25px 10px 10px 60px; height: 445px; overflow: auto;"> + <ul class="winehq_menu"> + + <li class="info" onClick="document.location='{$root}/about/';"> + <a href="{$root}/about/"> + <span class="title">Information</span></a><br> + <span class="subtitle">Overview of Wine features.</span> + </li> + + <li class="dl" onClick="document.location='{$root}/download/';"> + <a href="{$root}/download/"> + <span class="title">Download</span></a><br> + <span class="subtitle">Get Wine now!</span> + </li> + + <li class="help" onClick="document.location='{$root}/help/';"> + <a href="{$root}/help/"> + <span class="title">Help!</span></a><br> + <span class="subtitle">Documentation, Support, and Wiki.</span> + </li> + + <li class="devel" onClick="document.location='{$root}/devel/';"> + <a href="{$root}/devel/"> + <span class="title">Development</span></a><br> + <span class="subtitle">Wine source, Bug Tracking, etc.</span> + </li> + + <li class="donate" onClick="document.donateForm.submit();"> + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> + <a href="javascript:document.donateForm.submit();"> + <span class="title">Donate</span></a> + <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="business" value="donate(a)winehq.org"> + <input type="hidden" name="item_name" value="Wine donation"> + </form> + <span class="subtitle">Dontate to Wine.</span> + </li> + + </ul> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + + +</div> +<div id="main_right"> + + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 10px; height: 75px; overflow: auto;"> + + <h3 class="title">Latest Releases</h3> + + <table class="releases" cellspacing="5"> + <tr><td>Stable:</td> + <td><b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> + + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + </span></td></tr> + <tr><td>Development:</td> + <td><b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + </span></td></tr> + </table> + + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + + <div class="rbox" style="margin-top: 15px;"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 10px; height: 340px; overflow: auto;"> + + <h3 class="title">News</h3> + <div style="text-align: right; margin: 0;"><a href="{$root}/news/" class="small">more news...</a></div> + +  + + <div style="text-align: right; margin: 0;"><a href="{$root}/news/" class="small">more news...</a></div> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + +</div> + diff --git a/templates/en/interview.template b/templates/en/interview.template new file mode 100644 index 0000000..7c658c0 --- /dev/null +++ b/templates/en/interview.template @@ -0,0 +1,8 @@ + + + +<h1 class="title">Interviews</h1> + + + + diff --git a/templates/en/lang.template b/templates/en/lang.template new file mode 100644 index 0000000..0054a66 --- /dev/null +++ b/templates/en/lang.template @@ -0,0 +1,19 @@ + + + +<h1 class="title">Pick Your Language</h1> + + + +<blockquote> + + <p> + <a href="{$root}/lang/en"><img src="{$root}/images/lang/en.png" alt="English" /> English</a> + </p> + + <p> + <a href="{$root}/lang/es"><img src="{$root}/images/lang/es.png" alt="Español" /> Español</a> + </p> + +</blockquote> + diff --git a/templates/en/news.template b/templates/en/news.template new file mode 100644 index 0000000..0cf7916 --- /dev/null +++ b/templates/en/news.template @@ -0,0 +1,11 @@ + + + +<h1 class="title">News</h1> + + + +<ul class="rss"> + <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> +</ul> +

1 0

Jeremy Newman : new images for website
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: d86767d97b538c28d08672c22ad958c9f3947563 URL: http://source.winehq.org/git/website.git/?a=commit;h=d86767d97b538c28d08672… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 5 16:27:02 2008 -0600 new images for website --- images/bg.jpg | Bin 0 -> 86167 bytes images/cw_logo_sm.png | Bin 0 -> 4383 bytes images/main_devel.png | Bin 0 -> 4385 bytes images/main_devel_s.png | Bin 0 -> 4572 bytes images/main_dl.png | Bin 0 -> 4439 bytes images/main_dl_s.png | Bin 0 -> 4633 bytes images/main_donate.png | Bin 0 -> 4235 bytes images/main_donate_s.png | Bin 0 -> 4455 bytes images/main_help.png | Bin 0 -> 4148 bytes images/main_help_s.png | Bin 0 -> 4384 bytes images/main_info.png | Bin 0 -> 3891 bytes images/main_info_s.png | Bin 0 -> 4199 bytes images/side_menu_bg.png | Bin 0 -> 226 bytes images/side_menu_bot.png | Bin 0 -> 564 bytes images/side_menu_top.png | Bin 0 -> 3287 bytes images/tab_h.png | Bin 0 -> 584 bytes images/tab_s.png | Bin 0 -> 614 bytes images/tab_u.png | Bin 0 -> 616 bytes images/winehq_logo_16.png | Bin 0 -> 917 bytes images/winehq_logo_glass.png | Bin 0 -> 36271 bytes images/winehq_logo_glass_sm.png | Bin 0 -> 14291 bytes images/winehq_logo_text.png | Bin 0 -> 6870 bytes 22 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/bg.jpg b/images/bg.jpg new file mode 100644 index 0000000..16bb0b5 Binary files /dev/null and b/images/bg.jpg differ diff --git a/images/cw_logo_sm.png b/images/cw_logo_sm.png new file mode 100644 index 0000000..3099535 Binary files /dev/null and b/images/cw_logo_sm.png differ diff --git a/images/main_devel.png b/images/main_devel.png new file mode 100644 index 0000000..669cbee Binary files /dev/null and b/images/main_devel.png differ diff --git a/images/main_devel_s.png b/images/main_devel_s.png new file mode 100644 index 0000000..83fb312 Binary files /dev/null and b/images/main_devel_s.png differ diff --git a/images/main_dl.png b/images/main_dl.png new file mode 100644 index 0000000..0457dea Binary files /dev/null and b/images/main_dl.png differ diff --git a/images/main_dl_s.png b/images/main_dl_s.png new file mode 100644 index 0000000..d0602d3 Binary files /dev/null and b/images/main_dl_s.png differ diff --git a/images/main_donate.png b/images/main_donate.png new file mode 100644 index 0000000..375357f Binary files /dev/null and b/images/main_donate.png differ diff --git a/images/main_donate_s.png b/images/main_donate_s.png new file mode 100644 index 0000000..0910363 Binary files /dev/null and b/images/main_donate_s.png differ diff --git a/images/main_help.png b/images/main_help.png new file mode 100644 index 0000000..af7aa31 Binary files /dev/null and b/images/main_help.png differ diff --git a/images/main_help_s.png b/images/main_help_s.png new file mode 100644 index 0000000..43118a5 Binary files /dev/null and b/images/main_help_s.png differ diff --git a/images/main_info.png b/images/main_info.png new file mode 100644 index 0000000..c62c870 Binary files /dev/null and b/images/main_info.png differ diff --git a/images/main_info_s.png b/images/main_info_s.png new file mode 100644 index 0000000..3357e26 Binary files /dev/null and b/images/main_info_s.png differ diff --git a/images/side_menu_bg.png b/images/side_menu_bg.png new file mode 100644 index 0000000..c8cbcc0 Binary files /dev/null and b/images/side_menu_bg.png differ diff --git a/images/side_menu_bot.png b/images/side_menu_bot.png new file mode 100644 index 0000000..8bc9b5d Binary files /dev/null and b/images/side_menu_bot.png differ diff --git a/images/side_menu_top.png b/images/side_menu_top.png new file mode 100644 index 0000000..047c4c0 Binary files /dev/null and b/images/side_menu_top.png differ diff --git a/images/tab_h.png b/images/tab_h.png new file mode 100644 index 0000000..59620cd Binary files /dev/null and b/images/tab_h.png differ diff --git a/images/tab_s.png b/images/tab_s.png new file mode 100644 index 0000000..54d367b Binary files /dev/null and b/images/tab_s.png differ diff --git a/images/tab_u.png b/images/tab_u.png new file mode 100644 index 0000000..ff84b7a Binary files /dev/null and b/images/tab_u.png differ diff --git a/images/winehq_logo_16.png b/images/winehq_logo_16.png new file mode 100644 index 0000000..83d2c4c Binary files /dev/null and b/images/winehq_logo_16.png differ diff --git a/images/winehq_logo_glass.png b/images/winehq_logo_glass.png new file mode 100644 index 0000000..b164d46 Binary files /dev/null and b/images/winehq_logo_glass.png differ diff --git a/images/winehq_logo_glass_sm.png b/images/winehq_logo_glass_sm.png new file mode 100644 index 0000000..949334b Binary files /dev/null and b/images/winehq_logo_glass_sm.png differ diff --git a/images/winehq_logo_text.png b/images/winehq_logo_text.png new file mode 100644 index 0000000..29b6ecb Binary files /dev/null and b/images/winehq_logo_text.png differ

1 0

Jeremy Newman : update and fix broken urls
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

1 0

Jeremy Newman : update URLs in news to new scheme
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

1 0

Jeremy Newman : WineHQ redesign
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: eab5cc1e6dc6f36339018b11d97e47135b3dde45 URL: http://source.winehq.org/git/website.git/?a=commit;h=eab5cc1e6dc6f36339018b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 5 16:21:48 2008 -0600 WineHQ redesign * new skin for the webite * updated website template engine for new URL stucture * moved wwn,news,interviews to plugins * dropped sidebar navigation code, no longer used on main site * other cleanup and removal of dead code --- favicon.ico | Bin 3638 -> 1406 bytes images/classic_top_logo.png | Bin 15430 -> 0 bytes images/ppdonate.gif | Bin 2700 -> 0 bytes images/ppdonate.png | Bin 2498 -> 0 bytes images/top_logo.xcf | Bin 39690 -> 0 bytes images/winehq_border_bottom_left.gif | Bin 125 -> 0 bytes images/winehq_border_bottom_right.gif | Bin 105 -> 0 bytes images/winehq_border_dot_left.gif | Bin 114 -> 0 bytes images/winehq_border_dot_right.gif | Bin 114 -> 0 bytes images/winehq_border_top_left.gif | Bin 125 -> 0 bytes images/winehq_border_top_right.gif | Bin 105 -> 0 bytes images/winehq_top_logo.gif | Bin 6679 -> 0 bytes images/winehq_top_logo.png | Bin 5934 -> 0 bytes include/XMLToArray.php | 96 -- include/config.php | 102 +- include/globals.conf.sample | 7 +- include/html.php | 1401 +++++++++++++------- include/incl.php | 54 +- include/menu.php | 193 --- include/plugin.php | 16 +- include/themes/winehq/box.template | 10 - include/themes/winehq/box_title.template | 37 - include/themes/winehq/content.template | 112 +- include/themes/winehq/content_nobox.template | 72 + include/themes/winehq/home_page.template | 18 - include/themes/winehq/menu.template | 9 - include/themes/winehq/menu_item_row.template | 10 - include/themes/winehq/menu_lang_row.template | 12 - include/themes/winehq/menu_search_row.template | 21 - include/themes/winehq/menu_spacer_row.template | 7 - include/themes/winehq/menu_top_row.template | 17 - include/utils.php | 172 +++- include/winehq.php | 18 - include/wwn.php | 153 ++- jquery.js | 32 + jquery.pngfix.js | 126 ++ site | 442 +------ styles.css | 332 +++++ templates/en/404.template | 24 - templates/en/about.template | 27 +- templates/en/acknowledgement.template | 17 +- templates/en/ads.template | 13 - templates/en/contributing.template | 5 +- templates/en/cvs.template | 3 +- templates/en/devel.template | 143 ++ templates/en/developer-cheatsheet.template | 3 +- templates/en/download.template | 96 +- .../deb.template} | 3 +- .../deblenny.template} | 3 +- templates/en/forums.template | 7 +- templates/en/fun_projects.template | 15 +- templates/en/global/404.template | 18 + .../en/{getting_help.template => help.template} | 29 +- templates/en/help_wanted.template | 7 - templates/en/history.template | 7 +- templates/en/home_about.template | 30 - templates/en/howto.template | 168 --- templates/en/irc.template | 3 +- templates/en/license.template | 4 +- templates/en/menu.xml | 58 - templates/en/myths.template | 7 +- templates/en/news_row.template | 8 +- templates/en/pr-09betarelease.template | 76 -- templates/en/press.template | 212 --- templates/en/quotes.template | 6 - templates/en/resources.template | 3 +- templates/en/screenshots.template | 76 -- templates/en/search.template | 3 +- templates/en/sponsor.template | 27 - templates/en/status.template | 35 +- .../changelog.template} | 3 +- .../directx.template} | 135 +- .../{status_dlls.template => status/dlls.template} | 291 ++-- .../multimedia.template} | 73 +- .../options.template} | 3 + .../porting.template} | 3 + .../{status_todo.template => status/todo.template} | 3 +- .../en/{status_ui.template => status/ui.template} | 3 +- templates/en/status/wine.template | 624 +++++++++ templates/en/status_wine.template | 622 --------- templates/en/supported_applications.template | 11 - templates/en/who.template | 643 --------- templates/en/why.template | 7 +- templates/en/wine_features.template | 7 +- templates/en/wine_release.template | 11 - templates/en/winelib.template | 3 +- templates/en/wwn.template | 42 +- templates/en/wwn_content.template | 24 + templates/en/wwn_interview.template | 38 +- templates/es/download-deb.template | 3 +- templates/es/{ => global}/404.template | 12 +- templates/es/help_wanted.template | 7 - templates/es/home_about.template | 33 - templates/es/irc.template | 4 +- templates/es/menu.xml | 58 - templates/es/news_row.template | 5 - templates/es/quotes.template | 6 - templates/es/sending_patches.template | 9 +- templates/es/supported_applications.template | 13 - templates/es/wine_release.template | 11 - templates/es/wwn_interview.template | 29 - utils.js | 23 + 102 files changed, 3217 insertions(+), 4147 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=eab5cc1e6dc6f36339…

1 0

Hans Leidekker : setupapi: Implement StringTableAddStringEx.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: c2f99f30143e1180620980f3d5713456392c8ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f99f30143e1180620980f3d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 8 12:35:06 2008 +0100 setupapi: Implement StringTableAddStringEx. --- dlls/setupapi/stringtable.c | 83 +++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 45 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 59ad6ce..e6578e7 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -190,19 +190,21 @@ StringTableDestroy(HSTRING_TABLE hStringTable) /************************************************************************** - * StringTableAddString [SETUPAPI.@] + * StringTableAddStringEx [SETUPAPI.@] * - * Adds a new string to the string table. + * Adds a new string plus extra data to the string table. * * PARAMS - * hStringTable [I] Handle to the string table - * lpString [I] String to be added to the string table - * dwFlags [I] Flags - * 1: case sensitive compare + * hStringTable [I] Handle to the string table + * lpString [I] String to be added to the string table + * dwFlags [I] Flags + * 1: case sensitive compare + * lpExtraData [I] Pointer to the extra data + * dwExtraDataSize [I] Size of the extra data * * RETURNS * Success: String ID - * Failure: -1 + * Failure: ~0u * * NOTES * If the given string already exists in the string table it will not @@ -210,40 +212,36 @@ StringTableDestroy(HSTRING_TABLE hStringTable) * this case. */ DWORD WINAPI -StringTableAddString(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags) +StringTableAddStringEx(HSTRING_TABLE hStringTable, LPWSTR lpString, + DWORD dwFlags, LPVOID lpExtraData, DWORD dwExtraDataSize) { PSTRING_TABLE pStringTable; DWORD i; - TRACE("%p %s %x\n", hStringTable, debugstr_w(lpString), dwFlags); + TRACE("%p %s %x %p, %u\n", hStringTable, debugstr_w(lpString), dwFlags, + lpExtraData, dwExtraDataSize); pStringTable = (PSTRING_TABLE)hStringTable; - if (pStringTable == NULL) + if (!pStringTable) { ERR("Invalid hStringTable!\n"); - return (DWORD)-1; + return ~0u; } /* Search for existing string in the string table */ for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i].pString != NULL) + if (pStringTable->pSlots[i].pString) { if (dwFlags & 1) { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) - { return i + 1; - } } else { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) - { return i + 1; - } } } } @@ -252,51 +250,51 @@ StringTableAddString(HSTRING_TABLE hStringTable, if (pStringTable->dwUsedSlots == pStringTable->dwMaxSlots) { FIXME("Resize the string table!\n"); - return (DWORD)-1; + return ~0u; } /* Search for an empty slot */ for (i = 0; i < pStringTable->dwMaxSlots; i++) { - if (pStringTable->pSlots[i].pString == NULL) + if (!pStringTable->pSlots[i].pString) { pStringTable->pSlots[i].pString = MyMalloc((lstrlenW(lpString) + 1) * sizeof(WCHAR)); - if (pStringTable->pSlots[i].pString == NULL) + if (!pStringTable->pSlots[i].pString) { - TRACE("Couldn't allocate memory for a new string!\n"); - return (DWORD)-1; + WARN("Couldn't allocate memory for a new string!\n"); + return ~0u; } - lstrcpyW(pStringTable->pSlots[i].pString, lpString); + pStringTable->pSlots[i].pData = MyMalloc(dwExtraDataSize); + if (!pStringTable->pSlots[i].pData) + { + TRACE("Couldn't allocate memory for data!\n"); + return ~0u; + } + memcpy(pStringTable->pSlots[i].pData, lpExtraData, dwExtraDataSize); pStringTable->dwUsedSlots++; - return i + 1; } } - TRACE("Couldn't find an empty slot!\n"); - - return (DWORD)-1; + return ~0u; } - /************************************************************************** - * StringTableAddStringEx [SETUPAPI.@] + * StringTableAddString [SETUPAPI.@] * - * Adds a new string plus extra data to the string table. + * Adds a new string to the string table. * * PARAMS - * hStringTable [I] Handle to the string table - * lpString [I] String to be added to the string table - * dwFlags [I] Flags - * 1: case sensitive compare - * lpExtraData [I] Pointer to the extra data - * dwExtraDataSize [I] Size of the extra data + * hStringTable [I] Handle to the string table + * lpString [I] String to be added to the string table + * dwFlags [I] Flags + * 1: case sensitive compare * * RETURNS * Success: String ID - * Failure: -1 + * Failure: ~0u * * NOTES * If the given string already exists in the string table it will not @@ -304,14 +302,9 @@ StringTableAddString(HSTRING_TABLE hStringTable, * this case. */ DWORD WINAPI -StringTableAddStringEx(HSTRING_TABLE hStringTable, - LPWSTR lpString, - DWORD dwFlags, - LPVOID lpExtraData, - DWORD dwExtraDataSize) +StringTableAddString(HSTRING_TABLE hStringTable, LPWSTR lpString, DWORD dwFlags) { - FIXME("\n"); - return (DWORD)-1; + return StringTableAddStringEx(hStringTable, lpString, dwFlags, NULL, 0); }

1 0

Hans Leidekker : setupapi: Forward pSetupIsUserAdmin to IsUserAdmin.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 1058561e3b02411ae604e4deaaed9bd04f0e6c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1058561e3b02411ae604e4dea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 8 12:34:55 2008 +0100 setupapi: Forward pSetupIsUserAdmin to IsUserAdmin. --- dlls/setupapi/setupapi.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 860a6a3..75cb7c8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -554,6 +554,7 @@ @ stub pSetupGetVersionDatum @ stub pSetupGuidFromString @ stub pSetupIsGuidNull +@ stdcall pSetupIsUserAdmin() IsUserAdmin @ stub pSetupMakeSurePathExists @ stdcall pSetupSetGlobalFlags(long) @ stdcall pSetupSetQueueFlags(ptr long)

1 0

Hans Leidekker : setupapi: Fix typo in StringTableGetExtraData.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: d8dad22c9783e1868ec4bb72d8051dd0a5f4f0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8dad22c9783e1868ec4bb72d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 8 12:35:16 2008 +0100 setupapi: Fix typo in StringTableGetExtraData. --- dlls/setupapi/stringtable.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index e6578e7..2f43c5c 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -431,7 +431,7 @@ StringTableGetExtraData(HSTRING_TABLE hStringTable, return FALSE; } - if (pStringTable->pSlots[dwId - 1].dwSize < dwExtraDataSize) + if (pStringTable->pSlots[dwId - 1].dwSize > dwExtraDataSize) { ERR("Data size is too large!\n"); return FALSE;

1 0

Hans Leidekker : wininet: Set secure flag when scheme is https.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 15b046304cfce39180435631adbdb19266cd9049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b046304cfce39180435631a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 8 12:35:32 2008 +0100 wininet: Set secure flag when scheme is https. --- dlls/wininet/internet.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ed92536..855ae4d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2844,6 +2844,8 @@ static HINTERNET INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr else urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; } + if (urlComponents.nScheme == INTERNET_SCHEME_HTTPS) dwFlags |= INTERNET_FLAG_SECURE; + /* FIXME: should use pointers, not handles, as handles are not thread-safe */ client = HTTP_Connect(hIC, hostName, urlComponents.nPort, userName, password, dwFlags, dwContext, INET_OPENURL);

1 0

Hans Leidekker : winhttp: Prepend slash to request path if necessary.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: d3f7f5ebb6ff689d049c08053aa981d8164f73cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f7f5ebb6ff689d049c08053… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 8 12:35:43 2008 +0100 winhttp: Prepend slash to request path if necessary. --- dlls/winhttp/session.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 545ed04..032807a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -468,11 +468,24 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; if (!verb || !verb[0]) verb = getW; - if (!object || !object[0]) object = slashW; - if (!version || !version[0]) version = http1_1; - if (!(request->verb = strdupW( verb ))) goto end; - if (!(request->path = strdupW( object ))) goto end; + + if (object) + { + WCHAR *path, *p; + unsigned int len; + + len = strlenW( object ) + 1; + if (object[0] != '/') len++; + if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; + + if (object[0] != '/') *p++ = '/'; + strcpyW( p, object ); + request->path = path; + } + else if (!(request->path = strdupW( slashW ))) goto end; + + if (!version || !version[0]) version = http1_1; if (!(request->version = strdupW( version ))) goto end; if (!(hrequest = alloc_handle( &request->hdr ))) goto end;

1 0